yflory
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
2017-06-09 14:36:38 +02:00
yflory
6a96aa6819
Disconnect the network when migrating the drive in another tab
2017-06-09 14:36:35 +02:00
ansuz
2f851ab97e
fix lint errors
2017-06-07 10:13:51 +02:00
yflory
f1271bfd03
Missing file
2017-06-06 11:56:22 +02:00
yflory
5641a4a839
Add the file app in the 'new' dropdown menus
2017-06-06 11:52:47 +02:00
yflory
ac91d2f413
Fix the upgrade and donate buttons in the home page
2017-06-06 11:37:54 +02:00
yflory
ee57458158
Remove the pin limit alert
2017-06-06 10:49:32 +02:00
yflory
85f1fb86d0
Add missing french translation keys
2017-06-06 10:28:00 +02:00
ansuz
f43132a63b
bump version in footer and package.json
2017-06-06 10:01:07 +02:00
ansuz
ec9a4dec5e
Merge branch 'soon' into staging
2017-06-05 11:43:26 +02:00
ansuz
8d4017b79e
fix parse error
2017-06-05 11:35:05 +02:00
jxtsai
b9b8352633
Traditional Chinese
2017-06-05 15:10:13 +08:00
ansuz
767793b5ca
fix stuck loading tip
2017-06-02 12:13:11 +02:00
ansuz
d774f8771b
remove more unused files
2017-05-31 12:23:31 +02:00
ansuz
540304807c
remove unused files
2017-05-31 12:11:33 +02:00
ansuz
daf112a5b5
take api settings into account for upgrade button
2017-05-30 20:11:15 +02:00
ansuz
ebfa228bc0
add upgrade button to all static pages
2017-05-30 18:39:41 +02:00
ansuz
909bc2ebf3
add new translation key
2017-05-30 15:39:13 +02:00
Gustavo H M Silva
81b931e56f
Update messages.pt-br.js
2017-05-30 09:45:14 -03:00
ansuz
a70014dd11
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-30 10:46:17 +02:00
ansuz
75874424cf
add 'support cryptpad' translation key
2017-05-30 10:41:46 +02:00
Gustavo H M Silva
08619e733a
Partial translation + duplicated token fix
...
Partial translation + duplicated token fix
2017-05-29 15:19:04 -03:00
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
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
