Commit graph

4852 commits

Author SHA1 Message Date
yflory
d6d53e4068 Bump drive version for new users 2018-05-04 15:48:55 +02:00
yflory
2b8e734cae Add revealable password input to display or prompt the password 2018-05-04 15:42:29 +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
91860186d1 New crypto 2018-05-03 15:45:59 +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
67fd70b4c7 use mtime instead of atime for expiration 2018-05-03 14:03:56 +02:00
ansuz
8d3545d217 comments :D 2018-05-03 11:56:03 +02:00
yflory
4b0a2c4c9e Merge branch 'master' of github.com:xwiki-labs/cryptpad 2018-05-03 11:12:01 +02:00
yflory
6e844d6aaf Accept number dates in pinneddata 2018-05-03 11:11:32 +02:00
ansuz
381d4ac191 make resets explicit 2018-05-03 11:08:56 +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
ac09ba65ce strip both old and new style checkpoint labels before decrypting when fetching history 2018-05-02 14:39:06 +02:00
ansuz
3eb199bca7 bump version to 2.0.0 2018-05-02 11:44:12 +02:00
ansuz
123612b893 Merge branch 'de-translation-pl' into staging 2018-05-02 11:09:22 +02:00
ansuz
8b13bd0be5 lint compliance and merge 2018-05-02 11:07:28 +02:00
ansuz
de768869eb add missing semicolons 2018-05-02 10:56:02 +02:00
ansuz
e5c35f457c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-05-02 10:46:09 +02:00
yflory
eefa70ffa4 Fix typo in the french translation 2018-05-02 10:10:46 +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
yflory
b21f42747d Fix color and scroll issues in the PCS 2018-04-27 17:49:04 +02:00
yflory
389c197441 Fix color issue in file upload table 2018-04-27 17:48:42 +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
Paul Libbrecht
662f69eb0c Usage of the informal form mainstreamed. paul 2018-04-26 18:59:30 +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
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
ansuz
6d6af30763
Merge pull request #238 from xshadow/CHANGELOG_for_1_29_0
added changelog.md with version tag and current changes
2018-04-23 12:07:58 +02:00
Paul Libbrecht
26124791a1 First stab at updating the German translation.
More proofreading and discussion is needed to polish it.
paul
2018-04-21 09:28:19 +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
shadow
05eb35ef62 added changelog.md with version tag 2018-04-19 12:28:48 +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