Commit Graph

1709 Commits (36aa07adabb1a84a9d1e61509b6e1d95eaaaa873)

Author SHA1 Message Date
yflory 4df4c48fbd Improve UI for pad creation screen
ansuz a281869bba make things actually work
ansuz 0672c2f41a implement a running diff
yflory f6926699bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory ad2cde4705 Add warning about anonymous drive in localStorage
yflory e80e8339c2 Typo in translation
ansuz de838a3184 fix usage bar styles
yflory 8294686f80 Fix assert translations for deprecated keys
yflory 8a1c04ff58 Missing french translation keys
yflory bdafc101c9 Ability to remove owned channels from the drive
yflory a1d9f44bbd Delete owned pads from server when removed from the owner's drive
yflory 5089f1206d Pad creation screen translations and link to settings
yflory 462c229b17 Add links to features table
yflory 86144eda22 Display a message about pads deleted from the server
yflory 4d0312115a Add a link to the account server for subscribers in settings
yflory 5827905dbd Import OnlyOffice code from the 'onlyoffice' branch and sframe it
yflory 166a9e71cf Add a features comparison page
yflory 2995782079 Different colors for ok and cancel in alertify
yflory 8628f2831e Fix 404 page inside iframe
yflory 30c6ab4717 Add meta description tag
yflory c90ba890ca Add more configurable options and add a new way to use custom config
ansuz 02dbe9e458 enforce maxUploadSize
ansuz fc8847dae4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 04b862352f update style for usage bar
yflory 08ae327386 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory c5ebbe1a56 New share menu
ansuz 4f42e8a282 bump to version 1.25.0
ansuz 3858aa976a better warning in case of errors in /file/
ansuz 4fc1079d67 translate some stuff
yflory f3d8fd3590 Ability to import local pads on login
yflory a5b75e0164 Fix default config for anynymous drive
yflory 8ced81d8d7 lint compliance
ansuz b630fb95e2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz a018b7db9e only show availablePadTypes on the home page
yflory dffa117f4d lint compliance
yflory d59bc4612d Ability to disable the drive for anonymous users
yflory db0d2e161c Hide pad creation screen features if it is disabled in app config
yflory daef08a9b3 Add an advanced new pad modal
yflory c460e2820e Fix a 1px offset for the userlist in Firefox/Windows
yflory bd9c44dbb2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory ef480fea79 Add a settings category for the pad creation screen
ansuz 5346afe51f step towards customizable login functionality
ansuz ae2517fcc6 remove dead code from home page
yflory 8c9490868b improve owned pads management in the drive
yflory 73126ed597 Display the owner and expiration time of a pad in the properties modal
yflory 65ccfe39ef Add a 'properties' button in pads to display pad data
ansuz e06cb29c4f bump version
yflory 0cea5f4596 Create an owned pad and view owned pads in the drive
yflory 1ec41f4e09 Ability to pick a background image in slides
ansuz 65e66dea08 resolve bad merge
ansuz e3c7e96d71 Merge branch 'master' of github.com:koulaxizis/cryptpad into merge-greek
ansuz e460d9c36c bump version
yflory f329d65bc8 Ability to reduce the width of ckeditor
Christos Koulaxizis 7f3a08f0c2 Greek translation
yflory 888739e333 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory fa6106a6bb Use CSS to remove the loading screen
ansuz c0b5dc7536 make loading screen tip presence configurable
yflory 158ef58c6c Enable print plugin in ckeditor
ansuz c448c9035e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 127f30df72 bump CryptPad version
yflory e48f143842 Allow numbers in _getKey parameters
yflory d666e9e7ee Remove tag and filepicker buttons for anon users
yflory b06b2dbafc less lint compliance
yflory b1f1aa2340 Disable pad creation screen
yflory 34315b4500 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory c269929319 Fix creation page not displayed in pad and slide
ansuz 16388a839c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 230f9524be new less linter rules and compliance
yflory 4e46d0daa5 Fix the 'New' button icon in the toolbar
yflory dcfccf88cd Merge branch 'creationpage' into staging
yflory 1922dbfd75 Creation page with mobile support
Caleb James DeLisle 024aa741a7 Added all of the filters to the lesshint rc (all explicitly enabled or disabled) and made empty line at end of file compliant
Caleb James DeLisle 1d2119b292 Removed LESS duplicate attributes
Caleb James DeLisle bfba239770 Fixed missing semicolons in less
Caleb James DeLisle 9af941741d Fix trailing whitespace and empty selectors in less
Caleb James DeLisle dd44b4da99 Removed old /less/ directory which is nolonger used :)
Caleb James DeLisle 12b0f3e201 Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window
Caleb James DeLisle 617c4b6044 CSS refactorings and pad-is-not-pinned work
yflory e96d54e655 Add a pad creation page
Caleb James DeLisle 67f8031beb Wrong usage of colortheme.less, fixed
yflory 64303b4090 Merge branch 'refactor' into staging
Caleb James DeLisle ba74f9d37a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle 1dabea84d9 Overrides to colortheme.less will nolonger block the adding of new keys to the original file
Caleb James DeLisle c702a23c77 Initial work on the 'pad will expire' logic
ansuz 087eee55f6 update 404 page
ansuz f95669a27a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz fc4fea9c54 update 404 messages and show actual text faster
yflory f52d987515 Ability to resize avatars before uploading them
yflory e164edec03 Fix the webworker app
yflory 04e02871bc Merge branch 'refactor2' into staging
yflory 4903bd0757 Enable messenger in async store
ansuz 5acbaef28f tweak animation parameters for faster 'decryption'
ansuz c80c97d7db lint compliance
ansuz bcdc0d810a make 404 page translateable, point to home page or drive
ansuz 443eeaa407 fancy 404 page
yflory acd8ab7446 Add the markdown toolbar in profile
yflory 74e59a513a Add the markdown toolbar to the slide and poll apps
yflory b0f553e9ea Add a markdown toolbar to help with the markdown syntax
yflory 9795ac32cb Ability to burn an anonymous drive from the browser
yflory 280a7c2765 Clean cryptpad-common
yflory cdd8c6e110 Fix history mode not centered
yflory 30cea8888d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 06011065d2 Add a debug app
ansuz 60c4973d62 resolve merge conflicts
yflory 477f14bb8b Put constants in a separate file
ansuz 8150abddbe remove dead code from pages.js
ansuz 4ffb59dce9 bump to version 1.21.0
yflory e8e90905e4 Fix assert translations
ansuz 78e972201a bump CryptPad version
yflory ce3600b026 Update translation keys
yflory cf26c4c286 Improve the toolbar UI for smaller screens
yflory af8aa25228 Add an option to never rename a file during the session
yflory 25d3d321da Ability to rename a file before uploading it to the server
yflory 1f53304ad3 Display a dropdown menu inside another one
yflory 014e12b5b5 Ability to update the username from the userlist
yflory 9184dd0ce6 Merge branch 'refactor2' into staging
yflory 5a2afb5c95 Remove Realtime and Messaging from common
yflory af1ea4fd96 Fix typo in the French translation
yflory c9e1de042c Remove common-interface dependency from cryptpad-common
yflory dc207393fd Separate UI elements from cryptpad-common
yflory 354c63bd64 Clean old code
yflory 101482b8cc Migrate settings to use a sandboxed iframe
yflory 2ff66e1a7c Update french translation
ansuz 2c9df23849 update english text for removing from trash in the drive
ansuz d10f752457 s/delete/move to trash
ansuz 402fae442d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz c5f6491c37 bump footer and package.json to latest version
yflory 2a3a5c4342 Ability to disable thumbnails
yflory 1871749b6f Fix -1 viewer in the userlist when disconnected
yflory cf3024ef5b Ability to display an error in the toolbar state
yflory e0f7df80b3 Fix avatar upload and use less2 everywhere in profile
yflory 7f9b21405b Add missing files for profile
yflory 4250688856 Migrate profile to use sframe
yflory abc511a56e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 68accaf653 Todo in sframe with less2
Evilham 735f0a7e30 Merge branch 'theming-improvement' into staging
Evilham 83da9cf752 Moved colours to colortheme.less to enable theming
yflory 6f020b67ca Add thumbnails to framework apps
ansuz 69f9a7ebf3 make userlist change notifications configurable
yflory 204f3e1441 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 74985fd0f2 Use text for the addUser button in polls
ansuz 7d1892546b add missing french translation
ansuz 2e5fdf709a Merge branch 'soon' into staging
ansuz aaef30f489 bump cryptpad version
yflory ce5d24a1d3 Remove error message about Tether
ansuz d571f408d8 Merge pull request from MacLemon/reduce-image-asset-size
Compressed images for faster connections
yflory 3e4faf1be1 Add new state messages in the toolbar
Yannick A 63dcfd6d18 Update French translation
Caleb James DeLisle a149152f11 Merge branch 'staging' into framework
yflory e553351b79 Put the add friend button in the userlist below the name
yflory 6920129126 Embed images from the drive in whiteboard
MacLemon 867b971c33 Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections.
yflory 2fd120100a Merge branch 'wb' into staging
Caleb James DeLisle 15337603bb Merge branch 'staging' into framework
Caleb James DeLisle 753e2d797e Merge branch 'staging' into framework
yflory 62bc72847f Add an error message when trying to tag a deleted pad
yflory 50090a3af6 Add placeholders for the comment form in poll
yflory ecb537ac7f Move code to render.js in poll
yflory c985aa60aa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory f4189f883e Add missing french translation keys
ansuz 128c9c2f4e Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
ansuz d046b9ce33 add missing French key
ansuz f0bdc3b26f second try
ansuz d50a692986 add note about tags to prompt
CatalinScr 21f1a48380 changed the login in button
yflory d3d6940b69 Update french translation for tags
ansuz 3f181fa370 update loading screen tip for tags
ansuz f751554f82 update footer and package.json for upcoming version
yflory dd141b5c9f Disable comments when a poll is not published
yflory 5e7bf0cfb8 Embed an image in whiteboard
Caleb James DeLisle f0eb58ee95 Merge branch 'staging' into framework
yflory ab3648a30a Merge branch 'newpoll' into staging
yflory 1c4f1c785d Improve stability and UI in poll and its comments
ansuz 080511efcd add missing translation for hashtags
Caleb James DeLisle d9e97b86e6 Merge branch 'staging' into framework
Caleb James DeLisle 383c2f54cb 1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.
yflory 26dfc65c25 Comments in polls
yflory 846b1a9fb3 Improve description UI in poll. Enable tags and mediatag
yflory 68bda92291 Use codemirror for description in poll
ansuz e2f53eaddb add loading screen tip about hashtags
ansuz b8ce149db6 add hint about tag usage
yflory 5cf86bf74a Update UI in poll and remove old code
Caleb James DeLisle 94d2f4472b Stop using presentSuccess because it is hidden behind the modal in slide
ansuz 351b95d6a9 resolve merge conflicts
Caleb James DeLisle fa6938baa8 1. Migrated /slide/ to use framework
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
yflory 66da349ee4 Sandboxed Poll app with less2
yflory e02a779c14 Use secure drive as default drive
yflory b4de31c827 Merge branch 'newdrive' into staging
yflory 767027b237 Lint
yflory 0df9e5ace0 Fix toolbar in polls
ansuz b3e066eaca show loading screen tips during loading screen
yflory cdeac00633 Merge branch 'staging' into newdrive
yflory 1d7683503f Fix link origin in sframe upload table
yflory 92c808812a Fix missing style in toolbar/less2
yflory c364377d7c Use less2 in sframe drive
yflory dfdeb7b113 Fix style and race condition for history mode
yflory a810d7bd85 Fix style and race condition for history mode
yflory 456370b1aa Base for Drive in sandboxed iframe
ansuz 95302366d1 lint compliance
ansuz 53b98c12c9 ignore broken stylesheet
yflory 95542bcdaf Lint
yflory 88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 8a09e39f46 Enable tags in pads
ansuz d2b27f3588 resolve merge conflicts
ansuz f127240a2f add poll to main.less
yflory 6683434c62 Fix wrong relative url
yflory 35a313d6ee Make palette realtime
yflory 3023e8c855 Fix templates in whiteboard
yflory 732585ea7b Sandboxed iframe for the whiteboard app
ansuz f9d27d2783 WIP secure contacts
yflory 1131ef0172 Fix language selection in sandboxed iframes
yflory c00d295466 Add missing translations
yflory 974658453c Mediatag integration in pads
Caleb James DeLisle b24e9b84af Manual merge, update the CSS in loading.js and document that loading.less does nothing.
ansuz 2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz e0ae0fcd91 thanks Dima!
ansuz f039fc7ff5 develop a system for avoiding z-index problems
yflory d360e2d0f4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory ab64bf9e59 Use less2 for the loading screen
Caleb James DeLisle 0d8c292fef Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle 789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
ansuz 244e3ecba7 support forefront flag in alert config
yflory 8c41e0bdd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 437f50fd4a Migrate the file to a sandboxed iframe
ansuz ad591fba50 bump version
yflory 8c3e2dbe61 Missing french translation keys
ansuz 306fec2d0e improve messages for template picker confirm
yflory 37dca9c155 Add missing translation keys in french
ansuz 134c6057c1 Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
ansuz 59d25b4c1a use camel case, not snek case
yflory 5cde3fffb8 Align title for normal, readonly and page mode in the toolbar
yflory 7582c9cffd Fix register button in the index dropdown menu for mobiles
yflory c3a07e879c Merge branch 'staging' into slide2
yflory fc069dac48 Ask the user before loading the template picker
yflory f2aaaa9751 Move slide to secure iframe
ansuz 809b56625d refactor ui elements
ansuz bca9ba66cb enforce a configurable minimum password length when registering
ansuz ef30b0bc42 contribute to z-index arms race
ansuz a6eb1444df add loading screen markup to register and login
ansuz 352d504944 avoid loading unnecessary files
ansuz 263c2eb2c2 fix overflowing title text
ansuz cca3c04d43 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 15e24ebe4f ui for hashtag picker
yflory fe8b2c2556 Fix french translation
yflory 8f2776657b Add translations for pad embed
yflory 3ca9f41290 Get embed code for pad and code
yflory d22edc03b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 53eb9bb541 Remove the logo from the filepicker loading screen
ansuz 5c9ce0caa5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 77bbb3add4 bump footer and package.json version string
yflory 01881ac469 Update loading tips in the french translation
yflory 729c013af7 Get mediatag embed code from the file app
ansuz 5eb13461c0 remove anchor button
yflory 204e45dfae Enable templates in pad
yflory 78b338c379 Merge branch 'code2' into staging
yflory d2787e3eff Make code2 the default code app
yflory 86e23ac19f Use less2 in secure iframes
ansuz 7b27b8635d fix padding on registration button
ansuz 6bb29e52e2 lint compliance
CatalinScr 0ceb4cbbcb Updated the contact page with the new design
CatalinScr 83be769bb3 Merge branch 'master' into staging
updated with new version
CatalinScr 1bf77cb77e changed the icons
CatalinScr ee325c1813 Repaired the errors from lint
CatalinScr f95f3f4f24 Updated the contact page
yflory 0893bcc0e5 Merge branch 'staging' into code2
yflory d3e947f17e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 7498057c89 Fix Safari iframe size
yflory a2ed266048 Move the code app in a secure iframe
ansuz a34d1793e0 drop 'loading' text from loading screen
ansuz 2ef4ebc6ef two new tips for the loading screen
ansuz 570ff75a6c update footer for latest version
yflory d4589c4699 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 6c65e5ff72 Fix the ghost icon in the drive and add missing text
ansuz 54eefd3d94 replace contacts with contacts2
ansuz 57d0c6c973 Merge branch 'new-messaging' into staging
ansuz f9cdbe66a0 add forgotten translation string
Caleb James DeLisle 35e7341f4d Merge branch 'ui-integration' into staging2
Caleb James DeLisle 7bbea28831 minor anti-xss changes...
Caleb James DeLisle 2ad9fcee17 Manual merge of notify.js
yflory 33025a9df9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
ansuz 89a13d4b21 work on contacts2 until feature parity is reached
Caleb James DeLisle d9f5e3638e Big caching improvements :D
yflory 1752124071 Fix Iframe height in Edge
Caleb James DeLisle b081603455 Update requirejs
CatalinScr 49f7e0d63b Changed the Social Media links to Pierre
ansuz 48fe3ef841 add a tip about cryptdrive
ansuz 839c6df3bb remove invalid loading screen tips. create a new one
yflory 0a813b4fab Fix limit bar overflowing when over the limit
CatalinScr 744fb407ae Updated the what is page
ansuz 46e47b454d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle f7b2aa85b8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle 3df20760c4 Yann does not have a twitter account.
yflory df8851a53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory df0b7155f6 Add missing french translation
ansuz 127b6dbc6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 8b5519ad29 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 2b7dcbe77c remove bs class that caused poor alignment sometimes
Caleb James DeLisle 4213d6de70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle d6125d864c Added Yann's bio
yflory a39f802b4d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory e4d842ed08 Fix typos in the french translation
ansuz 7537caf8fe make footer translateable
ansuz 8ee5e14a60 merge ui-integration
CatalinScr fd3fd945c8 Updated the Log in Page
CatalinScr 1f4d0a0a56 Repaired a bug
CatalinScr dd48cf7c90 updated the register page
CatalinScr 3196d4558f repaired the responsive error at about page
CatalinScr 3960cd25f8 Updated the about page with the new design
Caleb James DeLisle 7c8df61f91 sed majik to switch 'What is CryptDrive' to 'What is CryptPad'
Caleb James DeLisle 196ce3b3f7 Fix alertify style which made the registration popup look bad
Pierre Bondoerffer f580d9a30a
*actually* fix alertify on mobile
Pierre Bondoerffer 8c0fe7d277
Add missing UI element translations
Pierre Bondoerffer 144f9f4c83
alertify fix on mobile
Caleb James DeLisle 9833bd7e59 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle 89a8e8050c Fix typo and also change message to explain itself better
ansuz 64849507b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 328107be4d translation key for using tabs
Pierre Bondoerffer b00d37d9e7
proper namespace for font
Pierre Bondoerffer 0f74dffc48
fix register button being cut off
Pierre Bondoerffer 92d3b1a9fc
actually pull in open-sans, move fonts to own include
ansuz 958294f109 put code settings in their own tab
ansuz ae0b2ca1a8 add label for code indentation
ansuz 7f2b7fc287 show Your CryptDrive, if logged in. fix typos
Pierre Bondoerffer ef256e3849
go to homepage when on infopages
Pierre Bondoerffer 04b84538e1
add Open Sans font (with bower)
Caleb James DeLisle 8efac4e661 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
Pierre Bondoerffer baf64114a6
point to homepage in drive
Caleb James DeLisle 1043e076a4 Merge branch 'ui-integration' into staging
CatalinScr 41c2f9bd83 Changed the footer, a modified the about page
Pierre Bondoerffer edad5deeac
fix logo not showing sometimes in chrome
Pierre Bondoerffer c036bb26be
use proper bootstrap class
Pierre Bondoerffer b34e252eda
improve whiteboard styles
Pierre Bondoerffer 8b2cb37c2f
improve poll looks
Pierre Bondoerffer 280c10c57d
alertify: use the right box-shadow
Pierre Bondoerffer 82352b422f
unhide show help button
Pierre Bondoerffer ec011b15d5
remove duplicate css property
Pierre Bondoerffer 34ba673cd3
improve file upload UI
Pierre Bondoerffer ca686f9c92
(hopefully) fix newline in lists when pasting links
Pierre Bondoerffer 6ca6755d02
more missing titles in toolbar
Pierre Bondoerffer 2cc6c636db
Add some missing titles
Pierre Bondoerffer 355b7f1839
change recent to local pads
Pierre Bondoerffer 90075cd48e
media-tag to less file
Pierre Bondoerffer 88be5444f0
change alertify warn color
Pierre Bondoerffer c53e738054
improve file picker ui
Pierre Bondoerffer 996c56c242
fix label in register
Pierre Bondoerffer 008fa12755
alertify: add textarea + checkbox
Pierre Bondoerffer e486e47aa1
alertify: fix input color + better log styles
Pierre Bondoerffer e333e7903d
fix styles overlapping
Pierre Bondoerffer 1db41dd17b
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer dac14de18c
unify fonts
CatalinScr 5afadf10aa Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
CatalinScr 3f6b234e97 Styled the general menu, footer, updated about
Pierre Bondoerffer a16d4be3c4
show logged in user
Pierre Bondoerffer 8a56adfe53
make logos same size, compress
Pierre Bondoerffer d3fb6313b6
color logo on topbar
Pierre Bondoerffer 865ba0731c
better colors? not sure yet...
Pierre Bondoerffer 1bd42f0b3e
make alertify darker
Caleb James DeLisle 0f7124d673 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer ecc766eb7b
remove useless margin
Caleb James DeLisle a6547d1ed0 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer 7310960f46
remove the hack around the hack to fix the hack
Caleb James DeLisle 95c7cd3fcc Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer addd91cc72
fix styles (again) copyright cjd 2017
Caleb James DeLisle 930ba8aec6 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer 5c21a9048e
fix styles
Caleb James DeLisle b26c62714f Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer c953e71a18
better class generation and remove duplicate class
Caleb James DeLisle 4d563af045 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer 10e50fc5c7
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer 6614f3f0e6
put the page class on html element
ansuz 96b12d55fb add a return
ansuz b79adf4177 redirect to drive if logged in
Caleb James DeLisle a10214ed2a Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Caleb James DeLisle 75c0876500 Added ludovic's bio
CatalinScr 043ae4280b repaired the menu
CatalinScr 250d85bb8a Repaired the menu, clead the code
Pierre Bondoerffer e2ad99ab3c
change favicon (again)
Pierre Bondoerffer 8831f4f91b
new favicons
Pierre Bondoerffer a70c527482
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer 4018c7e0a6
move alertify stuff
Caleb James DeLisle c274a27dfb Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js
Caleb James DeLisle 0d1f19f5d4 Big manual merge
CatalinScr e7d09c1ddb Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menu
CatalinScr d4ce7d626c Modified the menu
Pierre Bondoerffer f8c7140eec
make fonts big
Pierre Bondoerffer f6d45d05f6
use logo in toolbar
Pierre Bondoerffer 1b83e15796
sorry jpg, i forgot you existed
Pierre Bondoerffer 5ce7d64b2c
add pierre photo
Caleb James DeLisle 1b466d250f Add some photos
Caleb James DeLisle 5d70dd93b3 Manual merge
CatalinScr 15fa801bc8 work in progress
Caleb James DeLisle bc15ce7de5 Manual merge
Caleb James DeLisle 52e9ba92fa Update whitepaper link and also change whatis_zeroknowledge
CatalinScr 89ab82c0e2 Changed the menu, added the logo on top bar
Pierre Bondoerffer ae176b0465
about page mockup
Pierre Bondoerffer cdf6345fc1
use sign up
Pierre Bondoerffer ddc9c4d070
alt favicon pink
ansuz 35867001cb add missing messages
Pierre Bondoerffer 86bc14e6bb
new loading screen
Pierre Bondoerffer 304a29e210
Improve contact page
Pierre Bondoerffer d6679e8ef3
Add screenshots to What is CryptPad
Pierre Bondoerffer b3f3f1dabb
Add What is CryptPad keys
Pierre Bondoerffer e2f8c9c5da
add logo to topbar
Pierre Bondoerffer 8a56029bfe
remove useless images
Pierre Bondoerffer ea3a8932be
put the content in the right place
Pierre Bondoerffer 262a729ef7
use proper key name
Pierre Bondoerffer db111257f0
Add translations, remove useless functions
Pierre Bondoerffer de23195bd8
fix wrong css class
Pierre Bondoerffer ad4aca4e5f
actually do the changes intended in previous commit
Pierre Bondoerffer 01b2883771
Add headers and footers, generate what-is-cryptpad
Pierre Bondoerffer cd0c9cc95a
create less templates for info pages
Pierre Bondoerffer f71b082aac
remove min-height globally, style footer
Pierre Bondoerffer 0fe49d6641
oops, sorry, back to 100% height
Pierre Bondoerffer dc0a037894
turn login and register into infopages
Pierre Bondoerffer 549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer 775ea81504
start register page
CatalinScr 69c470330f updated the favicons, changed the menu
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
CatalinScr e609950977 Changed the favicon, added the boostrap js file, reconfigure the top menu
Caleb James DeLisle 27aa1886b1 Move footer to pages.js and add it to the contact page
Caleb James DeLisle 490e2b4d0a work in progress on migrating styles back into the infopages.less
Caleb James DeLisle cd2b41f51e Fix up some less for supporting the info-pages
Caleb James DeLisle 896186d059 Fix some wrong less files which were breaking the UI of the apps
ansuz 4614d6ae81 remove legacy max-width from usage bar
CatalinScr 87dec4a091 Changed the font size
CatalinScr 5ef0325d90 this are css rules modified -- INSERT --
CatalinScr 5921073524 Updated the new font, changed the logo, changed see more
Pierre Bondoerffer ba95931802
Use translation keys
ansuz 9a733cca0e drop support for legacy iframe
Pierre Bondoerffer f2a78ddfd9
New FR/ES keys
CatalinScr 6862bda454 Changed the logo, uploaded the new font, repaired responsive
ansuz 1ca00e7e01 resolve merge conflicts
ansuz 411c64df85 Merge branch 'master' into master
Pierre Bondoerffer 93e007b52a
reduce png sizes
ansuz 777dea2014 Merge branch 'staging' into todo
ansuz a458d7fa46 bump to latest version
Caleb James DeLisle 428bee6306 make links clickable and make more link work
ansuz ba9cab762c Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
yflory 459e0b3b16 CSS and bug fixes for todo
ansuz a5b19b1cdd add missing translations
yflory 77d6da841f Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
yflory 3da76e3ae8 Update style for the todo app
ansuz 8cfd8d3270 add translations for todo
CatalinScr 5fa20836cf Modified Register and login button
CatalinScr cab8716519 Changed the login button, repaired the hover menu and see more. Updated the logo
CatalinScr 796bf89491 Update of the front-page
Caleb James DeLisle 49c760131e wip
Nicolas Lemoine 658b00814b TodoApp - Style and translations
c4rl0sc 2e8e44933a Fixed spelling error in Spanish translation
ansuz dcf5719eaf handle most of the boilerplate stuff
c4rl0sc 064e189495 Fixed spelling issues and improved translation quality.