yflory
|
d7f9ddd8d2
|
Fix icon colors in the new menu (/pad app)
|
2017-07-04 15:57:34 +02:00 |
|
yflory
|
cc67838786
|
Fix horizontal scrollbar in /pad anonymous mode
|
2017-07-04 15:56:18 +02:00 |
|
ansuz
|
fa06f9d413
|
fix minor bugs in poll
|
2017-07-04 15:09:09 +02:00 |
|
ansuz
|
43d4597f38
|
merge to master
|
2017-07-04 14:19:08 +02:00 |
|
yflory
|
47c6c64b8a
|
Allow emojis in default avatars
|
2017-07-03 18:37:50 +02:00 |
|
yflory
|
ffd184d50e
|
Fix overflowing names in the new userlist
|
2017-07-03 17:41:34 +02:00 |
|
yflory
|
1a27f11e73
|
Fix dropdown menus in static pages
|
2017-07-03 17:04:59 +02:00 |
|
yflory
|
fa2d857d70
|
Fix css issues with Safari
|
2017-07-03 16:11:41 +02:00 |
|
yflory
|
81c8949aee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-03 14:43:17 +02:00 |
|
yflory
|
1df5e6e855
|
Fix toolbar buttons for Safari
|
2017-07-03 14:32:54 +02:00 |
|
ansuz
|
bf414c15ee
|
fix logout button on home page
|
2017-07-03 12:26:08 +02:00 |
|
yflory
|
70c9f3df75
|
Fix avatar size
|
2017-07-03 12:13:37 +02:00 |
|
yflory
|
335898a4c7
|
Hack the drawer to close it when clicking outside
|
2017-06-30 18:23:23 +02:00 |
|
yflory
|
472a62730b
|
Fix profile creation and add a link to the profile app
|
2017-06-30 17:24:22 +02:00 |
|
yflory
|
f357ec32c2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 16:57:37 +02:00 |
|
yflory
|
b153dda6ff
|
Add avatars in the user list
|
2017-06-30 16:57:23 +02:00 |
|
ansuz
|
c2e153e8ed
|
more fouc fixes
|
2017-06-30 16:20:10 +02:00 |
|
ansuz
|
8ffad5ece6
|
FOUC fixes
|
2017-06-30 16:10:42 +02:00 |
|
yflory
|
b6944e6638
|
Fix userlist style in apps without iframe
|
2017-06-30 13:13:11 +02:00 |
|
yflory
|
555d0a09f8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 12:36:34 +02:00 |
|
yflory
|
568ce70afd
|
Add a spinner for the history and update history buttons
|
2017-06-30 12:36:21 +02:00 |
|
Caleb James DeLisle
|
2144587919
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 12:11:55 +02:00 |
|
Caleb James DeLisle
|
c25f2df721
|
Added caching versions to some of the images which are loaded by js
|
2017-06-30 12:11:44 +02:00 |
|
yflory
|
b9320e6005
|
Toolbar improvements
|
2017-06-30 11:42:54 +02:00 |
|
ansuz
|
b7cb1a8d5f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-29 17:54:29 +02:00 |
|
yflory
|
8279ef3130
|
Fix conflict between ckeditor toolbar and userlist on small screens
|
2017-06-29 17:51:30 +02:00 |
|
ansuz
|
0b9d7d6c0b
|
fix color of links in poll and whiteboard
|
2017-06-29 16:51:44 +02:00 |
|
yflory
|
56a25e1036
|
Small fixes for the new toolbar
|
2017-06-29 15:15:40 +02:00 |
|
ansuz
|
c53ebe3598
|
bring upload status container to the front
|
2017-06-28 16:33:00 +02:00 |
|
ansuz
|
5e56ad912e
|
remove the last bit of compiled css
|
2017-06-28 14:51:49 +02:00 |
|
ansuz
|
7de2683169
|
make all apps use clientside templates
|
2017-06-27 18:17:52 +02:00 |
|
ansuz
|
bdca6b10c2
|
use templates in poll.js
|
2017-06-27 15:38:12 +02:00 |
|
ansuz
|
3a9b480e4e
|
resolve merge conflicts in template.js
|
2017-06-27 14:28:28 +02:00 |
|
yflory
|
40f4fc2682
|
Add the profile app in template.js
|
2017-06-27 14:27:54 +02:00 |
|
ansuz
|
9b6790534f
|
remove grey text from ckeditor initialState
|
2017-06-27 14:26:09 +02:00 |
|
ansuz
|
e9bfaa9a60
|
compile less clientside. remove compiled css
|
2017-06-27 14:25:02 +02:00 |
|
yflory
|
c431041e3f
|
Fix position of the rightside drawer with small screen
|
2017-06-26 15:53:29 +02:00 |
|
yflory
|
36ef4178dc
|
Remove the editable title from the file app
|
2017-06-26 15:16:17 +02:00 |
|
yflory
|
c364803406
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-26 11:25:06 +02:00 |
|
yflory
|
805e604e53
|
Add missing icons
|
2017-06-26 11:24:49 +02:00 |
|
ansuz
|
f181e8db60
|
correct parentheses
|
2017-06-26 10:45:27 +02:00 |
|
MacLemon
|
f4fdb7040c
|
Optimize image assets to speedup page loading
|
2017-06-25 20:14:23 +02:00 |
|
yflory
|
ce44a8d351
|
Fix the backup button in anonymous drive
|
2017-06-23 18:02:36 +02:00 |
|
yflory
|
06a0590f73
|
New folder icons
|
2017-06-23 17:58:41 +02:00 |
|
yflory
|
0d4d104e08
|
Mobile support for the new toolbar
|
2017-06-23 17:56:14 +02:00 |
|
yflory
|
5a48cba999
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-22 16:15:08 +02:00 |
|
yflory
|
684269fdda
|
Userlist in polls
|
2017-06-22 16:14:54 +02:00 |
|
ansuz
|
bd1db735dd
|
jshint compliance
|
2017-06-22 16:02:20 +02:00 |
|
ansuz
|
35bfa1dce4
|
test client-side templates in whiteboard app
|
2017-06-22 16:01:33 +02:00 |
|
yflory
|
a11befaa0f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-22 15:52:31 +02:00 |
|
yflory
|
13288ee18b
|
Update the userlist in code, slide and pad
|
2017-06-22 15:52:25 +02:00 |
|
yflory
|
dcfc59c2e2
|
Translation key updated
|
2017-06-22 11:21:37 +02:00 |
|
yflory
|
92b6e60573
|
Small improvements for the new toolbar
|
2017-06-22 11:13:53 +02:00 |
|
ansuz
|
eddfb936f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-22 11:12:51 +02:00 |
|
ansuz
|
115813c191
|
Merge branch 'new-templates' into staging
|
2017-06-22 11:11:32 +02:00 |
|
ansuz
|
3657e978fd
|
give main2.js a more sensible name
|
2017-06-22 11:06:11 +02:00 |
|
ansuz
|
e86ef209a8
|
define loading screen markup in js
|
2017-06-22 11:04:21 +02:00 |
|
ansuz
|
118b83c420
|
make register and login user clientside templates
|
2017-06-22 10:04:46 +02:00 |
|
yflory
|
8d956c3de6
|
New toolbar
|
2017-06-21 18:04:35 +02:00 |
|
ansuz
|
48f9745619
|
clientside templating
|
2017-06-21 18:02:38 +02:00 |
|
yflory
|
b7a0547b77
|
New toolbar colors
|
2017-06-20 17:59:11 +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 |
|
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 |