Commit graph

285 commits

Author SHA1 Message Date
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
yflory
d13dde856a Add the markdown renderer file and change code's default content 2017-05-18 14:26:56 +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
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
ca6f910f0b Add french translations for 'log out everywhere' 2017-05-09 10:32:41 +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
yflory
ef89451a83 Display the storage limit in the drive 2017-05-02 17:14:53 +02:00
yflory
16f6ab813c Make it clear that the number is the history represents a version 2017-04-28 13:06:55 +02:00
yflory
a165332c15 Don't store a pad in the drive if the limit has been reached 2017-04-28 12:08:05 +02:00
yflory
bf7c7c45d0 Add the storage limit warning in the toolbar 2017-04-27 18:46:46 +02:00
yflory
f50aa5c29b Move the mediatag viewer into a media app 2017-04-26 14:55:06 +02:00
yflory
9882a3a923 Add support for the file applicaiton in the drive 2017-04-25 18:42:21 +02:00
Pierre Bondoerffer
ba407322e8
Update spanish 2017-04-24 15:16:30 +02:00
yflory
3e28d1b966 Add a missing key in the french translation 2017-04-24 14:41:55 +02:00
yflory
9abfadb32f Update french translation 2017-04-24 14:39:30 +02:00
ansuz
f7e96b4e8c resolve merge conflicts and jquery errors 2017-04-24 13:43:18 +02:00
yflory
92ea03d7d9 View and restore the history of a pad 2017-04-21 17:31:47 +02:00
ansuz
df9c312b7d make new text translateable 2017-04-18 18:31:58 +02:00
ansuz
50793f506d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-14 18:44:20 +02:00
ansuz
eed5b1260d set font-size label to match other ckeditor font sizes 2017-04-14 18:20:40 +02:00
Pierre Bondoerffer
0db603f580
spanish pinpad 2017-04-14 17:59:08 +02:00
ansuz
84dd879abb add messages for settings page 2017-04-14 17:22:00 +02:00
Pierre Bondoerffer
65e848fd4d
linter linted the lints 2017-04-13 17:50:28 +02:00
Pierre Bondoerffer
40c06c4515
Spanish! 2017-04-13 17:42:38 +02:00
yflory
d5e69653c0 Select opacity in draw mode in the canvas app 2017-04-10 17:03:50 +02:00
yflory
cfc5d634f4 Merge branch 'templates' into staging 2017-04-10 14:19:48 +02:00
yflory
63a130c678 Add a button to delete the selection in canvas 2017-04-10 11:55:39 +02:00
yflory
84d8615cf1 Save and use templates in pad, code and slides 2017-04-07 18:20:03 +02:00
yflory
dedf2b3c69 Display selected color and button to turn off draw mode in canvas 2017-04-07 14:54:02 +02:00
yflory
46a5eee597 Display the spinner in the toolbar for local changes 2017-04-05 14:57:07 +02:00
ansuz
fe7f7f4e6d Merge branch 'master' of https://github.com/gustavohmsilva/cryptpad into staging 2017-04-05 10:36:23 +02:00
Gustavo H M Silva
90612bc5ba Update messages.pt-br.js 2017-04-03 18:43:30 -03:00
ansuz
7908f3b4f0 make sure green UI elements use the same green 2017-03-30 15:50:06 +02:00
ansuz
a3a0592e5e add English and French keys for the whiteboard app 2017-03-29 11:54:46 +02:00
ansuz
b50b76bf81 remove unnecessary lines 2017-03-27 18:13:21 +02:00