dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,799 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

3799 Commits

Author SHA1 Message Date
ansuz ad591fba50 bump version 2017-09-12 14:04:30 +02:00
yflory 5ac3e97dc8 Merge branch 'master' into staging 2017-09-12 12:20:47 +02:00
yflory 8c3e2dbe61 Missing french translation keys 2017-09-12 11:45:47 +02:00
yflory 7d720c73a9 Merge branch 'soon' 2017-09-12 11:34:12 +02:00
yflory ddbda08c88 Fix an issue when cleaning the template category in the drive 2017-09-12 11:32:32 +02:00
ansuz 9d229b8868 lint compliance 2017-09-12 11:30:43 +02:00
yflory 5b3667fd4e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 11:29:57 +02:00
yflory 63700cb791 Fix an issue when cleaning the template category in the drive 2017-09-12 11:29:24 +02:00
ansuz a87ccdc37e remove redundant lines 2017-09-12 11:27:24 +02:00
ansuz 4dedb5e2a6 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-09-12 11:25:32 +02:00
ansuz da0e31fa54 guard against possible type errors 2017-09-12 11:20:50 +02:00
yflory 0f9da69185 Show if a pad has been renamed in the drive 2017-09-12 11:17:52 +02:00
ansuz 499b5ea2ba warn that a password is too short before doing anything else 2017-09-12 10:50:59 +02:00
ansuz a0b3201df3 fix focus on alerts, prompts, and confirms. call back from alerts 2017-09-12 10:49:48 +02:00
Caleb James DeLisle a74915ab58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 17:52:40 +02:00
Caleb James DeLisle 671c893e8a Duplicating code like a moron, this should hopefully get fixed later. 2017-09-11 17:52:34 +02:00
yflory 5a4836fe6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 16:36:41 +02:00
yflory 79094aa4bb Fix closing the title input when the title is not modified 2017-09-11 16:36:24 +02:00
ansuz 58c38dd77b focus on the current window when you pop an alert 2017-09-11 16:34:00 +02:00
ansuz b9545f45f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 16:26:21 +02:00
ansuz 306fec2d0e improve messages for template picker confirm 2017-09-11 16:25:58 +02:00
ansuz 1943c83f69 clean up api for Cryptpad.confirm 2017-09-11 16:24:43 +02:00
Caleb James DeLisle 8d3ebdbaf7 I'm stupid 2017-09-11 15:53:27 +02:00
Caleb James DeLisle 041071e61c manual merge 2017-09-11 15:52:14 +02:00
Caleb James DeLisle 7334173b4a Hopefully fix infinite spinner whenever there is a disconnect (pad) 2017-09-11 15:46:21 +02:00
yflory 9271b0c1a8 Try to fix half-codemirror bug 2017-09-11 14:42:43 +02:00
yflory 304a8df808 Remove unneeded migration and fix attributes migration 2017-09-11 14:25:19 +02:00
yflory 37dca9c155 Add missing translation keys in french 2017-09-11 14:12:06 +02:00
ansuz 5a1abc8986 let's try using actual js syntax 2017-09-11 14:04:40 +02:00
ansuz 134c6057c1 Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2 2017-09-11 14:01:05 +02:00
ansuz 59d25b4c1a use camel case, not snek case 2017-09-11 14:00:27 +02:00
ansuz 520b8967fd allow people with short passwords to log in 2017-09-11 13:54:48 +02:00
yflory 8ef27dca08 Lint 2017-09-11 12:25:23 +02:00
yflory 1aef844fc3 Fix title attribute for truncated titles in the drive 2017-09-11 12:23:24 +02:00
yflory 55fe882f64 Fix readonly mode in code 2017-09-11 12:23:04 +02:00
yflory 5cde3fffb8 Align title for normal, readonly and page mode in the toolbar 2017-09-11 12:04:22 +02:00
yflory bd422178c4 Hide the filepicker button in readonly mode 2017-09-11 11:59:09 +02:00
yflory 51f1be9f7a Improve the input style when renaming a folder in the drive tree 2017-09-11 11:50:04 +02:00
yflory 642511dc3b Disable exiting present mode when in embed mode 2017-09-11 11:38:40 +02:00
yflory 7582c9cffd Fix register button in the index dropdown menu for mobiles 2017-09-11 11:22:41 +02:00
yflory 403b62f131 Fix ghost icon modal and improve UI on mobile 2017-09-11 11:04:14 +02:00
yflory 60cbfb4281 Auto-resolve bower dependencies conflict 2017-09-11 10:41:44 +02:00
yflory 757d0a2800 Save the state of CKEditor's toolbar (visible or hidden) 2017-09-11 10:10:29 +02:00
yflory 5bf966633c Merge branch 'staging' into slide2 2017-09-08 18:21:38 +02:00
yflory 514bff7065 Add slide number in the title in slide2 2017-09-08 18:21:11 +02:00
ansuz 0ed6846e07 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-08 17:41:46 +02:00
ansuz b5b9f931c7 don't use common-realtime 2017-09-08 17:41:05 +02:00
ansuz 32e8c8ef4b implement alertify without alertify 2017-09-08 17:40:25 +02:00
ansuz a302ee5d25 guard against undefined arguments 2017-09-08 17:39:41 +02:00
yflory c3a07e879c Merge branch 'staging' into slide2 2017-09-08 16:23:07 +02:00