yflory
|
f357ec32c2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
b153dda6ff
|
Add avatars in the user list
|
8 years ago |
|
ansuz
|
c2e153e8ed
|
more fouc fixes
|
8 years ago |
|
ansuz
|
8ffad5ece6
|
FOUC fixes
|
8 years ago |
|
yflory
|
b6944e6638
|
Fix userlist style in apps without iframe
|
8 years ago |
|
yflory
|
555d0a09f8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
568ce70afd
|
Add a spinner for the history and update history buttons
|
8 years ago |
|
Caleb James DeLisle
|
2144587919
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
Caleb James DeLisle
|
c25f2df721
|
Added caching versions to some of the images which are loaded by js
|
8 years ago |
|
yflory
|
b9320e6005
|
Toolbar improvements
|
8 years ago |
|
ansuz
|
b7cb1a8d5f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
8279ef3130
|
Fix conflict between ckeditor toolbar and userlist on small screens
|
8 years ago |
|
ansuz
|
0b9d7d6c0b
|
fix color of links in poll and whiteboard
|
8 years ago |
|
yflory
|
56a25e1036
|
Small fixes for the new toolbar
|
8 years ago |
|
ansuz
|
c53ebe3598
|
bring upload status container to the front
|
8 years ago |
|
ansuz
|
5e56ad912e
|
remove the last bit of compiled css
|
8 years ago |
|
ansuz
|
7de2683169
|
make all apps use clientside templates
|
8 years ago |
|
ansuz
|
bdca6b10c2
|
use templates in poll.js
|
8 years ago |
|
ansuz
|
3a9b480e4e
|
resolve merge conflicts in template.js
|
8 years ago |
|
yflory
|
40f4fc2682
|
Add the profile app in template.js
|
8 years ago |
|
ansuz
|
9b6790534f
|
remove grey text from ckeditor initialState
|
8 years ago |
|
ansuz
|
e9bfaa9a60
|
compile less clientside. remove compiled css
|
8 years ago |
|
yflory
|
c431041e3f
|
Fix position of the rightside drawer with small screen
|
8 years ago |
|
yflory
|
36ef4178dc
|
Remove the editable title from the file app
|
8 years ago |
|
yflory
|
c364803406
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
805e604e53
|
Add missing icons
|
8 years ago |
|
ansuz
|
f181e8db60
|
correct parentheses
|
8 years ago |
|
yflory
|
ce44a8d351
|
Fix the backup button in anonymous drive
|
8 years ago |
|
yflory
|
06a0590f73
|
New folder icons
|
8 years ago |
|
yflory
|
0d4d104e08
|
Mobile support for the new toolbar
|
8 years ago |
|
yflory
|
5a48cba999
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
684269fdda
|
Userlist in polls
|
8 years ago |
|
ansuz
|
bd1db735dd
|
jshint compliance
|
8 years ago |
|
ansuz
|
35bfa1dce4
|
test client-side templates in whiteboard app
|
8 years ago |
|
yflory
|
a11befaa0f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
13288ee18b
|
Update the userlist in code, slide and pad
|
8 years ago |
|
yflory
|
dcfc59c2e2
|
Translation key updated
|
8 years ago |
|
yflory
|
92b6e60573
|
Small improvements for the new toolbar
|
8 years ago |
|
ansuz
|
eddfb936f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
115813c191
|
Merge branch 'new-templates' into staging
|
8 years ago |
|
ansuz
|
3657e978fd
|
give main2.js a more sensible name
|
8 years ago |
|
ansuz
|
e86ef209a8
|
define loading screen markup in js
|
8 years ago |
|
ansuz
|
118b83c420
|
make register and login user clientside templates
|
8 years ago |
|
yflory
|
8d956c3de6
|
New toolbar
|
8 years ago |
|
ansuz
|
48f9745619
|
clientside templating
|
8 years ago |
|
yflory
|
b7a0547b77
|
New toolbar colors
|
8 years ago |
|
yflory
|
59fb5bd8be
|
One toolbar color per app
|
8 years ago |
|
yflory
|
5a248db267
|
Merge branch 'staging' into newCk
|
8 years ago |
|
yflory
|
f13d23241c
|
Upgrade CkEditor to version 4.7
|
8 years ago |
|
ansuz
|
9be23be5eb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |