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

1315 Commits

Author SHA1 Message Date
yflory 8c41e0bdd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 18:40:20 +02:00
yflory 437f50fd4a Migrate the file to a sandboxed iframe 2017-09-12 18:40:11 +02:00
Caleb James DeLisle 1713167a5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 14:12:41 +02:00
Caleb James DeLisle 981a919328 Added tooltips back to sframe land with hopefully a more robust removal. 2017-09-12 14:12:35 +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
ansuz a87ccdc37e remove redundant lines 2017-09-12 11:27:24 +02:00
ansuz da0e31fa54 guard against possible type errors 2017-09-12 11:20:50 +02:00
ansuz a0b3201df3 fix focus on alerts, prompts, and confirms. call back from alerts 2017-09-12 10:49:48 +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 304a8df808 Remove unneeded migration and fix attributes migration 2017-09-11 14:25:19 +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 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
yflory c3a07e879c Merge branch 'staging' into slide2 2017-09-08 16:23:07 +02:00
yflory fc069dac48 Ask the user before loading the template picker 2017-09-08 16:21:12 +02:00
yflory 05793c220c Fix secure iframes on Edge 2017-09-08 15:55:01 +02:00
yflory 290d668ceb Fix race condition preventing slide to work on Edge 2017-09-08 15:53:53 +02:00
ansuz 739903d511 don't check account usage if you aren't logged in 2017-09-08 14:00:49 +02:00
ansuz bbf7ed3827 refactor drive to use dialog.selectable() 
fix class on alertify-like boxes
 2017-09-08 12:24:20 +02:00
yflory f2aaaa9751 Move slide to secure iframe 2017-09-07 18:56:58 +02:00
ansuz 809b56625d refactor ui elements 2017-09-07 18:54:58 +02:00
ansuz bca9ba66cb enforce a configurable minimum password length when registering 2017-09-07 17:44:04 +02:00
ansuz fab6264ce6 use loading screen from pages.js 2017-09-07 16:41:11 +02:00
ansuz e8298f165a only display first letter of name if user has no avatar 2017-09-07 16:35:24 +02:00
ansuz 85003f7a23 lint compliance 2017-09-07 14:21:54 +02:00
ansuz cca3c04d43 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-07 12:45:18 +02:00
ansuz 15e24ebe4f ui for hashtag picker 2017-09-07 12:45:07 +02:00
ansuz 1b97996ef8 implement util.once 2017-09-07 12:26:05 +02:00
yflory 0423a5f4e2 Clean secure iframe code 2017-09-06 18:26:10 +02:00
yflory 04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings 2017-09-06 16:05:20 +02:00
yflory 61b228db79 Fix double / when storing a file 2017-09-06 11:41:09 +02:00
yflory 3ca9f41290 Get embed code for pad and code 2017-09-06 10:56:27 +02:00
yflory 0bb6698399 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 18:40:18 +02:00
yflory e85b34f127 Add embed options in the secure pad hashes 2017-09-05 18:38:51 +02:00