Pierre Bondoerffer
726302a9ee
Spanish update
2017-06-19 15:05:17 +02:00
ansuz
3f85471ab3
update footer and package.json for upcoming version
2017-06-15 16:13:33 +02:00
yflory
66b076111e
Add an upload button to the slide's file picker
2017-06-15 12:32:44 +02:00
yflory
a237eec41e
Add a file picker in the slide app
2017-06-15 11:04:58 +02:00
yflory
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 15:55:10 +02:00
yflory
a98353af6c
Add a button to upload a file in the drive
2017-06-14 15:55:03 +02:00
ansuz
9870169e03
remove a few elements from CKEditor config
2017-06-14 15:39:33 +02:00
yflory
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 16:15:11 +02:00
yflory
f9c26645cf
Upload images using the slide app
2017-06-13 16:15:04 +02:00
ansuz
ea79294494
Merge pull request #134 from pbondoer/newpoll
...
More poll improvements
2017-06-13 14:32:46 +02:00
ansuz
88c2c0afde
Merge pull request #135 from blumeva/staging
...
Staging
2017-06-13 14:23:41 +02:00
XWiki SAS
0004be521c
change translation
2017-06-13 14:21:22 +02:00
XWiki SAS
49370764c1
change whiteboard translation
2017-06-12 18:14:33 +02:00
yflory
376b60c21c
New toolbar temp
2017-06-12 15:59:24 +02:00
Pierre Bondoerffer
685b352db8
poll: Add show help button
2017-06-12 14:25:10 +02:00
yflory
8471dab6b1
Provide hints in theme and language dropdowns
2017-06-12 12:47:25 +02:00
Pierre Bondoerffer
621376b0fa
small fixes
2017-06-09 17:44:13 +02:00
Pierre Bondoerffer
cce665a18b
spanish updates
2017-06-09 17:42:25 +02:00
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
