4965 Commits

Author SHA1 Message Date
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
yflory
089e0361b6 Detect new version 2018-06-11 16:52:26 +02:00
ansuz
9e4fdb7e83 prefix classes with cp 2018-06-11 16:35:19 +02:00
ansuz
a109deadc3 remove package-lock.json 2018-06-11 16:28:12 +02:00
yflory
0d4fbec4bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-11 15:40:46 +02:00
yflory
da396b6528 Remove XXX 2018-06-11 15:40:36 +02:00
ansuz
5a549f75a6 increment version 2018-06-11 15:15:03 +02:00
yflory
aeaf7d1950 Fix mediatag... 2018-06-11 15:06:43 +02:00
yflory
054ad9e741 Fix 404 in thumbnails creation with corrupted data in the drive 2018-06-11 11:46:27 +02:00
yflory
8f28621bb0 Remove unnecessary logs when logging in 2018-06-11 11:23:11 +02:00
yflory
921e6eb3c3 Fix wrong pad title in drive 2018-06-11 10:58:44 +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
Caleb James DeLisle
1775638d00 Merge commit '0c8ce27' into staging 2018-06-07 15:51:16 +02:00
Caleb James DeLisle
0c8ce27f24 Make the less loader only load particular less files once 2018-06-07 15:49:59 +02:00
yflory
af2a13e5ae Fix UI issue with PPF in the file picker 2018-06-07 15:42:16 +02:00
yflory
574d99f9db Remove support for old media-tag 2018-06-07 15:09:35 +02:00
ansuz
eac7d38655 test media-tag, and fix the bug the tests exposed 2018-06-07 14:29:09 +02:00
yflory
bc57f8c274 Replace media-tag.js with the new one 2018-06-07 14:12:33 +02:00
yflory
38887eb088 Improve new media-tag 2018-06-07 11:52:04 +02:00
yflory
87f4fe9c84 Add error code to a feedback key 2018-06-07 10:48:38 +02:00
yflory
2e15d59081 Fix typo 2018-06-07 10:21:45 +02:00
yflory
3f8b6d3b8a Fix default title issues when using a template 2018-06-04 16:02:58 +02:00
yflory
b87e7c003b Fix flow errors... 2018-06-04 15:19:24 +02:00
yflory
b0311ccec1 Don't create file duplicates in the drive 2018-06-01 12:10:49 +02:00
yflory
21366c252d Merge branch 'donkey' into staging 2018-06-01 12:07:10 +02:00
ansuz
56836b2e28 update changelog 2018-06-01 11:54:24 +02:00
yflory
cc163f83c7 Fix an issue creating duplicate files in the drive 2018-06-01 10:52:54 +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
8ce539a89e lint compliance 2018-05-30 18:49:48 +02:00
yflory
06818b798f Add properties button to the file app to see owners and password 2018-05-30 18:48:29 +02:00
yflory
68fb534d25 Flow... 2018-05-30 15:27:36 +02:00
yflory
fe202a92b4 Fix UI issues in kanban 2018-05-30 15:15:50 +02:00
yflory
85e5c495d9 Remove owned file 2018-05-30 14:36:29 +02:00
yflory
a0dd0ccfa3 Merge branch 'soon' 2018-05-30 10:45:31 +02:00
yflory
69c5eb0cd9 Bump version 2018-05-30 10:37:05 +02:00
yflory
3af997db2b Kanban translation 2018-05-30 10:36:26 +02:00
yflory
93ecc06964 Upload owned files 2018-05-29 19:42:20 +02:00
yflory
a6bac8ae41 Fix password prompt issue when the password was wrong in the file app 2018-05-28 18:18:25 +02:00
yflory
05bd41f256 Upload a password-protected file from apps 2018-05-28 18:03:35 +02:00
yflory
66655b4a23 Upload a file with a password 2018-05-28 17:50:28 +02:00
yflory
8aac7bad45 Make sure the ID is not used when uploading a file 2018-05-28 16:57:20 +02:00