Commit graph

349 commits

Author SHA1 Message Date
yflory
b153dda6ff Add avatars in the user list 2017-06-30 16:57:23 +02:00
yflory
b9320e6005 Toolbar improvements 2017-06-30 11:42:54 +02:00
yflory
56a25e1036 Small fixes for the new toolbar 2017-06-29 15:15:40 +02:00
ansuz
9b6790534f remove grey text from ckeditor initialState 2017-06-27 14:26:09 +02:00
yflory
36ef4178dc Remove the editable title from the file app 2017-06-26 15:16:17 +02:00
yflory
06a0590f73 New folder icons 2017-06-23 17:58:41 +02:00
yflory
dcfc59c2e2 Translation key updated 2017-06-22 11:21:37 +02:00
yflory
8d956c3de6 New toolbar 2017-06-21 18:04:35 +02:00
yflory
59fb5bd8be One toolbar color per app 2017-06-20 12:33:50 +02:00
yflory
5a248db267 Merge branch 'staging' into newCk 2017-06-20 10:57:40 +02:00
yflory
f13d23241c Upgrade CkEditor to version 4.7 2017-06-20 10:03:13 +02:00
ansuz
9be23be5eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 18:09:57 +02:00
ansuz
b80d7513aa skip over the terms of service link 2017-06-19 18:03:39 +02:00
yflory
1275f3f3a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 17:59:18 +02:00
yflory
f5da7ae42e Add a new loading tip in french 2017-06-19 17:59:12 +02:00
ansuz
e2ff88e4c4 tooltips for file upload 2017-06-19 17:56:19 +02:00
Pierre Bondoerffer
726302a9ee
Spanish update 2017-06-19 15:05:17 +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
a98353af6c Add a button to upload a file in the drive 2017-06-14 15:55:03 +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
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
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
909bc2ebf3 add new translation key 2017-05-30 15:39:13 +02: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
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