Gustavo H M Silva
2d2e00b569
Merged translated and non-translated in pt-BR
...
I've merged the new tokens on the old translation in order to get a better understanding when updating the Brazilian Portuguese translation. It ran fine locally.
2017-05-29 14:43:15 -03:00
ansuz
92a7970eb8
fix merge conflicts
2017-05-29 19:04:47 +02:00
Pierre Bondoerffer
0a92719763
spanish! new keys ahoy
2017-05-29 18:25:18 +02:00
Pierre Bondoerffer
6518b56945
poll: french messages
2017-05-29 16:50:25 +02:00
ansuz
3915b30055
provide a register button on login
...
also direct users from file to login
2017-05-29 13:11:07 +02:00
Pierre Bondoerffer
b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
2017-05-29 12:59:49 +02:00
ansuz
b910915d47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-29 11:33:03 +02:00
ansuz
6573813523
Merge branch 'soon' into staging
2017-05-29 11:32:54 +02:00
Caleb James DeLisle
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
2017-05-26 18:09:31 +02:00
Pierre Bondoerffer
1092285a68
merge master
2017-05-26 16:18:51 +02:00
Caleb James DeLisle
6c1861dbc6
Merge branch 'soon' into staging
2017-05-26 15:48:44 +02:00
superniko
0559b8cb77
Update messages.ro.js
2017-05-26 16:47:45 +03:00
superniko
70fbbe0078
Update messages.ro.js
2017-05-25 10:23:27 +03:00
ansuz
bc26f7fc4e
Merge branch 'soon' into staging
2017-05-24 15:04:40 +02:00
Caleb James DeLisle
70c1061f47
Fix romanian translation
2017-05-24 14:49:00 +02:00
Caleb James DeLisle
83c0a6d37d
Romanian translation
2017-05-24 14:37:13 +02:00
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
0a646a9534
remove unnecessary space
2017-05-23 12:35:49 +02:00
yflory
d55b7e411c
Display an alert in the drive when the limit is reached
2017-05-22 17:56:27 +02:00
yflory
c45f08f147
Use a download button instead of downloading a file automatically
2017-05-22 11:43:45 +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
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
