Commit Graph
100 Commits
Author SHA1 Message Date
ansuz f168433db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-22 17:41:06 +01:00
ansuz d0b7576d84 make slide present mode exit button clickable at all sizes 2017-02-22 17:40:44 +01:00
ansuz 1494387c9f ignore a line for jshint 2017-02-22 11:17:12 +01:00
ansuz 33e2c8676e assign updated key to what it should actually be 2017-02-22 11:15:25 +01:00
ansuz 89f3577058 remove old poll 2017-02-22 11:05:47 +01:00
ansuz 641c805518 unbreak ckeditor 2017-02-21 18:59:42 +01:00
ansuz 7e77c6828a more correct pluralization 2017-02-21 18:55:48 +01:00
ansuz c0989f64fa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-21 18:21:39 +01:00
ansuz 3d0e7cb9a7 pull ckeditor config out of main.js 2017-02-21 18:21:30 +01:00
ansuz ed19c6885d join array in messages.js 2017-02-21 17:16:56 +01:00
ansuz 5276dac7cc safely handle keys which aren't strings 2017-02-21 12:29:47 +01:00
ansuz 84b64da76d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-21 12:22:09 +01:00
ansuz 1151c02662 Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging 2017-02-21 10:58:28 +01:00
ansuz 94417d9a8b jshint compliance 2017-02-17 14:28:18 +01:00
ansuz 8167ed9048 implement cache-busting everywhere 2017-02-17 12:39:01 +01:00
ansuz 34b6507fa3 implement cache-busting everywhere 2017-02-17 12:38:58 +01:00
ansuz 66a21bb45c implement cache-busting everywhere 2017-02-17 12:38:10 +01:00
ansuz c9b8889380 add cache-busting to chainpad-crypto 2017-02-17 11:26:43 +01:00
ansuz 09fade6127 add cache-busting to chainpad-crypto 2017-02-17 11:25:35 +01:00
ansuz 5ae65c8bc1 make the user confirm 2017-02-13 13:04:55 +01:00
ansuz 7d0c29513c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 12:42:17 +01:00
ansuz 7d21206cae add registration introductory text 2017-02-13 12:42:07 +01:00
ansuz 562e5b8c70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 11:17:16 +01:00
ansuz 5d4d530c89 switch registration text to an explanation of how login works 2017-02-13 11:17:00 +01:00
ansuz 20083264b2 load fontawesome icons on register page 2017-02-13 11:09:44 +01:00
ansuz fbcf4ccec4 force usernames to be lowercase 2017-02-13 11:01:30 +01:00
ansuz 5614bea271 redirect users to login and register from toolbar 2017-02-13 10:51:54 +01:00
ansuz f723585758 add api to check whether the realtime has synced with the server 2017-02-13 10:42:17 +01:00
ansuz 3b1bd2f720 use additional translation keys for registration 2017-02-13 10:15:25 +01:00
ansuz 438e139489 don't complete login names 2017-02-13 10:14:26 +01:00
ansuz b5b2454f0b use bootstrap for login and register pages 2017-02-10 18:29:49 +01:00
ansuz c556f78562 log in directly from home page, sign up at /register/ 2017-02-10 16:49:17 +01:00
ansuz d0edf75c89 signup link directs users to register page, not user 2017-02-10 16:48:28 +01:00
ansuz 0ee808295b make sure jquery is imported before using it 2017-02-10 14:29:01 +01:00
ansuz 1232aa8a79 jshint compliance 2017-02-10 14:25:02 +01:00
ansuz 88af104ce8 basic registration page to replace user page 2017-02-09 18:50:28 +01:00
ansuz a995df25f6 disable new OT in pad and code app 2017-02-09 17:20:13 +01:00
ansuz f92ba193c3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-09 17:16:03 +01:00
ansuz e100110741 implement log in as an api 2017-02-09 16:31:57 +01:00
ansuz c642bce984 restore disabled listener 2017-02-09 10:31:00 +01:00
ansuz dae17588c6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-07 18:27:28 +01:00
ansuz 32a5c5ff62 better integration between /user/ and home 2017-02-07 17:50:37 +01:00
ansuz fe7ba98338 remove dead code from /user/ 2017-02-07 17:50:02 +01:00
ansuz 9b047bfb53 don't autocorrect usernames. add trailing slash to /drive 2017-02-07 17:28:32 +01:00
ansuz 6e97082ff9 remove dead code from login function 2017-02-07 17:27:36 +01:00
ansuz 4b710b418c remove dead code from home page 2017-02-07 17:27:00 +01:00
ansuz 6e730c7800 prefer to end links to apps with a trailing slash 2017-02-07 10:53:42 +01:00
ansuz 8a1acc3c37 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-07 10:40:03 +01:00
ansuz 6f07a3b7b4 erase lingering sessionStorage values when logging out 2017-02-07 10:39:42 +01:00
ansuz 8648ff208e dropdown links should always be black 2017-02-02 18:52:11 +01:00
ansuz 0ad95142f5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-02 18:49:17 +01:00
ansuz 26a4b0c18f override bootstrap colors 2017-02-02 18:48:43 +01:00
ansuz e712025a4e set cached styles 2017-02-02 18:39:40 +01:00
ansuz 85b49d5ec8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-02 18:37:09 +01:00
ansuz 9d0252e989 style links on info pages, and fix layouts 2017-02-02 18:36:30 +01:00
ansuz 72c4175b6f remove slide/oldmain.js 2017-02-02 14:44:43 +01:00
ansuz 2dfe182d8d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-02 11:27:17 +01:00
ansuz 0ca1775657 add page for listing missing translations 2017-02-02 11:27:08 +01:00
ansuz 07f722fbd8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-01 15:47:58 +01:00
ansuz 1a061c22a0 more consistent styles and improved SEO 2017-02-01 15:47:50 +01:00
ansuz 3a9c1c782d remove dead code from cryptpad.less 2017-02-01 15:21:59 +01:00
ansuz eb3c58939d correct typo 2017-02-01 11:15:09 +01:00
ansuz b143aef778 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-01-31 19:49:29 +01:00
ansuz 3321d01040 add background image 2017-01-31 19:48:55 +01:00
ansuz d93086a92d hitting enter in the password field should log you in 2017-01-31 17:29:32 +01:00
ansuz 5b802d6e84 replace mountain image with lock image 2017-01-31 14:23:09 +01:00
ansuz 9d0d8b27cf Merge branch 'master' of github.com:gustavohmsilva/cryptpad into brazil 2017-01-11 07:59:54 +01:00
ansuz 33b8de888e clean up unused files 2017-01-11 07:49:56 +01:00
ansuz 63b9d4e9fd remove path for backwards compatibility 2017-01-10 10:54:08 +01:00
ansuz 4cda1aeb2f add docker and docker-compose
thanks @felixboehm
2017-01-10 10:36:12 +01:00
ansuz b39067d2a1 jshint compliance 2017-01-09 18:07:45 +01:00
ansuz 74a12f50ac only migrate keys which don't already exist 2017-01-09 17:35:58 +01:00
ansuz 1c3f1a15cd make sure that /pad is resized after loading 2017-01-09 17:02:01 +01:00
ansuz a3cd100c94 apply yflory's safari patch 2017-01-09 11:46:51 +01:00
ansuz 0373556475 support old hashes in /poll 2017-01-09 11:46:21 +01:00
ansuz e8a87378aa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-01-09 11:02:32 +01:00
ansuz 4902aebe77 open home page table links in new tabs 2017-01-09 11:01:29 +01:00
ansuz b33661d9d5 don't toggle maximization state after setting 2017-01-05 15:21:17 +01:00
ansuz 7868a65da9 apply style patches to the correct elements 2017-01-05 15:06:08 +01:00
ansuz 5c967ed09e apply live fixes to the codebase 2017-01-05 14:45:31 +01:00
ansuz bd6f2c037e assign the cors iframe an id 2017-01-05 14:27:40 +01:00
ansuz e56cc49f79 catch errors that popped up because of a cross-origin iframe 2017-01-05 14:14:26 +01:00
ansuz 5080751a90 hide unnecessary scrollbar 2017-01-05 10:58:10 +01:00
ansuz 95617a11c8 fix broken paths in old poll 2017-01-05 10:57:13 +01:00
ansuz 5a90d20cff open pads in a new tab 2017-01-04 16:41:47 +01:00
ansuz c380ecfcd9 add the slogan which was accidentally dropped 2017-01-04 16:35:32 +01:00
ansuz 05a956879a prepare new poll app for release
move old poll into poll/old
2017-01-04 15:48:50 +01:00
ansuz 6c4e070c82 update information pages 2017-01-03 15:25:41 +01:00
ansuz 7b87213ec3 extract more constants into less variables 2017-01-03 12:19:07 +01:00
ansuz 27d5559b0c define and use flags to enable the home page table 2017-01-03 12:17:17 +01:00
ansuz 5cd714b18a configure filestore usage via customize/application_config.js 2017-01-03 12:10:11 +01:00
ansuz 4b1f9fd4f1 Revert "yank dead code"
This reverts commit aad442cb20.
2017-01-03 11:49:44 +01:00
ansuz aad442cb20 yank dead code 2017-01-02 16:03:50 +01:00
ansuz 2b5085625c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-01-02 15:43:06 +01:00
ansuz f01c3725af move minor links to the bottom of the home page 2016-12-30 15:56:24 +01:00
ansuz 9b650362b9 rebuild css 2016-12-30 15:33:59 +01:00
ansuz d843caeb9a remove bottom bar and move language selector to main html 2016-12-30 15:33:28 +01:00
ansuz c6499d6789 make panel styles reusable 2016-12-30 15:30:35 +01:00
ansuz 773209472e break monolithic style file into several modules 2016-12-30 15:29:45 +01:00
ansuz 34967ac354 encapsulate rendering functions so we can pass in cryptpad-common 2016-12-30 13:27:01 +01:00