4173 Commits

Author SHA1 Message Date
yflory
975fa3e4dd Test small mediatag 2018-05-22 12:34:37 +02:00
yflory
ea9384d6d0 Fix kanban inputs blocked when remote change 2018-05-18 11:00:47 +02:00
ansuz
bd66c8fee8 hacks to handle weird entries in drive 2018-05-18 10:28:31 +02:00
ansuz
2170fcb9ad Merge branch 'kanban' into staging 2018-05-18 10:19:55 +02:00
yflory
ef735d6fe6 Fix an issue when trying to create a pad with a password from a template 2018-05-17 18:15:10 +02:00
ansuz
f218a9c119 correct a copy-pasted comment 2018-05-17 16:10:53 +02:00
yflory
b4638efe2d Fix missing username when avatar is 404 2018-05-17 12:09:52 +02:00
yflory
31f9062422 Fix avatar pin 2018-05-17 11:46:16 +02:00
ansuz
d950b34bdf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-05-17 10:35:59 +02:00
ansuz
fb91f5df76 compare flat-dom output against hyperjson 2018-05-17 10:35:48 +02:00
yflory
5554c24b36 Remove dev console logging 2018-05-17 10:29:25 +02:00
yflory
d224a2c1a4 Update size of the Add button in kanban 2018-05-17 10:27:41 +02:00
yflory
77c456a20e Disable console logging in kanban 2018-05-17 10:27:16 +02:00
yflory
73183a69fd Improve kanban UI 2018-05-16 19:28:30 +02:00
yflory
86be9abb62 Translations for kanban 2018-05-16 16:45:16 +02:00
yflory
b6ebc583ba Add the kanban app to the list 2018-05-16 16:30:37 +02:00
yflory
087e346685 Remove translatable text and blocking 'confirm' dialog from jkanban.js 2018-05-16 16:18:44 +02:00
yflory
0ab27427bc Lint compliance 2018-05-16 12:22:43 +02:00
yflory
037050d16f Merge branch 'coati' into kanban 2018-05-16 11:41:55 +02:00
yflory
65a2083afc Suggest tags based on existing ones. Display existing tags in the drive. 2018-05-15 18:18:56 +02:00
yflory
e2052b4510 Fix multiple tippy tooltips displayed in poll's table 2018-05-15 10:59:53 +02:00
ansuz
dcd27f0da4 finalize save button tooltips 2018-05-14 14:20:37 +02:00
yflory
6fde15247b Fix UI issues in the loading screen with the loading bar 2018-05-14 14:02:46 +02:00
ansuz
34417b5e9f Merge branch 'oo' of github.com:xwiki-labs/cryptpad into oo 2018-05-14 14:02:24 +02:00
Paul Libbrecht
372f1dfeb4 First anchor test and restore of the CKEditor anchor function. 2018-05-11 09:06:22 +02:00
yflory
2d2701596a Loading message and loading bar for migration 2018-05-04 18:41:54 +02:00
yflory
2b8e734cae Add revealable password input to display or prompt the password 2018-05-04 15:42:29 +02:00
ansuz
4c747e013f on second thought that was a bad idea 2018-05-03 18:46:45 +02:00
ansuz
8ec9021f89 clear stuck tooltips in an interval 2018-05-03 18:45:19 +02:00
yflory
447230d42e Clean migration logging 2018-05-03 18:17:18 +02:00
yflory
6c4c5c135b Async migration 2018-05-03 17:59:22 +02:00
yflory
288b0c2df1 Lint compliance 2018-05-03 15:16:48 +02:00
yflory
10ce95087a Merge branch 'password' into staging 2018-05-03 15:16:03 +02:00
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
562f670921 hide visible effects of race condition, leave a note to remember to fix it 2018-05-03 10:18:36 +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
2451174870 Lint compliance 2018-04-27 18:04:21 +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
64c85fe548 Don't return channel in parsePadUrl 2018-04-27 17:23:23 +02:00
yflory
43d046406f Store the channel id as pad attribute 2018-04-27 11:54:23 +02:00
yflory
b26ae67df5 Fix issues with channel ID when using a password 2018-04-26 15:10:31 +02:00
yflory
1879c1829c Add passwod prompt to access protected pads 2018-04-25 19:03:58 +02:00
yflory
811463b870 Add support for version 2 hashes needed for password-protected pads 2018-04-24 17:22:33 +02:00
yflory
7384568f77 Lint compliance 2018-04-23 15:38:21 +02:00