662 Commits

Author SHA1 Message Date
yflory
b281d51d90 Fix typos in the french translation 2017-05-23 15:04:18 +02:00
yflory
38bd6b3808 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-23 14:50:42 +02:00
yflory
964d046154 Update a french translation key 2017-05-23 14:50:28 +02:00
ansuz
cf83cab596 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-23 12:35:54 +02:00
ansuz
0a646a9534 remove unnecessary space 2017-05-23 12:35:49 +02:00
yflory
6ddfe0e901 Fix new lines in /pad userlist 2017-05-23 12:14:31 +02:00
ansuz
4fae1b16c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 18:43:14 +02:00
yflory
d55b7e411c Display an alert in the drive when the limit is reached 2017-05-22 17:56:27 +02:00
ansuz
2ca6277660 enable pin limits by default 2017-05-22 16:50:32 +02:00
yflory
c45f08f147 Use a download button instead of downloading a file automatically 2017-05-22 11:43:45 +02:00
yflory
0c2f84058b Improve css for the file app 2017-05-22 11:16:01 +02:00
yflory
9c00a730f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 10:41:55 +02:00
yflory
538aec6ef5 Display a message when pinPads returns an error 2017-05-22 10:41:47 +02:00
ansuz
af4fd3c6d3 resolve merge conflicts 2017-05-19 19:14:08 +02:00
yflory
1ab6eb3c5d Add a queue for multiple uploads in the file app 2017-05-19 18:41:34 +02:00
ansuz
ba5ef5157e show pretty representations of storage usage 2017-05-19 18:37:31 +02:00
ansuz
ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-19 09:13:38 +02:00
ansuz
e7a458295b new translation keys for file upload 2017-05-19 09:10:36 +02:00
yflory
814c81fb13 Display an alert when CryptPad has a new version 2017-05-18 18:51:08 +02:00
yflory
21f9e31e75 Add a placeholder for the user app 2017-05-18 15:56:35 +02:00
yflory
620f4dc512 Add translations for the markdown preview button title 2017-05-18 15:05:37 +02:00
ansuz
3ba94a1ba2 correctly set release version number 2017-05-18 14:54:02 +02:00
yflory
2b60b81a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 14:27:10 +02:00
yflory
d13dde856a Add the markdown renderer file and change code's default content 2017-05-18 14:26:56 +02:00
ansuz
4debec39bb update footer with next release codename and corrected matrix link 2017-05-18 12:58:49 +02:00
ansuz
517438d7c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-16 14:33:34 +02:00
ansuz
81af9225fc template a Romanian translation 2017-05-16 14:32:54 +02:00
ansuz
e8275c02c6 Merge pull request #115 from pbondoer/spanish
Spanish update
2017-05-16 14:23:06 +02:00
Pierre Bondoerffer
ad6217f064
file upload spanish keys 2017-05-16 14:05:36 +02:00
ansuz
827233dcba new translation keys for file upload 2017-05-16 14:01:06 +02:00
yflory
dc2cdb7c08 Add the usage bar in the settings page 2017-05-15 18:16:22 +02:00
yflory
716245f864 Make all the buttons look the same 2017-05-15 16:16:50 +02:00
yflory
0f37d9def7 Change the button font size in the toolbar 2017-05-15 14:53:51 +02:00
yflory
48496416e7 Use the same font-size for all the toolbar buttons 2017-05-15 14:46:17 +02:00
yflory
03274c3776 Display an info message in the anonymous drive 2017-05-15 13:54:03 +02:00
Pierre Bondoerffer
ad5e18f558
Spanish update 2017-05-15 12:05:50 +02:00
yflory
601226115b New anonymous drive 2017-05-12 18:06:29 +02:00
yflory
5d0535966c Center vertically slides in present mode and checkbox to disable transitions 2017-05-11 10:58:33 +02:00
yflory
5a21be8112 Improve UI on mobile 2017-05-10 15:54:09 +02:00
yflory
ca6f910f0b Add french translations for 'log out everywhere' 2017-05-09 10:32:41 +02:00
yflory
bbc08bbcfd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 17:57:05 +02:00
yflory
6847906ac9 Move the userlist code in a separate file 2017-05-05 15:47:46 +02:00
ansuz
6909f663b6 modify 'log out everywhere' text 2017-05-05 15:18:32 +02:00
ansuz
a173e4c7a0 add 'log out everywhere' functionality in settings 2017-05-05 15:09:07 +02:00
ansuz
c07d3e6162 update version strings for upcoming release 2017-05-05 11:51:41 +02:00
ansuz
3e118c6a38 allow instance-wide custom salt for login 2017-05-05 09:10:31 +02:00
ansuz
1864dac84f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 16:16:16 +02:00
ansuz
78b11584f8 remove unused variables 2017-05-04 16:16:09 +02:00
yflory
4335b050af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 16:08:21 +02:00
yflory
a190c99426 Toolbar refactoring 2017-05-04 16:08:12 +02:00