ansuz
|
eeb2ee2d17
|
add clear channel rpc
|
2017-07-12 18:55:29 +02:00 |
|
ansuz
|
89af8e4472
|
fix funny off-by-one thing
|
2017-07-12 18:49:33 +02:00 |
|
yflory
|
ac684a8dc7
|
Use the APP toolbar in profile
|
2017-07-12 18:34:16 +02:00 |
|
yflory
|
2d509e3e25
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-12 14:34:57 +02:00 |
|
yflory
|
b3e225cb3b
|
Replace spinner by text and fix mobile UI
|
2017-07-12 14:33:28 +02:00 |
|
ansuz
|
f450a28d11
|
improve logic for guessing titles within code documents
|
2017-07-12 11:09:53 +02:00 |
|
ansuz
|
0483d15b8f
|
lint compliance
|
2017-07-12 10:55:42 +02:00 |
|
ansuz
|
c0cb5c4263
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-12 10:46:15 +02:00 |
|
ansuz
|
f4bca0f9c0
|
Modifications for latest media-tag
* use latest built media-tag
* include pdfjs and configure its path for media-tag
* check whether decryption events affect an avatar. crop it if so
|
2017-07-12 10:44:40 +02:00 |
|
ansuz
|
5b3cca58bd
|
modifications to handle latest media-tag
|
2017-07-12 10:44:03 +02:00 |
|
yflory
|
7f5c301734
|
Add display name in the settings useradmin menu
|
2017-07-11 18:50:41 +02:00 |
|
yflory
|
fb21a650ce
|
Lint errors
|
2017-07-11 17:40:13 +02:00 |
|
yflory
|
159ccc2866
|
Fix mediatag flickering
|
2017-07-11 17:39:08 +02:00 |
|
yflory
|
16d0527e92
|
Add a page title in drive, settings and file
|
2017-07-11 15:13:39 +02:00 |
|
yflory
|
a0b14faf89
|
Fix the font in settings and drive
|
2017-07-11 13:11:16 +02:00 |
|
yflory
|
8f5a244999
|
Replace mediatag markdown syntax by html. Enable file upload in /code.
|
2017-07-11 11:56:06 +02:00 |
|
yflory
|
438e7e6cf9
|
Fix display name in useradmin (friends app)
|
2017-07-10 13:04:33 +02:00 |
|
yflory
|
e6188bfb63
|
Fix useradmin dropdown position
|
2017-07-10 12:38:54 +02:00 |
|
yflory
|
97d8d86395
|
Fix avatar in static pages
|
2017-07-10 12:03:44 +02:00 |
|
yflory
|
e8f3df5a46
|
Clean less
|
2017-07-10 11:57:04 +02:00 |
|
yflory
|
159d72f33b
|
Merge branch 'msg' into staging
|
2017-07-10 11:48:22 +02:00 |
|
yflory
|
8e2e8b1653
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-10 11:46:16 +02:00 |
|
yflory
|
ff10c282d4
|
Avatar in the user admin button
|
2017-07-10 11:46:06 +02:00 |
|
yflory
|
be6ee672d3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-10 11:16:52 +02:00 |
|
yflory
|
f0523a0153
|
Avatar in the user admin menu
|
2017-07-10 11:16:44 +02:00 |
|
ansuz
|
e10de1219b
|
feedback on view hash usage
|
2017-07-10 11:13:56 +02:00 |
|
ansuz
|
52eb8e307c
|
feedback for language used
|
2017-07-10 10:59:32 +02:00 |
|
yflory
|
1c531ccd47
|
Pin the chat channels
|
2017-07-10 10:39:57 +02:00 |
|
ansuz
|
4a37bc4a1c
|
abort the realtime session if it does not synchronize for 30 seconds
|
2017-07-10 10:34:25 +02:00 |
|
ansuz
|
c096872467
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
2017-07-10 09:30:44 +02:00 |
|
ansuz
|
22fbc7e5d8
|
implement getter for public keys
|
2017-07-10 09:21:27 +02:00 |
|
yflory
|
df103c4074
|
Messaging app
|
2017-07-07 18:53:21 +02:00 |
|
ansuz
|
1c462d5c4a
|
use random token for feedback instead of date
|
2017-07-07 10:16:54 +02:00 |
|
yflory
|
21f1527c71
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
2017-07-06 18:39:06 +02:00 |
|
yflory
|
5c7441f82c
|
Display the friend list in the friend app
|
2017-07-06 18:38:58 +02:00 |
|
ansuz
|
fac715dd09
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
2017-07-06 18:35:21 +02:00 |
|
ansuz
|
4b23ef74d7
|
add support for curve message signing and curve validateKeys
|
2017-07-06 18:30:16 +02:00 |
|
yflory
|
a5e8f6ae81
|
Add friend app and fix avatar size
|
2017-07-06 18:00:03 +02:00 |
|
yflory
|
af31771e3a
|
Share a channel id, not a hash
|
2017-07-06 14:47:02 +02:00 |
|
yflory
|
852b2eaf1d
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
2017-07-06 14:27:32 +02:00 |
|
yflory
|
26a83003b5
|
Create an owned channel
|
2017-07-06 14:27:13 +02:00 |
|
yflory
|
5b5a7ab286
|
Hide the friend button when the resquest is accepted
|
2017-07-06 12:31:31 +02:00 |
|
ansuz
|
d3bbdc27c0
|
lint compliance
|
2017-07-06 10:33:31 +02:00 |
|
ansuz
|
bce0b03ba4
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
2017-07-06 10:25:53 +02:00 |
|
ansuz
|
909e00bbc3
|
create a listmap object using public key crypto
|
2017-07-06 10:25:43 +02:00 |
|
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
|
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 |
|
yflory
|
cab595f959
|
Fix duplicate folders in the drive
|
2017-07-04 14:51:35 +02:00 |
|
ansuz
|
ac8da0d52d
|
load codemirror in the correct context. fix selection events
|
2017-07-04 12:37:24 +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 |
|
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 |
|
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 |
|
ansuz
|
6ac056e314
|
make explicit file size RPCs unauthenticated
|
2017-07-03 11:38:39 +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
|
b153dda6ff
|
Add avatars in the user list
|
2017-06-30 16:57:23 +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
|
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
|
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
|
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 |
|
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
|
39149a052b
|
add new feedback keys
|
2017-06-29 14:16:20 +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 |
|
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
|
1c1869a22c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-27 18:26:10 +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
|
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
|
33ea8cb183
|
Make sure we don't call both the yes and no handlers in prompts
|
2017-06-26 16:23:55 +02:00 |
|
ansuz
|
51e06e68a7
|
don't change slides when navigating through history
|
2017-06-26 14:40:48 +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
|
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
|
2710279904
|
Use the new share button in the file app
|
2017-06-22 17:03:51 +02:00 |
|
yflory
|
684269fdda
|
Userlist in polls
|
2017-06-22 16:14:54 +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
|
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
|
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
|
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
|
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
|
f29f430e7c
|
better handling of non-rpc messages
|
2017-06-19 12:38:24 +02:00 |
|
yflory
|
e40f43bd20
|
Migrated pads were not displayed instantly in the drive
|
2017-06-19 11:52:57 +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 |
|
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
|
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
|
17146d7af9
|
send feedback for uploads
|
2017-06-15 15:34:13 +02:00 |
|
yflory
|
2068a8b85b
|
Embed the mediatag library in the file app
|
2017-06-15 14:58:18 +02:00 |
|
yflory
|
66b076111e
|
Add an upload button to the slide's file picker
|
2017-06-15 12:32:44 +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
|
a237eec41e
|
Add a file picker in the slide app
|
2017-06-15 11:04:58 +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 |
|
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
|
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
|
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
|
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 |
|
yflory
|
803bad1421
|
Move the file upload code in a separate file
|
2017-06-13 11:21:26 +02:00 |
|
yflory
|
a58162a617
|
Make the drive tests work when not logged in
|
2017-06-12 17:49:33 +02:00 |
|
yflory
|
2fb5e3ae35
|
Merge branch 'staging' into newToolbar
|
2017-06-12 17:00:07 +02:00 |
|
yflory
|
969cec5d60
|
Make sure everything is synced before migrating the drive
|
2017-06-12 16:19:45 +02:00 |
|
yflory
|
7dd9ed543a
|
Merge branch 'newDrive' into staging
|
2017-06-12 16:08:09 +02:00 |
|
yflory
|
376b60c21c
|
New toolbar temp
|
2017-06-12 15:59:24 +02:00 |
|
ansuz
|
c9725af508
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-12 14:34:01 +02:00 |
|
ansuz
|
db9b9547d9
|
don't complain about missing callbacks for messages which are not our responsibility
|
2017-06-12 14:33:50 +02:00 |
|
yflory
|
30bdb9881c
|
Fix undefined element in select dropdown menus
|
2017-06-12 14:23:06 +02:00 |
|
yflory
|
8471dab6b1
|
Provide hints in theme and language dropdowns
|
2017-06-12 12:47:25 +02:00 |
|
yflory
|
a5cb5f2ceb
|
Merge branch 'staging' into newDrive
|
2017-06-12 10:51:38 +02:00 |
|
yflory
|
9cc25d4c9f
|
Merge branch 'staging' into newDrive
|
2017-06-09 17:03:01 +02:00 |
|
yflory
|
a57f7c6ce7
|
Fix lint errors
|
2017-06-09 16:39:44 +02:00 |
|
ansuz
|
4bcad3e154
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-09 16:26:36 +02:00 |
|
ansuz
|
47857ec382
|
use cached pinned usage data
|
2017-06-09 16:17:20 +02:00 |
|
yflory
|
75c3c10b20
|
Merge branch 'soon' into staging
|
2017-06-09 15:56:45 +02:00 |
|
yflory
|
c1402fbb0a
|
Lint error
|
2017-06-09 15:56:18 +02:00 |
|
yflory
|
b36484931d
|
Lint
|
2017-06-09 15:55:46 +02:00 |
|
yflory
|
1fb638f519
|
clean the code
|
2017-06-09 15:50:13 +02:00 |
|
ansuz
|
23318357a6
|
make fewer RPC calls for usageBar
|
2017-06-09 15:33:03 +02:00 |
|
ansuz
|
df586a223c
|
update limits, usage, plan, and note whenever they are checked
|
2017-06-09 15:31:43 +02:00 |
|
ansuz
|
8bad0c556e
|
change log to error
|
2017-06-09 15:29:55 +02:00 |
|
ansuz
|
b0e00d337e
|
more careful validation
|
2017-06-09 15:28:53 +02:00 |
|
yflory
|
fd88162624
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:47:37 +02:00 |
|
yflory
|
7c9e86e351
|
Merge branch 'soon' into staging
|
2017-06-09 14:47:15 +02:00 |
|
yflory
|
9694272083
|
Fix html code not parsed
|
2017-06-09 14:42:55 +02:00 |
|
yflory
|
9ca10ba524
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:40:26 +02:00 |
|
yflory
|
7f120c8fc1
|
Merge branch 'soon' into staging
|
2017-06-09 14:38:36 +02:00 |
|
yflory
|
78e6118153
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:38:21 +02:00 |
|
yflory
|
444c41974e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-09 14:37:54 +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
|
2a94bdaf05
|
test
|
2017-06-09 13:41:11 +02:00 |
|
yflory
|
ca95b5c42b
|
Remove unused console.log
|
2017-06-09 12:31:07 +02:00 |
|
yflory
|
f8c69573fd
|
Disconnect other tabs when migrating the drive
|
2017-06-09 12:23:28 +02:00 |
|
ansuz
|
c4e5741ae0
|
update upgrade button logic
|
2017-06-09 12:12:39 +02:00 |
|
ansuz
|
f1a9002417
|
use upgradeURL with usage bar
|
2017-06-09 10:46:11 +02:00 |
|
yflory
|
51e0d40572
|
Make sure the old storage key is removed after migration
|
2017-06-08 18:35:20 +02:00 |
|
yflory
|
b0fe04381d
|
Merge branch 'staging' into newDrive
|
2017-06-08 18:14:31 +02:00 |
|
yflory
|
1c2ea04f11
|
Drive refactoring
|
2017-06-08 17:52:00 +02:00 |
|
ansuz
|
fe42f5e88c
|
ask for new cookies and resend commands on NO_COOKIE errors
|
2017-06-08 14:19:14 +02:00 |
|
ansuz
|
da533b106a
|
improve type checking in getFileSize
|
2017-06-08 11:24:20 +02:00 |
|
ansuz
|
d25477e8c6
|
don't let tooltips interfere with DOM interaction
|
2017-06-06 18:08:23 +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 |
|
ansuz
|
767793b5ca
|
fix stuck loading tip
|
2017-06-02 12:13:11 +02:00 |
|
ansuz
|
f631973f1f
|
optimize file upload
|
2017-06-01 18:16:02 +02:00 |
|
ansuz
|
55af84cc90
|
lower spinner timeout interval
|
2017-06-01 14:27:06 +02:00 |
|
ansuz
|
07279c8dc7
|
export boolean Test.testing
|
2017-06-01 10:23:24 +02:00 |
|
Caleb James DeLisle
|
71bd808e4f
|
Send everything through the test global function
|
2017-06-01 00:09:39 +02:00 |
|
Caleb James DeLisle
|
244bd7b378
|
;;;
|
2017-05-31 23:32:47 +02:00 |
|
Caleb James DeLisle
|
7d557df74b
|
a new and more horrible way of sniffing the logs out of the instance
|
2017-05-31 23:29:58 +02:00 |
|
Caleb James DeLisle
|
0d4b74cfba
|
;;;;;; keep these ;;; for later ;;;;;
|
2017-05-31 19:46:23 +02:00 |
|
Caleb James DeLisle
|
24f37ea414
|
Delicious testing
|
2017-05-31 19:40:17 +02:00 |
|
ansuz
|
7b94106bac
|
fix inverted conditional :/
|
2017-05-31 18:15:31 +02:00 |
|
ansuz
|
2e03485db4
|
remove known bad entries from localStorage.userHash...
|
2017-05-31 18:12:58 +02:00 |
|
ansuz
|
936bf8df9d
|
return falsey if userHash is junk
|
2017-05-31 18:08:41 +02:00 |
|
ansuz
|
105e5cdac9
|
fix 'undefined/' userHash
|
2017-05-31 18:01:12 +02:00 |
|
ansuz
|
401e908963
|
use media-tag with xhr error handling
|
2017-05-31 17:17:01 +02:00 |
|
ansuz
|
3465710237
|
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
|
2017-05-31 12:55:05 +02:00 |
|
Daniel RADEAU
|
21c39572be
|
Update media-tag and fix bower dependencies
|
2017-05-31 11:53:25 +02:00 |
|
ansuz
|
ebfa228bc0
|
add upgrade button to all static pages
|
2017-05-30 18:39:41 +02:00 |
|
ansuz
|
149568689a
|
color donate button green
|
2017-05-30 17:58:31 +02:00 |
|
ansuz
|
ec6ad6772b
|
send feedback on donation
|
2017-05-30 17:25:36 +02:00 |
|
Daniel RADEAU
|
cb2efe138b
|
Media Tag integration, image, audio, video, pdf
|
2017-05-30 16:36:06 +02:00 |
|
ansuz
|
9ca5bc507e
|
add support for donate button
|
2017-05-30 15:42:53 +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 |
|
ansuz
|
3f3d64992d
|
resolve merge conflicts
|
2017-05-26 12:44:58 +02:00 |
|
ansuz
|
57017c68fa
|
hacks for cross-domain safari
|
2017-05-26 12:42:12 +02:00 |
|
ansuz
|
cf658c1b3a
|
backport live changes
|
2017-05-26 12:41:30 +02:00 |
|
yflory
|
df2b00122a
|
New drive structure without file names
|
2017-05-24 18:59:44 +02:00 |
|
ansuz
|
d9f7470f06
|
copy user details into sessionStorage for safari
|
2017-05-24 18:28:16 +02:00 |
|
ansuz
|
fd83ae3e61
|
implement createRandomInteger
|
2017-05-24 11:34:40 +02:00 |
|
ansuz
|
dc80b6b11f
|
throttle markdown preview
|
2017-05-24 11:27:16 +02:00 |
|
ansuz
|
e6c04ccb49
|
bump server after paying for an account
|
2017-05-23 16:11:07 +02:00 |
|
ansuz
|
6324d9bbb0
|
feedback on template feature usage
|
2017-05-23 14:54:40 +02:00 |
|
yflory
|
c3437382fb
|
Fix the release version in the what's new popup
|
2017-05-23 11:22:32 +02:00 |
|
ansuz
|
4fae1b16c2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-22 18:43:14 +02:00 |
|
ansuz
|
70cae0d2c3
|
safely access pin reset response
|
2017-05-22 18:43:06 +02:00 |
|
yflory
|
d55b7e411c
|
Display an alert in the drive when the limit is reached
|
2017-05-22 17:56:27 +02:00 |
|
ansuz
|
71dc0af6c7
|
better test for success error codes
|
2017-05-22 14:37:57 +02:00 |
|
yflory
|
9c00a730f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-22 10:41:55 +02:00 |
|
yflory
|
538aec6ef5
|
Display a message when pinPads returns an error
|
2017-05-22 10:41:47 +02:00 |
|
ansuz
|
ba5ef5157e
|
show pretty representations of storage usage
|
2017-05-19 18:37:31 +02:00 |
|
ansuz
|
e78299aed6
|
use async file decryption, listen for progress events.
|
2017-05-19 11:46:47 +02:00 |
|
ansuz
|
ef155d8ccf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-19 09:13:38 +02:00 |
|
yflory
|
d014fccfce
|
Fix lint error
|
2017-05-18 18:52:14 +02:00 |
|
yflory
|
2082b328b4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 18:51:21 +02:00 |
|
yflory
|
814c81fb13
|
Display an alert when CryptPad has a new version
|
2017-05-18 18:51:08 +02:00 |
|
ansuz
|
34606ea8ba
|
use newest xwiki media-tag
|
2017-05-18 18:24:24 +02:00 |
|
ansuz
|
2cee9534c5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 17:58:33 +02:00 |
|
ansuz
|
164342920e
|
fix inverted condition
|
2017-05-18 15:39:24 +02:00 |
|
yflory
|
620f4dc512
|
Add translations for the markdown preview button title
|
2017-05-18 15:05:37 +02:00 |
|
yflory
|
51bd41d4e8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 14:57:12 +02:00 |
|
yflory
|
0bd4caeb7e
|
Add the task list code to the markdown renderer
|
2017-05-18 14:57:04 +02:00 |
|
ansuz
|
d187945e94
|
jshint compliance
|
2017-05-18 14:55:16 +02:00 |
|
yflory
|
2b60b81a68
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 14:27:10 +02:00 |
|
yflory
|
d13dde856a
|
Add the markdown renderer file and change code's default content
|
2017-05-18 14:26:56 +02:00 |
|
ansuz
|
73ec91aa5e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 12:46:36 +02:00 |
|
ansuz
|
7befaccd88
|
move more rpc calls into pinpad
|
2017-05-18 12:36:12 +02:00 |
|
yflory
|
56bcdff890
|
Add a preview of the markdown content in the code editor
|
2017-05-18 12:16:26 +02:00 |
|
yflory
|
b72415b56b
|
Fix old hashes not working with the new parser
|
2017-05-18 10:13:08 +02:00 |
|
yflory
|
6b7aeb9121
|
Fix the text example
|
2017-05-17 15:48:09 +02:00 |
|
yflory
|
fe0f21594a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-16 14:41:51 +02:00 |
|
yflory
|
953e7155f0
|
Send only the hostname to the accounts server
|
2017-05-16 14:41:40 +02:00 |
|
ansuz
|
afef456b18
|
fix undefined reference
|
2017-05-16 14:15:42 +02:00 |
|
yflory
|
1a7c4d5ebe
|
Store the FS_hash in the user object after the merge
|
2017-05-16 11:25:37 +02:00 |
|
yflory
|
87fa28180a
|
Display an upgrade button in the settings page
|
2017-05-16 10:34:50 +02:00 |
|
yflory
|
c1b43db363
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-15 18:21:25 +02:00 |
|
ansuz
|
1542aa96bc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-15 18:17:56 +02:00 |
|
yflory
|
dc2cdb7c08
|
Add the usage bar in the settings page
|
2017-05-15 18:16:22 +02:00 |
|
ansuz
|
2dd04f7631
|
get limits from the server
|
2017-05-15 18:03:12 +02:00 |
|
yflory
|
8172f117a7
|
Fix Hash.alert not a function
|
2017-05-15 14:21:15 +02:00 |
|
yflory
|
0e58859393
|
Fix lint error
|
2017-05-15 13:55:40 +02:00 |
|
yflory
|
771348720b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-15 13:54:25 +02:00 |
|
yflory
|
57979f6314
|
Display the public key using a href in the settings page
|
2017-05-15 13:53:43 +02:00 |
|
ansuz
|
a9b670fdf5
|
don't parse trailing slash as part of encryption key in old hashes
|
2017-05-15 11:17:46 +02:00 |
|
ansuz
|
06f3d0eefe
|
shim isArray if not exists. correctly report how often this occurs
|
2017-05-15 10:26:52 +02:00 |
|
yflory
|
50d9f72b3a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-12 18:06:37 +02:00 |
|
yflory
|
601226115b
|
New anonymous drive
|
2017-05-12 18:06:29 +02:00 |
|
ansuz
|
30f6ef3f85
|
handle more response codes, use metadata
|
2017-05-12 17:34:29 +02:00 |
|
ansuz
|
18d959ef16
|
handle non-200 status codes
|
2017-05-12 17:07:30 +02:00 |
|
yflory
|
ed95bbb08f
|
Fix lint errors
|
2017-05-12 16:43:01 +02:00 |
|
yflory
|
89a993be3c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-12 16:33:56 +02:00 |
|
yflory
|
0f13198119
|
Move the parseHash code into parsePadUrl
|
2017-05-12 16:33:45 +02:00 |
|
ansuz
|
42f3a62cac
|
handle errors with XHR
|
2017-05-12 16:13:09 +02:00 |
|
ansuz
|
6c68b5e6ca
|
use new media-tag, listen for decryption events
|
2017-05-12 15:42:01 +02:00 |
|
ansuz
|
7dd5907ff0
|
Merge branch 'limit' into staging
|
2017-05-12 14:21:46 +02:00 |
|
ansuz
|
a993ab6616
|
use new encrypted file encoding in media-tag
|
2017-05-12 11:25:07 +02:00 |
|
ansuz
|
8c49150725
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-12 10:54:32 +02:00 |
|
yflory
|
e0293a1162
|
Merge branch 'master' into staging
|
2017-05-11 18:26:09 +02:00 |
|
yflory
|
57ee7de7d4
|
Update and return the storage limit
|
2017-05-11 16:12:44 +02:00 |
|
yflory
|
371edff943
|
Fix an error when moving unsorted files to root in the drive
|
2017-05-11 14:24:16 +02:00 |
|
yflory
|
b76dcba1d6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-11 12:43:49 +02:00 |
|
ansuz
|
6d30d7f89f
|
strip junk bytes from base64 more safely
|
2017-05-10 18:15:33 +02:00 |
|
ansuz
|
8f5989b6b0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-10 17:05:13 +02:00 |
|
yflory
|
cf81b02096
|
Make sure the spinner is always centered in the loading screen
|
2017-05-10 16:11:41 +02:00 |
|
yflory
|
5c8586f8a3
|
Fix typo in file upload
|
2017-05-10 15:00:05 +02:00 |
|
yflory
|
96ccb94397
|
Add the share button when a file upload is complete
|
2017-05-10 14:44:01 +02:00 |
|
yflory
|
c00158d23a
|
Move code to common-history
|
2017-05-10 13:39:14 +02:00 |
|
ansuz
|
922e7803e9
|
remove extraneous slashes from hashes when parsing
|
2017-05-10 11:54:05 +02:00 |
|
ansuz
|
a338b23f40
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-09 18:36:27 +02:00 |
|
ansuz
|
df47b913e3
|
fetch array buffers in cryptpad-common
|
2017-05-09 18:36:18 +02:00 |
|
yflory
|
ff16084719
|
Fix lint errors
|
2017-05-09 18:10:02 +02:00 |
|
yflory
|
50c8a859e6
|
Move the CodeMirror cursor code to common-codemirror
|
2017-05-09 17:57:27 +02:00 |
|
yflory
|
9eb8e55cf6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-09 17:48:07 +02:00 |
|
yflory
|
c79a6e3b2b
|
Move Metadata, CodeMirror and title functions in separate files
|
2017-05-09 17:47:47 +02:00 |
|
yflory
|
63710e1ccc
|
Move the code related to the title in another file
|
2017-05-09 14:32:41 +02:00 |
|
yflory
|
ce5cdce917
|
Fix an issue where the username was lost on websocket reconnect
|
2017-05-09 14:31:28 +02:00 |
|
ansuz
|
42dcfb9661
|
unceremoniously kick web clients when you 'log out everywhere'
|
2017-05-05 18:25:55 +02:00 |
|
yflory
|
9206d89531
|
Fix lint errors
|
2017-05-05 17:58:32 +02:00 |
|
yflory
|
bbc08bbcfd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-05 17:57:05 +02:00 |
|
yflory
|
5a883d5a57
|
Use the new toolbar and move the userlist code in a separate file
|
2017-05-05 17:56:49 +02:00 |
|
yflory
|
6847906ac9
|
Move the userlist code in a separate file
|
2017-05-05 15:47:46 +02:00 |
|
ansuz
|
3a338e0890
|
fix undefined reference
|
2017-05-05 15:20:41 +02:00 |
|
ansuz
|
a173e4c7a0
|
add 'log out everywhere' functionality in settings
|
2017-05-05 15:09:07 +02:00 |
|
yflory
|
5a5b02b82b
|
Don't store in the drive pads without a hash
|
2017-05-05 11:55:19 +02:00 |
|
ansuz
|
3e118c6a38
|
allow instance-wide custom salt for login
|
2017-05-05 09:10:31 +02:00 |
|
yflory
|
706120ae5b
|
Display images uploaded in the File app with the Media app
|
2017-05-04 18:24:58 +02:00 |
|
yflory
|
28cb40d7ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 17:14:30 +02:00 |
|
yflory
|
1b6fae4dd2
|
Update mediatag
|
2017-05-04 17:14:24 +02:00 |
|
ansuz
|
a0c420af8e
|
jshint compliance
|
2017-05-04 16:37:25 +02:00 |
|
ansuz
|
1864dac84f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:16:16 +02:00 |
|
ansuz
|
78b11584f8
|
remove unused variables
|
2017-05-04 16:16:09 +02:00 |
|
yflory
|
4335b050af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:08:21 +02:00 |
|
yflory
|
a190c99426
|
Toolbar refactoring
|
2017-05-04 16:08:12 +02:00 |
|
ansuz
|
7573b86946
|
call back with error if an RPC is made while disconnected
|
2017-05-04 11:36:24 +02:00 |
|
ansuz
|
410a9dfb17
|
temporary solution for testing pin limits
|
2017-05-04 11:20:52 +02:00 |
|
yflory
|
ef89451a83
|
Display the storage limit in the drive
|
2017-05-02 17:14:53 +02:00 |
|
ansuz
|
f2672d587a
|
fix variable redefinition
|
2017-05-02 09:42:51 +02:00 |
|
ansuz
|
0e7eeb285c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-29 14:24:14 +02:00 |
|
yflory
|
f414d480a9
|
Add the history mode to the CryptDrive
|
2017-04-28 18:23:41 +02:00 |
|
ansuz
|
cf4dee28f7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 17:13:18 +02:00 |
|
ansuz
|
28e4ef1b13
|
WIP RPC code
|
2017-04-28 17:11:50 +02:00 |
|
yflory
|
afb0061d7b
|
Fix an issue with anonymous user unable to store new pads
|
2017-04-28 17:11:07 +02:00 |
|
yflory
|
56aaeea003
|
Fix the drive toolbar not displaying the displayName
|
2017-04-28 17:03:47 +02:00 |
|
ansuz
|
3fa0a73025
|
prevent using string methods on undefined variable
|
2017-04-28 16:09:46 +02:00 |
|
ansuz
|
1b3ce5aa96
|
fix typo
|
2017-04-28 16:08:47 +02:00 |
|
yflory
|
a51a35da70
|
Fix an issue with hashes ending with a slash
|
2017-04-28 15:47:31 +02:00 |
|
yflory
|
ef58120819
|
Prevent multiple concurrent clicks to get the history
|
2017-04-28 14:09:59 +02:00 |
|
yflory
|
16f6ab813c
|
Make it clear that the number is the history represents a version
|
2017-04-28 13:06:55 +02:00 |
|
yflory
|
c820b3485c
|
Fix function undefined when loading a template
|
2017-04-28 12:16:45 +02:00 |
|
yflory
|
0ef1c14d7f
|
Fix lint errors
|
2017-04-28 12:12:17 +02:00 |
|
yflory
|
fc760b4820
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 12:08:21 +02:00 |
|
yflory
|
a165332c15
|
Don't store a pad in the drive if the limit has been reached
|
2017-04-28 12:08:05 +02:00 |
|
ansuz
|
e51c7f9cf0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 11:46:24 +02:00 |
|
yflory
|
bf7c7c45d0
|
Add the storage limit warning in the toolbar
|
2017-04-27 18:46:46 +02:00 |
|
ansuz
|
aedc46bdaf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-27 12:47:27 +02:00 |
|
ansuz
|
a97e7223f1
|
implement getBlobPathFromHex
|
2017-04-27 12:47:21 +02:00 |
|
yflory
|
520dabe094
|
Remove the unsorted files category
|
2017-04-26 18:46:40 +02:00 |
|
yflory
|
f50aa5c29b
|
Move the mediatag viewer into a media app
|
2017-04-26 14:55:06 +02:00 |
|
yflory
|
6a8274518b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 18:42:33 +02:00 |
|
yflory
|
9882a3a923
|
Add support for the file applicaiton in the drive
|
2017-04-25 18:42:21 +02:00 |
|
ansuz
|
12898b3358
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 18:28:48 +02:00 |
|
ansuz
|
74bcec8b31
|
programming is hard okay
|
2017-04-25 18:28:39 +02:00 |
|
yflory
|
2a417ddae8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 17:22:07 +02:00 |
|
yflory
|
d985b144cc
|
Add a new hash version for the file viewer
|
2017-04-25 17:19:13 +02:00 |
|
ansuz
|
3309087277
|
send feedback if isArray is not supported
|
2017-04-25 17:09:39 +02:00 |
|
ansuz
|
5194677443
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 14:57:34 +02:00 |
|
yflory
|
c9c7d61ad1
|
Media tag viewer
|
2017-04-25 14:55:38 +02:00 |
|
ansuz
|
729d1460b9
|
Merge branch 'master' into staging
|
2017-04-25 14:35:24 +02:00 |
|
ansuz
|
a840fb9e85
|
add example hashes and start working on hash v2
|
2017-04-25 14:33:57 +02:00 |
|
ansuz
|
d1fa68e30d
|
build UCF Media Tag
|
2017-04-24 17:13:32 +02:00 |
|
yflory
|
fdd51ec18d
|
Don't remove a folder moved into unsorted or into itself
|
2017-04-24 15:38:03 +02:00 |
|
ansuz
|
4fdc5f897e
|
only feedback migration if user had legacy store
|
2017-04-24 14:26:55 +02:00 |
|
ansuz
|
218f2ff76c
|
feedback when logging in or registering
|
2017-04-24 14:15:17 +02:00 |
|
yflory
|
4c3e842664
|
Fix focus issues with the history input in ckeditor
|
2017-04-24 13:55:03 +02:00 |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
2017-04-24 13:43:18 +02:00 |
|
yflory
|
5fc2e4cf71
|
Remove the toolbar in ckeditor history mode + history configurable
|
2017-04-24 11:41:00 +02:00 |
|
ansuz
|
18e2e66b06
|
jshint compliance
|
2017-04-24 11:39:39 +02:00 |
|
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
2017-04-21 17:31:47 +02:00 |
|
ansuz
|
4c0d7bf8e8
|
support multiple calls to cryptpad.ready
|
2017-04-21 16:51:32 +02:00 |
|
ansuz
|
ec041c88e2
|
console.log when providing feedback
also notify server if a users browser does not support proxies
|
2017-04-21 15:53:13 +02:00 |
|
ansuz
|
c51073f211
|
support batch getFileSize calls
|
2017-04-21 14:51:20 +02:00 |
|
ansuz
|
3afaf029cb
|
feedback about how often we migrate an old drive
|
2017-04-20 17:06:09 +02:00 |
|
ansuz
|
e8b053e48b
|
use bootloader in feedback.html
|
2017-04-18 17:31:35 +02:00 |
|
ansuz
|
347459781c
|
show the size of your files, if you're logged in
|
2017-04-18 15:49:04 +02:00 |
|
ansuz
|
2b8579e8b7
|
add pretty-printers for byte-counts
|
2017-04-18 15:44:15 +02:00 |
|
ansuz
|
2a25afae5f
|
Merge branch 'soon' into staging
|
2017-04-18 12:24:45 +02:00 |
|
Caleb James DeLisle
|
c341fa8e94
|
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
|
2017-04-18 12:14:32 +02:00 |
|
ansuz
|
da69c1822c
|
ask users to sign back if signing keys are missing
|
2017-04-18 11:58:41 +02:00 |
|
ansuz
|
821c1a3ec6
|
annotate code which we hope to be able to deprecate in the future
|
2017-04-14 18:44:08 +02:00 |
|
yflory
|
43c045721c
|
Get the channel history
|
2017-04-14 18:36:36 +02:00 |
|
ansuz
|
a27cc76fc0
|
uppercase LOL
|
2017-04-14 15:35:02 +02:00 |
|
ansuz
|
402ce2db93
|
better validation of inputs
|
2017-04-14 15:34:22 +02:00 |
|
ansuz
|
c7eae9675b
|
keep exporting isArray for backwards compatibility
but prevent internal use
|
2017-04-14 15:34:05 +02:00 |
|
ansuz
|
fbebbf0dca
|
minor clean up
|
2017-04-14 15:32:12 +02:00 |
|
ansuz
|
525d35c9ec
|
redefine alert
|
2017-04-14 14:54:43 +02:00 |
|
ansuz
|
f694a81a5c
|
move more interface code out of cryptpad-common
|
2017-04-14 12:25:32 +02:00 |
|
ansuz
|
a4157b9908
|
remove more unused functions
|
2017-04-14 12:14:10 +02:00 |
|
ansuz
|
e10901edb2
|
begin to move interface code out of cryptpad-common
|
2017-04-14 12:09:00 +02:00 |
|
ansuz
|
95789d3cbe
|
expose rpc for pinned usage
|
2017-04-14 11:41:51 +02:00 |
|
ansuz
|
8f4dbcf4c6
|
remove getPadTitle
|
2017-04-14 11:41:18 +02:00 |
|
ansuz
|
f42da4ecd8
|
move hashChannelList into common-hash.js
|
2017-04-14 11:40:28 +02:00 |
|
ansuz
|
63960bd38c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-13 19:47:04 +02:00 |
|
ansuz
|
520ae822fc
|
correct undefined reference
|
2017-04-13 19:46:52 +02:00 |
|
yflory
|
633d60ccd0
|
Remove a TODO
|
2017-04-13 17:19:32 +02:00 |
|
yflory
|
81d83897ec
|
Rename hash.js
|
2017-04-13 17:04:15 +02:00 |
|
yflory
|
07705cd5c1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-13 15:04:23 +02:00 |
|
yflory
|
eb2a3c1bbf
|
Fix lint errors
|
2017-04-13 15:04:17 +02:00 |
|
ansuz
|
607d9652f5
|
jshint compliance
|
2017-04-13 14:48:15 +02:00 |
|
yflory
|
3ba90332bb
|
Merge branch 'refactor' into staging
|
2017-04-13 14:44:55 +02:00 |
|
yflory
|
daabb0b3ad
|
Integrate and fix the new fileObject (userObject)
|
2017-04-13 14:06:40 +02:00 |
|
ansuz
|
df4a250359
|
use feedback api instead of app=
|
2017-04-13 12:18:08 +02:00 |
|
ansuz
|
86c37bfa37
|
fix find+replace error
|
2017-04-13 11:11:45 +02:00 |
|
ansuz
|
e618483395
|
extract all code for encoding and decoding hashes
|
2017-04-13 11:05:28 +02:00 |
|
ansuz
|
fdd2716ad5
|
move constants to the top of cryptpad-common.js
|
2017-04-13 10:31:08 +02:00 |
|
yflory
|
c1e0316d43
|
Refactor fileObject
|
2017-04-12 18:54:22 +02:00 |
|
ansuz
|
5212539a16
|
move standalone functions from common into their own file
|
2017-04-12 17:54:44 +02:00 |
|
ansuz
|
7437d6b902
|
remove unused function
|
2017-04-12 17:09:42 +02:00 |
|
ansuz
|
4e590a9dd1
|
remove even more dead code
|
2017-04-12 16:16:58 +02:00 |
|
ansuz
|
85fcaa9bbc
|
remove more dead code
|
2017-04-12 16:13:25 +02:00 |
|
ansuz
|
401936a91e
|
move singly-used css file out of /common/
|
2017-04-12 16:09:05 +02:00 |
|
ansuz
|
7a59183bb1
|
pinpad.create should always be async
|
2017-04-12 16:02:42 +02:00 |
|
ansuz
|
8de3610532
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-12 16:02:09 +02:00 |
|
ansuz
|
9aa0548b1f
|
remove dead cursor code
|
2017-04-12 15:59:30 +02:00 |
|
yflory
|
4e61b79f9a
|
Clean fileObject
|
2017-04-11 15:11:33 +02:00 |
|
yflory
|
cde724399c
|
Pin the pads
|
2017-04-11 14:53:44 +02:00 |
|
ansuz
|
2c8d1b8183
|
jshint compliance
|
2017-04-10 19:12:22 +02:00 |
|
ansuz
|
05a50b1f4c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-10 17:42:43 +02:00 |
|
ansuz
|
a14bb1480a
|
progress for implicit pinning
|
2017-04-10 17:42:35 +02:00 |
|
ansuz
|
f82278a25c
|
handle return of undefined hash
|
2017-04-10 17:38:25 +02:00 |
|
ansuz
|
1d933be5a6
|
make reset return the hash, not an array with containing it
|
2017-04-10 15:57:38 +02:00 |
|
yflory
|
f34492be94
|
Remove duplicates uid in the user list
|
2017-04-10 15:27:01 +02:00 |
|
yflory
|
cfc5d634f4
|
Merge branch 'templates' into staging
|
2017-04-10 14:19:48 +02:00 |
|
yflory
|
bd16e0f0e7
|
Templates in polls and canvas, and ability to disable templates
|
2017-04-10 14:19:15 +02:00 |
|
yflory
|
84d8615cf1
|
Save and use templates in pad, code and slides
|
2017-04-07 18:20:03 +02:00 |
|
ansuz
|
bd2034c47b
|
prepare rpc before 'ready' if pinning is enabled
|
2017-04-07 17:24:25 +02:00 |
|
ansuz
|
a70388284d
|
disable unnecessary messages
|
2017-04-07 17:21:04 +02:00 |
|
ansuz
|
abd87e1322
|
jshint compliance
|
2017-04-07 16:33:14 +02:00 |
|
ansuz
|
e4b15bc616
|
implement 'getCanonicalChannelList'
|
2017-04-07 15:52:34 +02:00 |
|
ansuz
|
a2f692b9a3
|
clean up serverside and clientside pinning logic
|
2017-04-07 15:20:30 +02:00 |
|
ansuz
|
fdede0d1fd
|
remove some dead code
|
2017-04-07 12:18:03 +02:00 |
|
ansuz
|
e87992c7ec
|
implement atomic pin reset rpc
|
2017-04-07 11:37:19 +02:00 |
|
ansuz
|
3380cf0348
|
implement getTotalSize rpc
|
2017-04-07 10:09:59 +02:00 |
|
ansuz
|
5c292fb1fa
|
jshint compliance
|
2017-04-06 08:32:31 +02:00 |
|
ansuz
|
64089c5f6b
|
implement pad pinning
|
2017-04-05 17:28:04 +02:00 |
|
yflory
|
13514dff63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 15:00:10 +02:00 |
|
yflory
|
46a5eee597
|
Display the spinner in the toolbar for local changes
|
2017-04-05 14:57:07 +02:00 |
|
ansuz
|
6c7cdc90a9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 12:24:17 +02:00 |
|
ansuz
|
212baeb3a6
|
better cookie schema. expire old sessions
|
2017-04-05 12:24:01 +02:00 |
|
yflory
|
54d271c4e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 12:04:18 +02:00 |
|
yflory
|
a9777ce560
|
Fix input losing focus in polls with Chrome 57
|
2017-04-05 12:04:01 +02:00 |
|
ansuz
|
3e47b8a38d
|
remove dead code
|
2017-04-05 10:42:24 +02:00 |
|
ansuz
|
182dbfc874
|
implement pinning logic in pinpad.js
|
2017-04-04 12:13:31 +02:00 |
|
ansuz
|
a5e5ddae08
|
rpc all the things
|
2017-04-03 19:24:57 +02:00 |
|
ansuz
|
04069cc7f4
|
fix font size
|
2017-03-31 13:28:30 +02:00 |
|
ansuz
|
6e9968f989
|
add 'lol' code theme
|
2017-03-31 09:19:45 +02:00 |
|
ansuz
|
9b4b642d4a
|
protect against subtly corrupted user objects
|
2017-03-30 17:19:49 +02:00 |
|
ansuz
|
d4ce3dc6b9
|
don't rewrite css rules. FOUC is too long
|
2017-03-29 16:02:04 +02:00 |
|
ansuz
|
3cfd0a4326
|
commit some garbage
|
2017-03-29 15:40:34 +02:00 |
|
ansuz
|
ed89a13fe6
|
progress on adding version string to some css
|
2017-03-29 12:55:36 +02:00 |
|
ansuz
|
76990ac1b2
|
version toolbar.css for cache-busting
|
2017-03-29 11:56:03 +02:00 |
|
ansuz
|
a0c17d7c9b
|
latest rpc code
|
2017-03-27 18:15:15 +02:00 |
|
ansuz
|
59a80d5fde
|
remove silly TODO
|
2017-03-27 12:08:19 +02:00 |
|
yflory
|
a8ffac5dcd
|
Remove old code
|
2017-03-27 11:30:09 +02:00 |
|
ansuz
|
fa9249ef29
|
don't notify for userlist changes if a user joins twice
|
2017-03-24 13:17:51 +01:00 |
|
ansuz
|
40f5e1706f
|
add a unique id to user objects, define a getter
|
2017-03-24 12:17:49 +01:00 |
|
yflory
|
994d640f8b
|
Fix an issue causing the lag icon to lose its color
|
2017-03-21 14:52:49 +01:00 |
|
yflory
|
6fbd1f0028
|
Store the dates as number and not strings to avoid ot issues
|
2017-03-21 14:46:40 +01:00 |
|
yflory
|
51033ab70a
|
Remove useless links in the context menu and properties for readonly pads in the drive
|
2017-03-21 12:09:07 +01:00 |
|
yflory
|
7afde2309d
|
Add properties to the files not in the trash
|
2017-03-21 11:34:18 +01:00 |
|
ansuz
|
b542245086
|
fix lint error
|
2017-03-20 18:11:26 +01:00 |
|
ansuz
|
cc43bb8362
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-20 18:05:39 +01:00 |
|
ansuz
|
98027dad27
|
jshint compliance
|
2017-03-20 18:02:11 +01:00 |
|
ansuz
|
4a173e30dc
|
set user's cursor to either the beginning or end of the document
|
2017-03-20 17:51:56 +01:00 |
|
yflory
|
29174b2922
|
Update the lag icon
|
2017-03-20 16:39:33 +01:00 |
|
yflory
|
26edb77cf0
|
Fix style and usability issues in slides
|
2017-03-20 15:20:42 +01:00 |
|
ansuz
|
d422c7e165
|
support old hashes in getUserChannelList
|
2017-03-16 17:14:54 +01:00 |
|
ansuz
|
5ed6223313
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-16 14:47:03 +01:00 |
|
ansuz
|
c9c9dd0999
|
use userChannelList if a list is not supplied to pinpad
|
2017-03-16 14:46:17 +01:00 |
|
ansuz
|
e8c3cf6aa5
|
implement rpc message signing
|
2017-03-16 14:45:38 +01:00 |
|
ansuz
|
d85a42c776
|
include User_hash in user channel list
|
2017-03-16 14:43:57 +01:00 |
|
yflory
|
7761aaa89f
|
Add search UI
|
2017-03-16 14:16:42 +01:00 |
|
ansuz
|
c3c866fa2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 18:59:53 +01:00 |
|
yflory
|
d19bbcb001
|
Add support for search in the drive
|
2017-03-15 18:59:55 +01:00 |
|
ansuz
|
5eb32b33ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 18:59:38 +01:00 |
|
ansuz
|
298725b3c2
|
don't show usage tips on error screens
|
2017-03-15 18:58:39 +01:00 |
|
ansuz
|
0a6373852e
|
add signing keys to user object at login and register time
|
2017-03-15 18:57:13 +01:00 |
|
yflory
|
b9c64a526a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 17:15:03 +01:00 |
|
yflory
|
15e9af77bb
|
Remove the langauge selector from toolbar and add it in settings
|
2017-03-15 17:14:49 +01:00 |
|
ansuz
|
8129b8cdc1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 16:05:05 +01:00 |
|
ansuz
|
15a67afc75
|
jshint compliance
|
2017-03-15 16:04:52 +01:00 |
|
yflory
|
13d7b3cadc
|
Merge branch 'd' into staging
|
2017-03-15 16:01:29 +01:00 |
|
ansuz
|
7187d3c550
|
implement getUserChannelList
|
2017-03-15 15:55:55 +01:00 |
|
ansuz
|
306f6ce806
|
resolve merge-conflict with accounting branch
|
2017-03-14 15:52:04 +01:00 |
|
yflory
|
f10149db1c
|
Make sure the tip is always visible when the loading screen is removed
|
2017-03-14 12:49:22 +01:00 |
|
ansuz
|
71db08eac2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-14 12:40:25 +01:00 |
|
ansuz
|
09afba80db
|
add support for logging in from register page
|
2017-03-14 12:39:50 +01:00 |
|
yflory
|
16e5788011
|
Call the callback if we can't parse the local Drive to import it
|
2017-03-14 12:09:52 +01:00 |
|
ansuz
|
413d9a6f0b
|
add a style-callback to confirm
|
2017-03-14 12:01:42 +01:00 |
|
ansuz
|
803e57c958
|
add more parameters to confirm dialogs
|
2017-03-13 19:30:56 +01:00 |
|
yflory
|
ceaf757680
|
Allow right click on the CryptPad logo/link in the top left corner
|
2017-03-13 18:49:30 +01:00 |
|
ansuz
|
f2aa531f27
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:38 +01:00 |
|
ansuz
|
df6298eeb6
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:17 +01:00 |
|
ansuz
|
07a2d8e189
|
apply translations on feedback page
|
2017-03-13 12:56:49 +01:00 |
|
yflory
|
b7986ff6b1
|
Replace the spinner code with a font awesome spinner
|
2017-03-13 11:52:39 +01:00 |
|
ansuz
|
d9996cc874
|
current work for pinning
|
2017-03-13 10:56:08 +01:00 |
|
ansuz
|
b3cc8da315
|
implement basic clientside RPC infrastructure
and provide a basic example for testing it
|
2017-03-10 18:03:52 +01:00 |
|
ansuz
|
81027b4200
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
2017-03-10 10:49:33 +01:00 |
|
yflory
|
459b18c97b
|
Add the loading screen in the HTML so that it is displayed before JS is loaded
|
2017-03-08 18:05:15 +01:00 |
|
yflory
|
404fa378e6
|
Move the store to the 'common' folder, it is not customizable anymore
|
2017-03-08 16:47:38 +01:00 |
|
yflory
|
0c1efd361b
|
Make sure the href is updated everywhere when importing a stronger link
|
2017-03-08 15:49:02 +01:00 |
|
yflory
|
b701e3cc85
|
Fix lint errors
|
2017-03-08 14:59:51 +01:00 |
|
yflory
|
4206382865
|
Fix the settings app to allow backup for unregistered users
|
2017-03-08 14:45:39 +01:00 |
|
yflory
|
f62267f8a1
|
Ability to import local pads in the user object
|
2017-03-07 18:39:21 +01:00 |
|
ansuz
|
e2418a6be2
|
sketch of how pinning rpc will look
|
2017-03-07 17:33:31 +01:00 |
|
ansuz
|
dc567fa7f3
|
signing keys are stored in hex so encode and decode them
|
2017-03-07 17:30:32 +01:00 |
|
yflory
|
9ad33574e9
|
Fix the function returning the pads list in the drive
|
2017-03-07 14:30:07 +01:00 |
|
yflory
|
d93a270336
|
Ability to display tips in the loading screen
|
2017-03-06 17:20:09 +01:00 |
|
yflory
|
77d09f64e1
|
Display anonymous users in the user list
|
2017-03-06 14:56:41 +01:00 |
|
yflory
|
cb88227e2b
|
Autocomplete on key press in some dropdown menus
|
2017-03-06 12:20:23 +01:00 |
|
yflory
|
2a1b241592
|
Display a button to open the editing link while in read-only mode if we know it
|
2017-03-03 18:14:53 +01:00 |
|
yflory
|
ed9bcca96f
|
Close the websocket network when CryptGet/CryptPut is done
|
2017-03-03 12:48:00 +01:00 |
|
ansuz
|
0bb10a8a0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 17:59:35 +01:00 |
|
ansuz
|
e1303a16da
|
add support for title attributes on dropdowns
|
2017-03-02 17:40:29 +01:00 |
|
yflory
|
52793385ea
|
Fix lint errors
|
2017-03-02 17:17:55 +01:00 |
|
ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
2017-03-02 17:09:06 +01:00 |
|
ansuz
|
c884782d57
|
here are some changes
|
2017-03-02 17:08:50 +01:00 |
|
yflory
|
9a7c2dd5e2
|
Add a 'settings' link to the user menu in static pages
|
2017-03-02 16:38:22 +01:00 |
|
yflory
|
c5f983ecd7
|
Convert read-only link to editing link in the drive
|
2017-03-02 16:01:34 +01:00 |
|
ansuz
|
a9afa24428
|
return empty string instead of blowing up when fixing HTML
|
2017-03-02 11:38:20 +01:00 |
|
yflory
|
8bdc8415ab
|
Find a pad in the drive
|
2017-03-02 10:15:13 +01:00 |
|
Caleb James DeLisle
|
91eda5fa83
|
Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
|
2017-03-01 21:06:53 +01:00 |
|
ansuz
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
2017-03-01 17:05:57 +01:00 |
|
ansuz
|
cb5e01815c
|
validate all alertify strings by default. require 'force' argument to bypass
|
2017-03-01 15:07:34 +01:00 |
|
yflory
|
2c5c6da0d9
|
Fix XSS in alertify logs
|
2017-03-01 13:09:14 +01:00 |
|
yflory
|
5797aab3f2
|
Fix XSS with display names in the user list
|
2017-03-01 13:08:36 +01:00 |
|
yflory
|
26e3971482
|
Fix XSS in the user dropdown menu
|
2017-03-01 13:08:09 +01:00 |
|
ansuz
|
5d39125004
|
Make onSettle Async Again
|
2017-02-28 13:12:04 +01:00 |
|
yflory
|
4f4075ed6e
|
Make the settings app available to anonymous users
|
2017-02-28 11:23:50 +01:00 |
|
ansuz
|
12aec60a12
|
hack around onSettle not doing its job
|
2017-02-28 11:05:59 +01:00 |
|
ansuz
|
1a259bb3aa
|
check if user has disallowed feedback api
|
2017-02-27 20:02:54 +01:00 |
|
yflory
|
498f4065cf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 14:29:55 +01:00 |
|
yflory
|
66dc166936
|
Make sure the realtime is synced with onSettle when using cryptget
|
2017-02-27 14:28:12 +01:00 |
|
ansuz
|
de5a21fe57
|
add a simple feedback api and text explaining what it is
|
2017-02-27 12:06:49 +01:00 |
|
yflory
|
88b29e8bdd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-24 18:55:48 +01:00 |
|
yflory
|
5303e76ece
|
Make sure the content is correctly applied in onReady
|
2017-02-24 18:55:41 +01:00 |
|
ansuz
|
cc829d51f8
|
jshint compliance
|
2017-02-24 18:23:43 +01:00 |
|
yflory
|
42b6cca18d
|
Fix new pad not working
|
2017-02-24 16:55:43 +01:00 |
|
yflory
|
3fd5669647
|
Hide the trash icon for read-only pads if we have the edit link in drive
|
2017-02-24 16:51:15 +01:00 |
|
yflory
|
e15a6a347f
|
Fix the forget pad button
|
2017-02-24 15:22:26 +01:00 |
|
yflory
|
54b0a86c2e
|
Make sure we redirect to the drive if we access the login page from the homepage
|
2017-02-24 11:44:47 +01:00 |
|
yflory
|
ba0b314f5e
|
Fix the 'new' button in drive which was broken in non root categories
|
2017-02-23 18:15:44 +01:00 |
|
yflory
|
0ce17ebbad
|
CryptDrive usability improvements (new file in drive + context menu)
|
2017-02-22 12:25:29 +01:00 |
|
ansuz
|
7e77c6828a
|
more correct pluralization
|
2017-02-21 18:55:48 +01:00 |
|
yflory
|
c72bbd4c37
|
Use the file name as initial title
|
2017-02-21 17:42:58 +01:00 |
|
yflory
|
47b8fefd9e
|
Load messages.js only once, in cryptpad-common
|
2017-02-21 14:16:23 +01:00 |
|
yflory
|
11d9c9e813
|
Merge branch 'master' into staging
|
2017-02-21 10:44:03 +01:00 |
|
yflory
|
2103f0afa8
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-02-21 10:42:35 +01:00 |
|
yflory
|
0bdf59c1dd
|
Fix broken link in the 'New' button on cryptpad.fr
|
2017-02-21 10:42:06 +01:00 |
|
yflory
|
d81d17b86c
|
Remove old translations keys no longer used
|
2017-02-17 17:39:27 +01:00 |
|
yflory
|
239e2bcc1f
|
Fix issue with null entries in Cryptpad_RECENTPADS
|
2017-02-17 15:18:09 +01:00 |
|
yflory
|
1540ae3f6f
|
Fix issue with null entries in Cryptpad_RECENTPADS
|
2017-02-17 15:16:30 +01:00 |
|
ansuz
|
94417d9a8b
|
jshint compliance
|
2017-02-17 14:28:18 +01:00 |
|
ansuz
|
c9b8889380
|
add cache-busting to chainpad-crypto
|
2017-02-17 11:26:43 +01:00 |
|
ansuz
|
09fade6127
|
add cache-busting to chainpad-crypto
|
2017-02-17 11:25:35 +01:00 |
|
yflory
|
2daa9f8658
|
Link to main page was opened in the inner iframe
|
2017-02-17 10:57:56 +01:00 |
|
yflory
|
deda40375a
|
Use the new onSettle from chainpad to determine if the realtime is synced
|
2017-02-17 10:31:07 +01:00 |
|
yflory
|
92d50ded64
|
Merge branch 'soon' into staging
|
2017-02-16 16:48:12 +01:00 |
|
yflory
|
97762f9f9a
|
Make sure all the elements in RECENTPADS are non-null objects
|
2017-02-16 16:07:43 +01:00 |
|
yflory
|
e4dbe97d71
|
Update display name in realtime across tabs and remember 'anonymous' name
|
2017-02-16 15:35:03 +01:00 |
|
yflory
|
7762ffcbff
|
Ability to use Ctrl+click on the cryptpad logo in apps
|
2017-02-15 18:31:36 +01:00 |
|
yflory
|
7497e0d1c5
|
Add a dropdown user menu to the top bar in static pages
|
2017-02-15 17:57:42 +01:00 |
|
yflory
|
7758d056fa
|
Ability to import/export a user realtime object
|
2017-02-15 12:40:28 +01:00 |
|
yflory
|
cd9cea8fa4
|
Create a settings app to manage user objects
|
2017-02-14 19:04:57 +01:00 |
|
yflory
|
71b84afdb2
|
Redirect to the pad when logging in or signing up from a pad
|
2017-02-14 11:29:08 +01:00 |
|
yflory
|
92050eb04f
|
Fix the trash button in toolbar not always working
|
2017-02-14 10:56:38 +01:00 |
|
yflory
|
aae3fba284
|
Fix the storage when the hash is invalid
|
2017-02-13 17:54:01 +01:00 |
|
yflory
|
b1b294aade
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-13 11:10:40 +01:00 |
|
yflory
|
3aa03225c9
|
Add a spinner when hashing the password and translate homepage
|
2017-02-13 11:09:30 +01:00 |
|
ansuz
|
fbcf4ccec4
|
force usernames to be lowercase
|
2017-02-13 11:01:30 +01:00 |
|
ansuz
|
5614bea271
|
redirect users to login and register from toolbar
|
2017-02-13 10:51:54 +01:00 |
|
ansuz
|
f723585758
|
add api to check whether the realtime has synced with the server
|
2017-02-13 10:42:17 +01:00 |
|
ansuz
|
d0edf75c89
|
signup link directs users to register page, not user
|
2017-02-10 16:48:28 +01:00 |
|
ansuz
|
1232aa8a79
|
jshint compliance
|
2017-02-10 14:25:02 +01:00 |