Commit graph

1497 commits

Author SHA1 Message Date
ansuz
57d0738f32 Merge branch 'modern-users' into staging 2018-06-28 15:30:10 +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
yflory
6d8693ff8c Fix history mode UI 2018-06-25 16:59:40 +02:00
yflory
0160ef30b7 Fix pad password change 2018-06-25 12:08:06 +02:00
ansuz
4e9baff0b6 bump version 2018-06-25 11:00:59 +02:00
ansuz
01614c4256 verify old user password before proceeding to change passwords 2018-06-22 15:34:50 +02:00
ansuz
85bcaa51f7 export a constant for the number of required bytes at login time
allocate bytes for blockSeed when changing passwords
2018-06-22 11:41:10 +02:00
yflory
5c87bcf94a Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users 2018-06-22 10:39:35 +02:00
yflory
a146f6acc9 Change user account password function 2018-06-22 10:37:54 +02:00
ansuz
89e64a7243 dispense bytes for block location 2018-06-21 16:52:04 +02:00
ansuz
10c76c6d4b Merge branch 'staging' into modern-users 2018-06-21 10:42:41 +02:00
ansuz
fc35d06c83 Merge branch 'soon' into staging 2018-06-21 10:42:25 +02:00
ansuz
184708f859 fix login from register page 2018-06-21 10:40:09 +02:00
ansuz
6fde027a6c add some TODOs 2018-06-21 10:26:46 +02:00
ansuz
508521664f use nthen to sequence async events 2018-06-21 10:26:23 +02:00
yflory
36d1ae0f6c Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users 2018-06-20 16:39:52 +02:00
yflory
71b085ba23 Owned drive migration UI 2018-06-20 16:39:01 +02:00
ansuz
c3741f847d resolve conflicts from merge with staging 2018-06-20 14:29:13 +02:00
yflory
a5b207d57b Password change UI 2018-06-20 10:02:56 +02:00
yflory
29f577dfc6 Improve history to load it chunk by chunk 2018-06-19 17:02:16 +02:00
ansuz
577dea4c75 clientside implementation of block signing and encryption 2018-06-19 16:38:49 +02:00
yflory
b89b033175 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-14 17:18:56 +02:00
yflory
54d63df1cf Ability to change the password of a pad 2018-06-14 17:18:32 +02:00
Catalin
e9e461c4d6 Repaired some responsive issues on about page, contact and features 2018-06-13 11:12:56 +03:00
ansuz
ff25929c18 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-12 15:50:53 +02:00
ansuz
54b52d681c fix broken share menu resulting from adblock plus triggered by 'share' 2018-06-12 15:50:41 +02:00
yflory
01a3c13a8c Fix CSP issues for missing files (404) 2018-06-12 15:15:46 +02:00
yflory
4304079c70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-12 14:02:13 +02:00
yflory
f72e14b1b9 Add/fix translatons keys for the features "table" 2018-06-12 14:01:57 +02:00
ansuz
06582e06dc update markup in de translation 2018-06-12 12:03:25 +02:00
ansuz
aa51463a9a Merge branch 'soon' into staging 2018-06-12 12:00:51 +02:00
ansuz
4701a7f415 Merge branch 'features-page' into staging 2018-06-12 11:48:43 +02:00
ansuz
6e6020ef0d rename and optimize images: thanks @MacLemon 2018-06-12 11:42:25 +02:00
ansuz
eb49f53884 standardize indentation 2018-06-12 11:32:09 +02:00
ansuz
8def11bea3 define style by class instead of structure 2018-06-12 11:21:12 +02:00
yflory
c803b70a1a Fix translations 2018-06-11 18:24:20 +02:00
yflory
4dec2cca5c Translations for new version detected 2018-06-11 18:18:39 +02:00
ansuz
9e4fdb7e83 prefix classes with cp 2018-06-11 16:35:19 +02:00
ansuz
5a549f75a6 increment version 2018-06-11 15:15:03 +02:00
ansuz
756681211b update home page icons, allow for customization 2018-06-08 17:06:50 +02:00
ansuz
5ae7cdb1e6 add missing key for french translation 2018-06-08 14:56:11 +02:00
ansuz
b0039e35d0 add missing translation key for kanban 2018-06-08 14:38:44 +02:00
yflory
2e15d59081 Fix typo 2018-06-07 10:21:45 +02:00
yflory
8586d0c944 Merge branch 'staging' into donkey 2018-05-31 13:28:14 +02:00
yflory
ba0e000808 Add a file upload modal 2018-05-31 13:27:44 +02:00
yflory
fe202a92b4 Fix UI issues in kanban 2018-05-30 15:15:50 +02:00
yflory
3af997db2b Kanban translation 2018-05-30 10:36:26 +02:00
yflory
66655b4a23 Upload a file with a password 2018-05-28 17:50:28 +02:00