yflory
|
96fde4e5ed
|
Add missing file
|
2017-07-06 10:24:28 +02:00 |
|
ansuz
|
df53166b37
|
implement and use prototype curve encryptors
|
2017-07-06 10:22:20 +02:00 |
|
ansuz
|
d293ba4d44
|
add support for invite hashes
|
2017-07-06 09:44:39 +02:00 |
|
yflory
|
37d5b0afb9
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
2017-07-05 18:42:51 +02:00 |
|
yflory
|
95e2efab89
|
Add to friend list
|
2017-07-05 18:42:32 +02:00 |
|
ansuz
|
e353627204
|
log users out if they do not have curve keys. add curve keys to object on registration and login.
|
2017-07-05 17:19:28 +02:00 |
|
ansuz
|
4016a95540
|
prototype invite app
|
2017-07-05 16:01:50 +02:00 |
|
yflory
|
465ef74f2b
|
Fix rpc
|
2017-07-05 16:02:22 +02:00 |
|
yflory
|
bf17ad3f1e
|
Friend button in the userlist
|
2017-07-05 15:59:36 +02:00 |
|
yflory
|
8dc8aa27ab
|
Lint
|
2017-07-05 12:27:40 +02:00 |
|
yflory
|
35e8c1a63b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-05 12:27:08 +02:00 |
|
yflory
|
43ac71603c
|
Move pad attributes in pad data
|
2017-07-05 12:26:42 +02:00 |
|
ansuz
|
9f6ecea5d9
|
fix nacl reference error in media tag
|
2017-07-05 11:57:53 +02:00 |
|
yflory
|
3e802c2443
|
Fix overflowing content in profile
|
2017-07-05 10:14:43 +02:00 |
|
ansuz
|
dfad622b76
|
Merge branch 'soon' into staging
|
2017-07-05 10:14:30 +02:00 |
|
yflory
|
69f4ce2abd
|
Fix middle click on the drive button
|
2017-07-04 17:03:54 +02:00 |
|
ansuz
|
cbd9fc4076
|
Merge branch 'staging'
|
2017-07-04 17:03:20 +02:00 |
|
ansuz
|
3fe0baa956
|
disable pin limit caching
|
2017-07-04 15:50:52 +02:00 |
|
ansuz
|
9c1eaf9c1a
|
lint compliance
|
2017-07-04 15:48:20 +02:00 |
|
ansuz
|
fa06f9d413
|
fix minor bugs in poll
|
2017-07-04 15:09:09 +02:00 |
|
ansuz
|
90bcadd87b
|
Merge branch 'soon' into staging
|
2017-07-04 14:58:45 +02:00 |
|
ansuz
|
be7e7fec43
|
don't bypass warnings when registering
|
2017-07-04 14:56:07 +02:00 |
|
yflory
|
cab595f959
|
Fix duplicate folders in the drive
|
2017-07-04 14:51:35 +02:00 |
|
ansuz
|
42375190e6
|
style buttons for long titles
|
2017-07-04 14:24:07 +02:00 |
|
ansuz
|
c27c140130
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-04 12:37:50 +02:00 |
|
ansuz
|
ac8da0d52d
|
load codemirror in the correct context. fix selection events
|
2017-07-04 12:37:24 +02:00 |
|
yflory
|
789274fd4f
|
Fix font-size in slides
|
2017-07-04 12:32:14 +02:00 |
|
ansuz
|
7377d39b39
|
hide print button
|
2017-07-04 10:35:55 +02:00 |
|
ansuz
|
43b877ad27
|
fix styling on media tag download button
|
2017-07-04 10:28:50 +02:00 |
|
ansuz
|
1fd0ba488a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-04 10:21:35 +02:00 |
|
ansuz
|
04a28433ae
|
replace inner content of media tag download buttons
|
2017-07-04 10:21:29 +02:00 |
|
ansuz
|
f85af7ef4c
|
hide useless messages
|
2017-07-04 10:19:18 +02:00 |
|
ansuz
|
a59853f9c2
|
use new media tag
|
2017-07-04 10:15:45 +02:00 |
|
yflory
|
8cf694bea6
|
Lint
|
2017-07-03 18:41:41 +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 |
|
ansuz
|
92d88d1644
|
don't change allowed media types until we have media-tag scoping
|
2017-07-03 16:45:40 +02:00 |
|
ansuz
|
678986dac4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-03 16:43:57 +02:00 |
|
yflory
|
fa2d857d70
|
Fix css issues with Safari
|
2017-07-03 16:11:41 +02:00 |
|
ansuz
|
efedfe0667
|
show preview pane by default in /slide/
|
2017-07-03 14:53:50 +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
|
8b0210baf1
|
hide useless error
|
2017-07-03 12:26:34 +02:00 |
|
yflory
|
991cb896bd
|
Fix avatar in /pad
|
2017-07-03 12:25:05 +02:00 |
|
yflory
|
70c9f3df75
|
Fix avatar size
|
2017-07-03 12:13:37 +02:00 |
|
ansuz
|
f09ae9b19c
|
jshint compliance
|
2017-07-03 11:51:47 +02:00 |
|
ansuz
|
4a9a564913
|
don't try to handle error thta never happens anymore
|
2017-07-03 11:40:52 +02:00 |
|
ansuz
|
b15aa3360a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-03 11:39:21 +02:00 |
|
ansuz
|
6ac056e314
|
make explicit file size RPCs unauthenticated
|
2017-07-03 11:38:39 +02:00 |
|
yflory
|
9b131dc49c
|
Fix CSS in the slide app
|
2017-07-03 11:34:30 +02:00 |
|
yflory
|
5694505719
|
Fix syntax highlighting
|
2017-07-03 11:16:28 +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 |
|
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
|
4ab82710ab
|
Remove the background color from the text-color button in the slide app
|
2017-06-30 11:55:29 +02:00 |
|
yflory
|
7e69d051c4
|
Lint errors
|
2017-06-30 11:46:20 +02:00 |
|
yflory
|
26193aeaa7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 11:42:59 +02:00 |
|
yflory
|
b9320e6005
|
Toolbar improvements
|
2017-06-30 11:42:54 +02:00 |
|
ansuz
|
9e91739044
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 11:21:27 +02:00 |
|
ansuz
|
ecff05425f
|
feedback for slide printing
|
2017-06-30 11:21:19 +02:00 |
|
ansuz
|
75c2a1fd73
|
jshint compliance
|
2017-06-30 11:20:56 +02:00 |
|
ansuz
|
b8934c0b97
|
smarter redraws of drive/settings usage bar
|
2017-06-30 11:20:40 +02:00 |
|
yflory
|
5a3e9c785c
|
Fix ckeditor toolbar
|
2017-06-29 18:15:41 +02:00 |
|
yflory
|
cc5b7615ad
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-29 18:05:49 +02:00 |
|
yflory
|
ed0121d172
|
Lint errors
|
2017-06-29 18:05:34 +02:00 |
|
yflory
|
8abc94d37b
|
Replace folder images in the drive
|
2017-06-29 18:03:19 +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
|
b037cfbfdb
|
set usage tips relative to bottom of screen, not top
|
2017-06-29 17:25:06 +02:00 |
|
ansuz
|
1763cf72d1
|
tell anonymous users they can't upload
|
2017-06-29 16:28:58 +02:00 |
|
yflory
|
7a87775372
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-29 15:21:09 +02:00 |
|
ansuz
|
45f180955b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-29 15:20:46 +02:00 |
|
yflory
|
56a25e1036
|
Small fixes for the new toolbar
|
2017-06-29 15:15:40 +02:00 |
|
ansuz
|
1179992a90
|
update feedback key name
|
2017-06-29 14:48:33 +02:00 |
|
ansuz
|
4a5f5de78c
|
restore missing stylesheet for poll
|
2017-06-29 14:35:23 +02:00 |
|
ansuz
|
bbf9916a91
|
fixes for file app
|
2017-06-29 14:21:48 +02:00 |
|
ansuz
|
39149a052b
|
add new feedback keys
|
2017-06-29 14:16:20 +02:00 |
|
ansuz
|
7a5c5ce0a3
|
load scripts asynchronously
|
2017-06-29 12:17:08 +02:00 |
|
ansuz
|
9b8866ed72
|
handle RPC_NOT_READY error for logged out users
|
2017-06-29 11:13:48 +02:00 |
|
ansuz
|
a9f8f42e3c
|
use minified less compiler
|
2017-06-29 10:50:21 +02:00 |
|
ansuz
|
fca1ef4d36
|
hide unstyled content until the loading screen is displayed
|
2017-06-29 10:49:35 +02:00 |
|
yflory
|
877c5a8d0e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-28 17:15:42 +02:00 |
|
yflory
|
19ff8a345d
|
Avatar upload in the profile app
|
2017-06-28 16:59:35 +02:00 |
|
ansuz
|
5e56ad912e
|
remove the last bit of compiled css
|
2017-06-28 14:51:49 +02:00 |
|
ansuz
|
7a7307d560
|
fix logging when resetting
|
2017-06-28 12:08:16 +02:00 |
|
yflory
|
6c94605b9b
|
File upload in the profile
|
2017-06-28 10:59:29 +02:00 |
|
ansuz
|
7439bbaba2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-28 10:58:24 +02:00 |
|
ansuz
|
ed45814020
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-28 10:57:49 +02:00 |
|
ansuz
|
cfc5907237
|
remove unnecessary style rules
|
2017-06-28 10:41:08 +02:00 |
|
yflory
|
85d8eda847
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-27 18:58:26 +02:00 |
|
yflory
|
176e47f394
|
Add the profile app
|
2017-06-27 18:58:20 +02:00 |
|
ansuz
|
1c1869a22c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-27 18:26:10 +02:00 |
|
ansuz
|
7de2683169
|
make all apps use clientside templates
|
2017-06-27 18:17:52 +02:00 |
|
ansuz
|
f232675cc9
|
create a favicon if it does not already exist
|
2017-06-27 18:07:03 +02:00 |
|
ansuz
|
3be6433fdf
|
send feedback on name changes
|
2017-06-27 18:06:32 +02:00 |
|
ansuz
|
bdca6b10c2
|
use templates in poll.js
|
2017-06-27 15:38:12 +02:00 |
|
ansuz
|
bb74935b08
|
allow pin limit caching to occur at api level
|
2017-06-27 15:37:42 +02:00 |
|
yflory
|
00a554ca0d
|
Fix the donate button style with the new toolbar
|
2017-06-27 14:36:49 +02:00 |
|
ansuz
|
e9bfaa9a60
|
compile less clientside. remove compiled css
|
2017-06-27 14:25:02 +02:00 |
|
ansuz
|
67a096a8a4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-27 09:57:32 +02:00 |
|
ansuz
|
7b37146034
|
don't let spacebar keyups propagate outside of the title
|
2017-06-26 18:32:29 +02:00 |
|
ansuz
|
9195c0cd12
|
is isOverPinLimit in toolbar
|
2017-06-26 18:13:06 +02:00 |
|
ansuz
|
fce0a37f50
|
cache pin data once retrieved from the server
|
2017-06-26 17:32:31 +02:00 |
|
yflory
|
8f2db44793
|
Remove getTitle from the file app
|
2017-06-26 16:38:59 +02:00 |
|
yflory
|
33ea8cb183
|
Make sure we don't call both the yes and no handlers in prompts
|
2017-06-26 16:23:55 +02:00 |
|
yflory
|
3076ade23a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-26 15:16:45 +02:00 |
|
yflory
|
36ef4178dc
|
Remove the editable title from the file app
|
2017-06-26 15:16:17 +02:00 |
|
ansuz
|
51e06e68a7
|
don't change slides when navigating through history
|
2017-06-26 14:40:48 +02:00 |
|
ansuz
|
ffcbde4325
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-26 14:32:42 +02:00 |
|
ansuz
|
48ece55ed5
|
style fixes, and dynamic less compilation
|
2017-06-26 14:32:37 +02:00 |
|
yflory
|
38f568635d
|
Fix duplicate media-tag in slides when adding or removing a slide
|
2017-06-26 14:08:14 +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
|
cc341ca6d4
|
Lint error
|
2017-06-23 17:57:29 +02:00 |
|
yflory
|
0d4d104e08
|
Mobile support for the new toolbar
|
2017-06-23 17:56:14 +02:00 |
|
ansuz
|
b4b851959f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-22 17:42:32 +02:00 |
|
ansuz
|
61a891267f
|
more feedback
|
2017-06-22 17:42:24 +02:00 |
|
yflory
|
c1d2fa6b52
|
Unhack validateKey for the history mode
|
2017-06-22 17:35:54 +02:00 |
|
yflory
|
90cc3e6a5e
|
New userlist in the whiteboard app
|
2017-06-22 17:16:42 +02:00 |
|
yflory
|
2710279904
|
Use the new share button in the file app
|
2017-06-22 17:03:51 +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
|
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 |
|
ansuz
|
852c028822
|
don't allow editing if pad type is wrong
|
2017-06-22 14:31:55 +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
|
118b83c420
|
make register and login user clientside templates
|
2017-06-22 10:04:46 +02:00 |
|
ansuz
|
ab54dcf84d
|
make libs pass jshint
|
2017-06-22 10:03:58 +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
|
503e9de07c
|
Lint errors
|
2017-06-20 18:00:57 +02:00 |
|
yflory
|
b7a0547b77
|
New toolbar colors
|
2017-06-20 17:59:11 +02:00 |
|
yflory
|
3052ec8abb
|
Merge branch 'newCk' into staging
|
2017-06-20 14:57:19 +02:00 |
|
yflory
|
c3f636851a
|
Fix path size width in drive
|
2017-06-20 14:56:15 +02:00 |
|
yflory
|
c22f610d5c
|
Fix the drive integrity check
|
2017-06-20 12:59:44 +02:00 |
|
yflory
|
fb388f2610
|
Fix an issue with invalid drive before migration
|
2017-06-20 12:42:30 +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
|
728272d936
|
Fix undefined function
|
2017-06-20 10:29:03 +02:00 |
|
yflory
|
f13d23241c
|
Upgrade CkEditor to version 4.7
|
2017-06-20 10:03:13 +02:00 |
|
ansuz
|
d822dfe37a
|
add forget button to file app
|
2017-06-19 17:44:30 +02:00 |
|
ansuz
|
7fd36a72f3
|
re-add download button for file app
|
2017-06-19 17:36:22 +02:00 |
|
ansuz
|
f02a381e32
|
avoid horizontal scrollbars
|
2017-06-19 16:30:03 +02:00 |
|
ansuz
|
cc5d5d4f1d
|
make pdfs in file app big
|
2017-06-19 16:13:11 +02:00 |
|
yflory
|
dbfad9d227
|
Lint
|
2017-06-19 16:02:27 +02:00 |
|
yflory
|
91d46cdee4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 15:58:26 +02:00 |
|
yflory
|
d3b9ac2511
|
Update the preview and present content on Ready in slides
|
2017-06-19 15:58:10 +02:00 |
|
ansuz
|
5fd4870b8b
|
Merge pull request #138 from pbondoer/staging
Fix poll auto-focus inputs
|
2017-06-19 15:36:35 +02:00 |
|
Pierre Bondoerffer
|
626e54d7b5
|
Fix poll auto-focus inputs
|
2017-06-19 15:30:22 +02:00 |
|
yflory
|
54adb680e7
|
Hide the slide number in the title outside of present mode
|
2017-06-19 15:26:27 +02:00 |
|
ansuz
|
17838f1d70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 14:55:45 +02:00 |
|
ansuz
|
1b66383bac
|
don't create color-picker if readonly
|
2017-06-19 14:55:34 +02:00 |
|
yflory
|
a38819f5b9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 14:41:38 +02:00 |
|
yflory
|
1ad1b78c64
|
Fix the history mode with readOnly and old URLs
|
2017-06-19 14:41:31 +02:00 |
|
ansuz
|
b2a70f86d3
|
disallow concurrent logins
|
2017-06-19 14:22:21 +02:00 |
|
ansuz
|
35e0de463b
|
disallow concurrent scrypt cycles
|
2017-06-19 14:18:10 +02:00 |
|
ansuz
|
06ca70d11e
|
lint compliance
|
2017-06-19 14:05:40 +02:00 |
|
ansuz
|
f29f430e7c
|
better handling of non-rpc messages
|
2017-06-19 12:38:24 +02:00 |
|
yflory
|
f1aef66fc9
|
Fix the drive history
|
2017-06-19 12:35:45 +02:00 |
|
yflory
|
008c417111
|
Context menu was not hidden after a click in the drive
|
2017-06-19 12:08:53 +02:00 |
|
yflory
|
377a90961b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 11:53:13 +02:00 |
|
yflory
|
e40f43bd20
|
Migrated pads were not displayed instantly in the drive
|
2017-06-19 11:52:57 +02:00 |
|
ansuz
|
44b8bc7b7d
|
make context menus unselectable
|
2017-06-19 11:43:24 +02:00 |
|
yflory
|
928dadcf77
|
Fix toolbar dropdown menus not visible in slide
|
2017-06-19 10:37:01 +02:00 |
|
yflory
|
1df11f2813
|
Update the font-size when entering/leaving present mode
|
2017-06-19 10:26:14 +02:00 |
|
yflory
|
66d8c0ed11
|
Add a preview mode to the slide app
|
2017-06-16 15:11:32 +02:00 |
|
yflory
|
a5924cb803
|
Make sure the initial title is set in the userDoc when creating a new pad
|
2017-06-15 18:50:39 +02:00 |
|
yflory
|
8b5f4dbd47
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 18:36:35 +02:00 |
|
yflory
|
3a36040ba7
|
lint
|
2017-06-15 18:36:23 +02:00 |
|
ansuz
|
0e9ebddf11
|
fix the things
|
2017-06-15 18:13:24 +02:00 |
|
ansuz
|
c0e2c1060e
|
don't reload when slide hash changes
|
2017-06-15 17:54:35 +02:00 |
|
yflory
|
24c14ffbf3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 16:31:09 +02:00 |
|
yflory
|
5bfd8470cb
|
Display the file size before downloading it
|
2017-06-15 16:30:50 +02:00 |
|
ansuz
|
3f85471ab3
|
update footer and package.json for upcoming version
|
2017-06-15 16:13:33 +02:00 |
|
yflory
|
594405de73
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 15:36:23 +02:00 |
|
yflory
|
cbe21959b4
|
Update UI for the file/media app
|
2017-06-15 15:35:52 +02:00 |
|
ansuz
|
06eceed8b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 15:34:22 +02:00 |
|
ansuz
|
17146d7af9
|
send feedback for uploads
|
2017-06-15 15:34:13 +02:00 |
|
yflory
|
c2c04bd5d8
|
Lint
|
2017-06-15 15:02:31 +02:00 |
|
yflory
|
2068a8b85b
|
Embed the mediatag library in the file app
|
2017-06-15 14:58:18 +02:00 |
|
yflory
|
cd5705b3f3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 13:54:09 +02:00 |
|
yflory
|
1e9bc89855
|
Fix drive icons when the name contains a long word
|
2017-06-15 13:54:02 +02:00 |
|
ansuz
|
5ce453afa0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 13:51:11 +02:00 |
|
ansuz
|
e73e32ab3a
|
fix too-tall download button
|
2017-06-15 13:43:32 +02:00 |
|
yflory
|
927f6404b8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 13:35:07 +02:00 |
|
yflory
|
66b076111e
|
Add an upload button to the slide's file picker
|
2017-06-15 12:32:44 +02:00 |
|
ansuz
|
c2e5ef7048
|
better sizing for videos
|
2017-06-15 12:11:39 +02:00 |
|
ansuz
|
c717d01714
|
fix pdf height
|
2017-06-15 12:06:53 +02:00 |
|
ansuz
|
b480346f5b
|
more efficient media-tag
|
2017-06-15 12:05:25 +02:00 |
|
ansuz
|
0d47e68d3e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 11:19:24 +02:00 |
|
ansuz
|
0eb50b8b6c
|
drop pdf.js dependency
|
2017-06-15 11:19:06 +02:00 |
|
yflory
|
f3f1cf9e6d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 11:05:07 +02:00 |
|
yflory
|
a237eec41e
|
Add a file picker in the slide app
|
2017-06-15 11:04:58 +02:00 |
|
ansuz
|
20874c76f1
|
prevent code blocks from overflowing slides
|
2017-06-14 18:56:44 +02:00 |
|
yflory
|
a4f45caebb
|
Lint
|
2017-06-14 18:25:54 +02:00 |
|
yflory
|
0a4e876139
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-14 17:52:23 +02:00 |
|
yflory
|
8738b42861
|
Update the drive UI to show that Upload and New are linked to a folder
|
2017-06-14 17:51:48 +02:00 |
|
ansuz
|
d25a0893cf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-14 17:24:49 +02:00 |
|
ansuz
|
3184e5d235
|
don't reload page on hash mode change
|
2017-06-14 17:24:44 +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
|
295f9c00a6
|
send feedback on buttons
|
2017-06-14 15:36:46 +02:00 |
|
ansuz
|
d5c7eb49a4
|
send feedback on toolbar hide and CKE buttons
|
2017-06-14 15:33:12 +02:00 |
|
yflory
|
7e0a2abc2c
|
Fix the file name when restoring an element from the trash
|
2017-06-14 13:03:10 +02:00 |
|
yflory
|
5b523be171
|
Fix drag&drop for pads in the drive
|
2017-06-14 12:55:46 +02:00 |
|
yflory
|
e51f678bb9
|
Don't display the popup whne moving a file to the trash
|
2017-06-14 12:50:44 +02:00 |
|
yflory
|
497ddeee6d
|
Upload files with drag&drop in the drive
|
2017-06-14 12:47:37 +02:00 |
|
ansuz
|
687b4d8307
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-14 11:10:26 +02:00 |
|
ansuz
|
69c3bd392f
|
update built media tag to latest XWiki version
|
2017-06-14 11:09:51 +02:00 |
|
yflory
|
494b44e2b1
|
fix lint errors
|
2017-06-14 10:04:54 +02:00 |
|
yflory
|
d8ebe566d8
|
Don't call mediatag for non-image files
|
2017-06-13 18:38:53 +02:00 |
|
yflory
|
37d3d04f0e
|
Clean mediatag integration code
|
2017-06-13 17:57:27 +02:00 |
|
ansuz
|
802146e2af
|
don't put download buttons in a div
|
2017-06-13 17:54:15 +02:00 |
|
yflory
|
19cb920a7c
|
Don't redraw a media-tag everytime the content has changed
|
2017-06-13 17:21:22 +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
|
17e4e9be27
|
download anything that isn't an image in media-tag
|
2017-06-13 16:12:13 +02:00 |
|
ansuz
|
8a599eb9b1
|
Merge pull request #136 from blumeva/staging
change minimum opacity
|
2017-06-13 15:27:45 +02:00 |
|
XWiki SAS
|
fc9ecb0f7c
|
change minimum opacity
|
2017-06-13 15:20:16 +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
|
74c9b663dd
|
changing whiteboard
|
2017-06-13 14:14:36 +02:00 |
|
XWiki SAS
|
40cf7ea107
|
change whiteboard
|
2017-06-13 14:11:22 +02:00 |
|
ansuz
|
1b574da053
|
fix typo
|
2017-06-13 12:24:32 +02:00 |
|
ansuz
|
7ad89bd9af
|
don't interrupt boot because of localStorage failure
|
2017-06-13 12:02:36 +02:00 |
|
ansuz
|
3337e2133a
|
more thorough tests for localStorage presence
|
2017-06-13 11:57:21 +02:00 |
|
yflory
|
a57f8679c5
|
Fix a race condition in the file app
|
2017-06-13 11:45:37 +02:00 |
|
yflory
|
4eeea93265
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-13 11:38:16 +02:00 |
|
yflory
|
11e2226f1a
|
Fix lint errors
|
2017-06-13 11:38:04 +02:00 |
|
ansuz
|
c779e328e8
|
warn users if their browser does not support localStorage
|
2017-06-13 11:33:25 +02:00 |
|
yflory
|
d7292e69c6
|
Fix undefined variable
|
2017-06-13 11:25:12 +02:00 |
|
ansuz
|
d367f71760
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-13 11:24:57 +02:00 |
|
ansuz
|
c70eb73d52
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-13 11:24:20 +02:00 |
|
yflory
|
803bad1421
|
Move the file upload code in a separate file
|
2017-06-13 11:21:26 +02:00 |
|
Pierre Bondoerffer
|
d344f03778
|
proper button text
|
2017-06-12 18:57:07 +02:00 |
|
Pierre Bondoerffer
|
2b5339193c
|
bring admin back
|
2017-06-12 18:45:04 +02:00 |
|
Pierre Bondoerffer
|
b2eef94232
|
use numbers, not strings
|
2017-06-12 18:35:13 +02:00 |
|
Pierre Bondoerffer
|
848010842f
|
dont sanity check silently
|
2017-06-12 18:26:27 +02:00 |
|
Pierre Bondoerffer
|
56f2c46c75
|
document a line
|
2017-06-12 18:25:06 +02:00 |
|
Pierre Bondoerffer
|
cd1c957929
|
NaN safety
|
2017-06-12 18:23:17 +02:00 |
|