Commit Graph

3405 Commits (67fd70b4c72a21ed031056edf16e82ec9d6767d3)

Author SHA1 Message Date
ansuz 89fb718572 Merge branch 'soon' 2018-05-03 10:19:36 +02:00
ansuz b9a74c2119 hide visible effects of race condition, leave a note to remember to fix it 2018-05-03 10:19:14 +02:00
ansuz ac09ba65ce strip both old and new style checkpoint labels before decrypting when fetching history 2018-05-02 14:39:06 +02:00
ansuz 123612b893 Merge branch 'de-translation-pl' into staging 2018-05-02 11:09:22 +02:00
ansuz 699a635746 add trailing slash when redirecting to drive 2018-04-30 11:47:53 +02:00
yflory a66d33e5ca Improve export for pads with mediatags 2018-04-30 11:40:41 +02:00
yflory d0c6746034 Merge branch 'mediatagplugin' into staging 2018-04-27 17:57:22 +02:00
yflory 009eb13fc3 Merge branch 'master' into staging 2018-04-27 17:51:12 +02:00
ansuz 41583b7858 Merge branch 'checkpoint-bug' into merge-checkpoint-bug 2018-04-27 17:45:26 +02:00
yflory 7384568f77 Lint compliance 2018-04-23 15:38:21 +02:00
yflory 9d30e48a44 Fix mediatag redrawn on content update 2018-04-23 15:35:55 +02:00
yflory 2d08924462 Fix CkEditor issues 2018-04-23 14:33:39 +02:00
yflory cf549eeaef Clean the code 2018-04-20 17:57:48 +02:00
yflory 41afc28802 Fix conflicts, clean the code, add migration from old mediatags 2018-04-20 17:49:40 +02:00
yflory 6a4f25bc9f Test widget filters 2018-04-20 17:48:39 +02:00
yflory fd89811479 Clean mediatag plugin 2018-04-19 18:29:10 +02:00
yflory 5eab39ad75 Tets mediatag plugin using widgets 2018-04-19 17:45:08 +02:00
yflory 449ae579e5 Lint compliance 2018-04-19 14:22:10 +02:00
yflory a773c47950 Fix loading screen in login and register 2018-04-19 14:21:26 +02:00
yflory a51e41c883 Rename the image used in the new loading screen 2018-04-19 11:30:54 +02:00
yflory 9f5e5786f3 Merge branch 'pcs' into staging 2018-04-19 11:14:56 +02:00
yflory e1d59db30d Fonts issues on Windows 2018-04-19 11:14:22 +02:00
yflory 206ac14438 Prevent users from creating a pad when visiting a deleted profile (read-only mode) 2018-04-18 18:54:46 +02:00
yflory a0d452bbd9 Use correct icons for the search results in the drive 2018-04-18 18:54:05 +02:00
yflory 1f3f4941b5 Redirect to drive anonymous users trying to create a profile 2018-04-18 18:53:36 +02:00
yflory c190a38a6b Fix UI issues 2018-04-18 14:19:45 +02:00
yflory 24dfaf766d View more templates 2018-04-17 18:23:58 +02:00
yflory 842952fe1f New checkboxes and radio input everywhere 2018-04-17 15:51:03 +02:00
yflory 68c26f3164 Custom radio inputs 2018-04-16 19:07:57 +02:00
yflory 7870dc05ca Fix notification timeout 2018-04-16 16:07:40 +02:00
yflory 881c36214f Lint compliance 2018-04-16 15:57:18 +02:00
yflory e2b9cf1c40 Fix small UI issues with the new colortheme 2018-04-16 15:46:19 +02:00
yflory ec0fc85b9f Sort templates by usage in the PCS 2018-04-13 18:52:55 +02:00
yflory 52d6c9d468 New colortheme for alertify logs and modals 2018-04-13 17:47:33 +02:00
yflory 5ee5a93513 New tippy everywhere 2018-04-13 15:25:14 +02:00
yflory 9d57548f1d New tooltips 2018-04-12 19:08:08 +02:00
yflory 4a23b57655 New loading screen 2018-04-11 18:56:03 +02:00
Paul Libbrecht 5747e1a492 Merge branch 'master' of https://github.com/xwiki-labs/cryptpad 2018-04-10 19:12:30 +02:00
yflory e1473dff79 Fix tests 2018-04-10 16:38:31 +02:00
yflory e37aab492b Validate messages not coming from history-keeper 2018-04-10 15:10:28 +02:00
yflory a570a73e98 Send checkpoints' id to the server to avoid storing duplicates 2018-04-10 10:38:30 +02:00
yflory 2381dd0e39 Remove owned profile and owned todo in automatic account deletion 2018-04-04 17:24:26 +02:00
ansuz f276915712 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-04-04 15:07:41 +02:00
ansuz b323989347 remove extraneous console statements 2018-04-04 14:49:33 +02:00
yflory c43afcf629 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-04-04 14:38:40 +02:00
yflory 52e634885e Hide the import template button if templates are disabled in appconfig 2018-04-04 14:38:24 +02:00
ansuz c24c06e90c sign with your global private signing key 2018-04-04 14:17:48 +02:00
yflory 31980bef82 Add a ghost icon in the anonymous drive 2018-04-03 15:16:21 +02:00
yflory 0993204d14 Disable thumbnails by default 2018-04-03 13:35:06 +02:00
ansuz ee46a4e862 remove some unnecessary checks for file-crypto and make encryption properly async 2018-03-26 18:30:52 +02:00