986 Commits (f4e5e67a684a636da779f55a13f9a78e7396f54b)

Author SHA1 Message Date
yflory ffd184d50e Fix overflowing names in the new userlist 8 years ago
yflory 1a27f11e73 Fix dropdown menus in static pages 8 years ago
yflory fa2d857d70 Fix css issues with Safari 8 years ago
yflory 81c8949aee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 1df5e6e855 Fix toolbar buttons for Safari 8 years ago
ansuz bf414c15ee fix logout button on home page 8 years ago
yflory 70c9f3df75 Fix avatar size 8 years ago
Caleb James DeLisle fcff5fa009 wip 8 years ago
yflory 335898a4c7 Hack the drawer to close it when clicking outside 8 years ago
yflory 472a62730b Fix profile creation and add a link to the profile app 8 years ago
yflory f357ec32c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory b153dda6ff Add avatars in the user list 8 years ago
ansuz c2e153e8ed more fouc fixes 8 years ago
ansuz 8ffad5ece6 FOUC fixes 8 years ago
yflory b6944e6638 Fix userlist style in apps without iframe 8 years ago
yflory 555d0a09f8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 568ce70afd Add a spinner for the history and update history buttons 8 years ago
Caleb James DeLisle 2144587919 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
Caleb James DeLisle c25f2df721 Added caching versions to some of the images which are loaded by js 8 years ago
yflory b9320e6005 Toolbar improvements 8 years ago
ansuz b7cb1a8d5f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens 8 years ago
ansuz 0b9d7d6c0b fix color of links in poll and whiteboard 8 years ago
yflory 56a25e1036 Small fixes for the new toolbar 8 years ago
ansuz c53ebe3598 bring upload status container to the front 8 years ago
ansuz 5e56ad912e remove the last bit of compiled css 8 years ago
ansuz 7de2683169 make all apps use clientside templates 8 years ago
ansuz bdca6b10c2 use templates in poll.js 8 years ago
ansuz 3a9b480e4e resolve merge conflicts in template.js 8 years ago
yflory 40f4fc2682 Add the profile app in template.js 8 years ago
ansuz 9b6790534f remove grey text from ckeditor initialState 8 years ago
ansuz e9bfaa9a60 compile less clientside. remove compiled css 8 years ago
yflory c431041e3f Fix position of the rightside drawer with small screen 8 years ago
yflory 36ef4178dc Remove the editable title from the file app 8 years ago
yflory c364803406 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 805e604e53 Add missing icons 8 years ago
ansuz f181e8db60 correct parentheses 8 years ago
MacLemon f4fdb7040c Optimize image assets to speedup page loading 8 years ago
Gustavo H M Silva 6af4335ead Translated up to page 317
Translated up to page 317
8 years ago
yflory ce44a8d351 Fix the backup button in anonymous drive 8 years ago
yflory 06a0590f73 New folder icons 8 years ago
yflory 0d4d104e08 Mobile support for the new toolbar 8 years ago
yflory 5a48cba999 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 684269fdda Userlist in polls 8 years ago
ansuz bd1db735dd jshint compliance 8 years ago
ansuz 35bfa1dce4 test client-side templates in whiteboard app 8 years ago
yflory a11befaa0f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 13288ee18b Update the userlist in code, slide and pad 8 years ago
yflory dcfc59c2e2 Translation key updated 8 years ago
yflory 92b6e60573 Small improvements for the new toolbar 8 years ago
ansuz eddfb936f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 115813c191 Merge branch 'new-templates' into staging 8 years ago
ansuz 3657e978fd give main2.js a more sensible name 8 years ago
ansuz e86ef209a8 define loading screen markup in js 8 years ago
ansuz 118b83c420 make register and login user clientside templates 8 years ago
Gogs 6dacbf2bd9 add translations and some improvements 8 years ago
yflory 8d956c3de6 New toolbar 8 years ago
ansuz 48f9745619 clientside templating 8 years ago
yflory b7a0547b77 New toolbar colors 8 years ago
yflory 59fb5bd8be One toolbar color per app 8 years ago
yflory 5a248db267 Merge branch 'staging' into newCk 8 years ago
yflory f13d23241c Upgrade CkEditor to version 4.7 8 years ago
ansuz 9be23be5eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz b80d7513aa skip over the terms of service link 8 years ago
yflory 1275f3f3a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory f5da7ae42e Add a new loading tip in french 8 years ago
ansuz e2ff88e4c4 tooltips for file upload 8 years ago
Pierre Bondoerffer 726302a9ee
Spanish update 8 years ago
ansuz 3f85471ab3 update footer and package.json for upcoming version 8 years ago
yflory 66b076111e Add an upload button to the slide's file picker 8 years ago
yflory a237eec41e Add a file picker in the slide app 8 years ago
yflory 1077b3b267 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a98353af6c Add a button to upload a file in the drive 8 years ago
ansuz 9870169e03 remove a few elements from CKEditor config 8 years ago
yflory 2032c08066 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory f9c26645cf Upload images using the slide app 8 years ago
ansuz ea79294494 Merge pull request #134 from pbondoer/newpoll
More poll improvements
8 years ago
ansuz 88c2c0afde Merge pull request #135 from blumeva/staging
Staging
8 years ago
XWiki SAS 0004be521c change translation 8 years ago
XWiki SAS 49370764c1 change whiteboard translation 8 years ago
yflory 376b60c21c New toolbar temp 8 years ago
Pierre Bondoerffer 685b352db8
poll: Add show help button 8 years ago
yflory 8471dab6b1 Provide hints in theme and language dropdowns 8 years ago
Pierre Bondoerffer 621376b0fa
small fixes 8 years ago
Pierre Bondoerffer cce665a18b
spanish updates 8 years ago
yflory df5cbfb53e Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 8 years ago
yflory 6a96aa6819 Disconnect the network when migrating the drive in another tab 8 years ago
ansuz 2f851ab97e fix lint errors 8 years ago
yflory f1271bfd03 Missing file 8 years ago
yflory 5641a4a839 Add the file app in the 'new' dropdown menus 8 years ago
yflory ac91d2f413 Fix the upgrade and donate buttons in the home page 8 years ago
yflory ee57458158 Remove the pin limit alert 8 years ago
yflory 85f1fb86d0 Add missing french translation keys 8 years ago
ansuz f43132a63b bump version in footer and package.json 8 years ago
ansuz ec9a4dec5e Merge branch 'soon' into staging 8 years ago
ansuz 8d4017b79e fix parse error 8 years ago
jxtsai b9b8352633 Traditional Chinese 8 years ago
ansuz 767793b5ca fix stuck loading tip 8 years ago
ansuz d774f8771b remove more unused files 8 years ago
ansuz 540304807c remove unused files 8 years ago
ansuz daf112a5b5 take api settings into account for upgrade button 8 years ago
ansuz ebfa228bc0 add upgrade button to all static pages 8 years ago
ansuz 909bc2ebf3 add new translation key 8 years ago
Gustavo H M Silva 81b931e56f Update messages.pt-br.js 8 years ago
ansuz a70014dd11 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 75874424cf add 'support cryptpad' translation key 8 years ago
Gustavo H M Silva 08619e733a Partial translation + duplicated token fix
Partial translation + duplicated token fix
8 years ago
Gustavo H M Silva 2d2e00b569 Merged translated and non-translated in pt-BR
I've merged the new tokens on the old translation in order to get a better understanding when updating the Brazilian Portuguese translation. It ran fine locally.
8 years ago
ansuz 92a7970eb8 fix merge conflicts 8 years ago
Pierre Bondoerffer 0a92719763
spanish! new keys ahoy 8 years ago
Pierre Bondoerffer 6518b56945
poll: french messages 8 years ago
ansuz 3915b30055 provide a register button on login
also direct users from file to login
8 years ago
Pierre Bondoerffer b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll 8 years ago
ansuz b910915d47 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 6573813523 Merge branch 'soon' into staging 8 years ago
Caleb James DeLisle 66520b6041 cleaned up the accounts, limits and revenue sharing and unified the config in one place 8 years ago
Pierre Bondoerffer 1092285a68
merge master 8 years ago
Caleb James DeLisle 6c1861dbc6 Merge branch 'soon' into staging 8 years ago
superniko 0559b8cb77 Update messages.ro.js 8 years ago
superniko 70fbbe0078 Update messages.ro.js 8 years ago
ansuz bc26f7fc4e Merge branch 'soon' into staging 8 years ago
Caleb James DeLisle 70c1061f47 Fix romanian translation 8 years ago
Caleb James DeLisle 83c0a6d37d Romanian translation 8 years ago
yflory b281d51d90 Fix typos in the french translation 8 years ago
yflory 38bd6b3808 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 964d046154 Update a french translation key 8 years ago
ansuz cf83cab596 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 0a646a9534 remove unnecessary space 8 years ago
yflory 6ddfe0e901 Fix new lines in /pad userlist 8 years ago
ansuz 4fae1b16c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory d55b7e411c Display an alert in the drive when the limit is reached 8 years ago
ansuz 2ca6277660 enable pin limits by default 8 years ago
yflory c45f08f147 Use a download button instead of downloading a file automatically 8 years ago
yflory 0c2f84058b Improve css for the file app 8 years ago
yflory 9c00a730f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 538aec6ef5 Display a message when pinPads returns an error 8 years ago
ansuz af4fd3c6d3 resolve merge conflicts 8 years ago
yflory 1ab6eb3c5d Add a queue for multiple uploads in the file app 8 years ago
ansuz ba5ef5157e show pretty representations of storage usage 8 years ago
ansuz ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz e7a458295b new translation keys for file upload 8 years ago
yflory 814c81fb13 Display an alert when CryptPad has a new version 8 years ago
yflory 21f9e31e75 Add a placeholder for the user app 8 years ago
yflory 620f4dc512 Add translations for the markdown preview button title 8 years ago
ansuz 3ba94a1ba2 correctly set release version number 8 years ago
yflory 2b60b81a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory d13dde856a Add the markdown renderer file and change code's default content 8 years ago
ansuz 4debec39bb update footer with next release codename and corrected matrix link 8 years ago
ansuz 517438d7c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 81af9225fc template a Romanian translation 8 years ago
ansuz e8275c02c6 Merge pull request #115 from pbondoer/spanish
Spanish update
8 years ago
Pierre Bondoerffer ad6217f064
file upload spanish keys 8 years ago
ansuz 827233dcba new translation keys for file upload 8 years ago
yflory dc2cdb7c08 Add the usage bar in the settings page 8 years ago
yflory 716245f864 Make all the buttons look the same 8 years ago
yflory 0f37d9def7 Change the button font size in the toolbar 8 years ago
yflory 48496416e7 Use the same font-size for all the toolbar buttons 8 years ago
yflory 03274c3776 Display an info message in the anonymous drive 8 years ago
Pierre Bondoerffer ad5e18f558
Spanish update 8 years ago
yflory 601226115b New anonymous drive 8 years ago
yflory 5d0535966c Center vertically slides in present mode and checkbox to disable transitions 8 years ago
yflory 5a21be8112 Improve UI on mobile 8 years ago
yflory ca6f910f0b Add french translations for 'log out everywhere' 8 years ago
yflory bbc08bbcfd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 6847906ac9 Move the userlist code in a separate file 8 years ago
ansuz 6909f663b6 modify 'log out everywhere' text 8 years ago
ansuz a173e4c7a0 add 'log out everywhere' functionality in settings 8 years ago
ansuz c07d3e6162 update version strings for upcoming release 8 years ago
ansuz 3e118c6a38 allow instance-wide custom salt for login 8 years ago
ansuz 1864dac84f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 78b11584f8 remove unused variables 8 years ago
yflory 4335b050af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a190c99426 Toolbar refactoring 8 years ago
ansuz 410a9dfb17 temporary solution for testing pin limits 8 years ago
yflory ef89451a83 Display the storage limit in the drive 8 years ago
yflory f414d480a9 Add the history mode to the CryptDrive 8 years ago
yflory 16f6ab813c Make it clear that the number is the history represents a version 8 years ago
yflory 0ee228666b Replace the IRC link by the Matrix one 8 years ago
yflory ab1dc48b6d Fix the 'limit reached' icon in the pad app 8 years ago
yflory a165332c15 Don't store a pad in the drive if the limit has been reached 8 years ago
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 8 years ago
yflory f50aa5c29b Move the mediatag viewer into a media app 8 years ago
yflory 9882a3a923 Add support for the file applicaiton in the drive 8 years ago
ansuz e40203480f Merge pull request #113 from pbondoer/staging
Update spanish
8 years ago
ansuz a5ca461a73 update footer for new version 8 years ago
Pierre Bondoerffer ba407322e8
Update spanish 8 years ago
yflory 3e28d1b966 Add a missing key in the french translation 8 years ago
yflory 9abfadb32f Update french translation 8 years ago
ansuz f7e96b4e8c resolve merge conflicts and jquery errors 8 years ago
yflory 5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable 8 years ago
yflory 92ea03d7d9 View and restore the history of a pad 8 years ago
ansuz df9c312b7d make new text translateable 8 years ago
ansuz 8f352c8433 add justify plugin to default ckeditor config 8 years ago
Caleb James DeLisle c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter 8 years ago
Pierre Bondoerffer 7a05462eb3
Some more poll changes <3 8 years ago
ansuz 50793f506d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 43c045721c Get the channel history 8 years ago
ansuz eed5b1260d set font-size label to match other ckeditor font sizes 8 years ago
Pierre Bondoerffer 0db603f580
spanish pinpad 8 years ago
ansuz 84dd879abb add messages for settings page 8 years ago
ansuz 4c7022ade9 Merge pull request #109 from pbondoer/spanish
Espanol!
8 years ago
ansuz 5a7eea08c8 Merge pull request #108 from pbondoer/newpoll
Poll fixes
8 years ago
Pierre Bondoerffer 65e848fd4d
linter linted the lints 8 years ago
Pierre Bondoerffer 40c06c4515
Spanish! 8 years ago
yflory 3e421c7289 Fix lint errors in ckeditor config 8 years ago
yflory 2ad0a65b71 Remove shortcuts that override browser actions 8 years ago
Pierre Bondoerffer f11cf8e6ac
move poll styles to separate file 8 years ago
ansuz cde9ea9887 update footer version 8 years ago
yflory d5e69653c0 Select opacity in draw mode in the canvas app 8 years ago
yflory cfc5d634f4 Merge branch 'templates' into staging 8 years ago
yflory bd16e0f0e7 Templates in polls and canvas, and ability to disable templates 8 years ago
yflory 63a130c678 Add a button to delete the selection in canvas 8 years ago
yflory 84d8615cf1 Save and use templates in pad, code and slides 8 years ago
ansuz bd2034c47b prepare rpc before 'ready' if pinning is enabled 8 years ago
yflory a13261abaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory dedf2b3c69 Display selected color and button to turn off draw mode in canvas 8 years ago
ansuz 2ecabbe6e3 add brown and pink to the palette 8 years ago
ansuz 6e1ffcc18d define better color palette 8 years ago
yflory 46a5eee597 Display the spinner in the toolbar for local changes 8 years ago
ansuz fe7f7f4e6d Merge branch 'master' of https://github.com/gustavohmsilva/cryptpad into staging 8 years ago
Gustavo H M Silva 90612bc5ba Update messages.pt-br.js 8 years ago
ansuz 5a85e4464c fix poor visibility on green pencils 8 years ago
ansuz 7908f3b4f0 make sure green UI elements use the same green 8 years ago
ansuz 36b02d71f5 add ckeditor indentblock plugin.
closes #101
8 years ago
ansuz d4ce3dc6b9 don't rewrite css rules. FOUC is too long 8 years ago
ansuz 364dae2882 update templated html 8 years ago
ansuz a3a0592e5e add English and French keys for the whiteboard app 8 years ago
ansuz 6186953a12 make whiteboard a default app 8 years ago
ansuz df7363f416 regenerate templated files for new footer 8 years ago
ansuz b50b76bf81 remove unnecessary lines 8 years ago
yflory d92a875ce5 Translate the 'wrong application' error message 8 years ago
ansuz 69edce5491 remove unused translation keys 8 years ago
yflory 53c60a31f6 Set the properties and backup inputs to read-only in the drive 8 years ago
yflory ff60dd4399 Translate settings_publicSigningKey in french 8 years ago
ansuz b176426213 increase default ckeditor font size to 16px 8 years ago
ansuz 3e9eb03e5a display a user's public signing key in settings if it exists 8 years ago
ansuz d1c32ea1f8 define english, french, and spanish labels for whiteboard app 8 years ago
ansuz f301592a83 Merge branch 'spanish' of github.com:pbondoer/cryptpad into spanish 8 years ago
ansuz cc43bb8362 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz ef0e1d7aa0 add a non-breaking space to pad initialState 8 years ago
yflory 29174b2922 Update the lag icon 8 years ago
yflory 26edb77cf0 Fix style and usability issues in slides 8 years ago
Pierre Bondoerffer 0efb3c993c
fixed lint :( 8 years ago
yflory 45ac3e40a2 Copy print options to present mode 8 years ago
Pierre Bondoerffer 3c60ebcc97
Update Spanish 8 years ago
yflory a5f11d0d0d Uniform the slides rendering in present and print mode 8 years ago
yflory 7761aaa89f Add search UI 8 years ago
ansuz 5eb32b33ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 0a6373852e add signing keys to user object at login and register time 8 years ago
yflory 0607c3bbf3 Add a title to the 'new' button in drive 8 years ago