5108 Commits

Author SHA1 Message Date
yflory
ecb9f039b1 Fix pad password change not reloading with the correct URL 2018-07-17 12:27:23 +02:00
ansuz
8a18698c03 initialize newly registered users with a v2 drive hash 2018-07-16 17:08:35 +02:00
ansuz
ed881840cd remove XXX label from non-blocking feature 2018-07-16 17:08:16 +02:00
ansuz
05a41ad7f1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-16 16:51:12 +02:00
ansuz
7348eca1d5 revise english translations which have been marked for review 2018-07-16 16:51:06 +02:00
yflory
930bd32f70 lint compliance 2018-07-16 16:44:25 +02:00
yflory
3830935dd9 French translation 2018-07-16 16:43:45 +02:00
ansuz
2c22232a47 check if a user is logged in strictly by User_hash 2018-07-16 15:45:45 +02:00
ansuz
848a918eda remove out of date comments 2018-07-16 15:45:19 +02:00
ansuz
8e2ab0b74a bump version strings 2018-07-16 11:30:57 +02:00
ansuz
b9c4aa43b5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-16 11:25:11 +02:00
ansuz
3d95e6088a leave a FIXME note 2018-07-16 11:24:58 +02:00
ansuz
adc54434fd update english translation as prompted by german translation PR 2018-07-16 11:24:18 +02:00
Caleb James DeLisle
792f7bcc64 show how long less takes to compile 2018-07-14 15:21:45 +02:00
Caleb James DeLisle
c5105d7b84 Merge branch 'check-for-css-variables' into staging 2018-07-12 17:16:21 +02:00
Caleb James DeLisle
a440359bc7 Commit patches provided to me by someone who Seemed Trustworthy At The Time
(should fix false negatives in shared-worker detection)
2018-07-12 16:59:36 +02:00
Caleb James DeLisle
cb8888ea1a Yes, so it turns out that making a small asthetic change after testing on every browser does actually break it :| 2018-07-12 16:51:48 +02:00
Caleb James DeLisle
fabdbc3b61 Add a feedback test for checking for CSS variables, so we won't use a feature which is not implemented by the vast majority of the people using CryptPad... 2018-07-12 16:02:46 +02:00
ansuz
3fb6cb3d00 lint compliance 2018-07-11 11:35:44 +02:00
ansuz
ca409e5eaa support import/export in kanban 2018-07-11 10:50:42 +02:00
ansuz
1d8943e673 support deprecation of non-owned drives 2018-07-10 18:09:33 +02:00
ansuz
8574128efd unstub password change function 2018-07-10 16:44:24 +02:00
ansuz
25b0d764ed pass initialState variable when copying your drive in the changeUserPassword function
because the hardest problems to debug are always fixed with one line changes
2018-07-10 16:42:11 +02:00
ansuz
54bc29f28c WIP maybe I missed something 2018-07-10 15:16:43 +02:00
ansuz
0a9ea95796 always set userHash in localStorage even with modern users 2018-07-10 13:11:22 +02:00
ansuz
ce7ebf0326 don't stop users from registering if they cancel out of a prompt 2018-07-09 15:31:20 +02:00
ansuz
16f276a18c fix anon pad import 2018-07-09 14:34:33 +02:00
ansuz
a15e232469 complete modern user registration/login. general cleanup 2018-07-09 14:20:38 +02:00
ansuz
3d4b693722 use correctly scoped variable 2018-07-06 11:54:01 +02:00
ansuz
d79064a4c5 Merge branch 'staging' into modern-users2 2018-07-06 11:37:50 +02:00
ansuz
4ef2cfa88d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-06 11:37:00 +02:00
ansuz
57a39258c3 WIP big commit 2018-07-06 11:36:48 +02:00
ansuz
0c3b898000 simple one line fixes 2018-07-06 10:28:41 +02:00
ansuz
ab04a7cb46 fix the bug I caused while trying to silence the linter 2018-07-02 17:43:39 +02:00
yflory
846755b0a7 Increase requirejs timeout (thanks Firefox...) 2018-07-02 14:02:05 +02:00
ansuz
a3e0e765b5 derive block URI and URL in dedicated functions 2018-07-02 11:11:50 +02:00
yflory
a99e5a3aaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-02 11:03:58 +02:00
yflory
af5cc30381 Fix undefined function when calling error() in the drive 2018-07-02 11:02:43 +02:00
yflory
071c34d4fa Fix undefined secret with password-protected files (#250) 2018-07-02 10:51:43 +02:00
yflory
27797c0520 Fix undefined secret with password-protected files (#250) 2018-07-02 10:50:30 +02:00
ansuz
12cf1993b9 flow compliance for loginBlock RPCs 2018-06-28 16:52:23 +02:00
yflory
34914785eb lint compliance 2018-06-28 16:15:38 +02:00
yflory
a537f7de8b Fix infinite loading screen caused by some browser settings 2018-06-28 16:13:52 +02:00
ansuz
57d0738f32 Merge branch 'modern-users' into staging 2018-06-28 15:30:10 +02:00
ansuz
cc6f3dc0e4 lint compliance 2018-06-28 15:25:22 +02:00
ansuz
cfc81e8c96 allocate blockSeed as Uint8Array 2018-06-28 15:21:13 +02:00
ansuz
7aa7b82c60 merge staging 2018-06-28 13:33:54 +02:00
ansuz
c85a551546
Merge pull request #249 from xwiki-labs/de-translation-pl
Translating one extra line.
2018-06-28 13:30:23 +02:00
ansuz
76c9b01d45 update changelog one more time 2018-06-27 15:13:47 +02:00
ansuz
fc6322b105 ignore /block/ 2018-06-27 15:03:48 +02:00