91ebbdfdb4
View contact status
2017-07-18 15:50:21 +02:00
39fd0d0f5f
notify if you're focused on a conversation in a bacgkrounded tab
2017-07-18 10:57:37 +02:00
f719b34e09
Add tab notification in contacts
2017-07-18 10:42:23 +02:00
baf439648e
Add the contacts app in the dropdown menu
2017-07-18 10:22:51 +02:00
36d792874a
Fix initial text not removed in /contacts
2017-07-18 10:13:29 +02:00
df0442c2bf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-17 18:40:27 +02:00
eb4b5ca77c
stub history removal. coming soon
2017-07-17 18:39:44 +02:00
aa8181ab2b
Contacts app translations
2017-07-17 18:34:46 +02:00
73e32f273e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-17 18:08:07 +02:00
009d01abde
Fix friend removal and update user data
2017-07-17 18:07:58 +02:00
1aecdeb075
fresh media tag build
2017-07-17 11:08:39 +02:00
7114bfaa52
lint compliance
2017-07-13 21:09:29 +02:00
e2c17dbeb4
resolve conflicts
2017-07-13 17:52:00 +02:00
557f13f796
Unfriend and update username - beta
2017-07-13 17:32:57 +02:00
96d2ff67e1
user-plus as icon for add-friend
2017-07-13 15:22:11 +02:00
c3ba7cd792
fix race condition
2017-07-13 12:55:08 +02:00
d0d38aa2a3
feedback on first visit
2017-07-13 11:03:56 +02:00
9527a5def7
avoid a CSP error. silence pdfjs warnings
2017-07-13 10:58:45 +02:00
9707433944
comment out debugging info
2017-07-13 10:57:51 +02:00
575d4612f9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 18:56:12 +02:00
eda9908c3b
prevent accessing attributes of null
2017-07-12 18:56:04 +02:00
eeb2ee2d17
add clear channel rpc
2017-07-12 18:55:29 +02:00
89af8e4472
fix funny off-by-one thing
2017-07-12 18:49:33 +02:00
ac684a8dc7
Use the APP toolbar in profile
2017-07-12 18:34:16 +02:00
2d509e3e25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 14:34:57 +02:00
b3e225cb3b
Replace spinner by text and fix mobile UI
2017-07-12 14:33:28 +02:00
f450a28d11
improve logic for guessing titles within code documents
2017-07-12 11:09:53 +02:00
0483d15b8f
lint compliance
2017-07-12 10:55:42 +02:00
c0cb5c4263
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 10:46:15 +02:00
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
5b3cca58bd
modifications to handle latest media-tag
2017-07-12 10:44:03 +02:00
7f5c301734
Add display name in the settings useradmin menu
2017-07-11 18:50:41 +02:00
fb21a650ce
Lint errors
2017-07-11 17:40:13 +02:00
159ccc2866
Fix mediatag flickering
2017-07-11 17:39:08 +02:00
16d0527e92
Add a page title in drive, settings and file
2017-07-11 15:13:39 +02:00
a0b14faf89
Fix the font in settings and drive
2017-07-11 13:11:16 +02:00
8f5a244999
Replace mediatag markdown syntax by html. Enable file upload in /code.
2017-07-11 11:56:06 +02:00
438e7e6cf9
Fix display name in useradmin (friends app)
2017-07-10 13:04:33 +02:00
e6188bfb63
Fix useradmin dropdown position
2017-07-10 12:38:54 +02:00
97d8d86395
Fix avatar in static pages
2017-07-10 12:03:44 +02:00
e8f3df5a46
Clean less
2017-07-10 11:57:04 +02:00
159d72f33b
Merge branch 'msg' into staging
2017-07-10 11:48:22 +02:00
8e2e8b1653
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-10 11:46:16 +02:00
ff10c282d4
Avatar in the user admin button
2017-07-10 11:46:06 +02:00
be6ee672d3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-10 11:16:52 +02:00
f0523a0153
Avatar in the user admin menu
2017-07-10 11:16:44 +02:00
e10de1219b
feedback on view hash usage
2017-07-10 11:13:56 +02:00
52eb8e307c
feedback for language used
2017-07-10 10:59:32 +02:00
1c531ccd47
Pin the chat channels
2017-07-10 10:39:57 +02:00
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
2017-07-10 10:34:25 +02:00
c096872467
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-10 09:30:44 +02:00
22fbc7e5d8
implement getter for public keys
2017-07-10 09:21:27 +02:00
df103c4074
Messaging app
2017-07-07 18:53:21 +02:00
1c462d5c4a
use random token for feedback instead of date
2017-07-07 10:16:54 +02:00
21f1527c71
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 18:39:06 +02:00
5c7441f82c
Display the friend list in the friend app
2017-07-06 18:38:58 +02:00
fac715dd09
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 18:35:21 +02:00
4b23ef74d7
add support for curve message signing and curve validateKeys
2017-07-06 18:30:16 +02:00
a5e8f6ae81
Add friend app and fix avatar size
2017-07-06 18:00:03 +02:00
af31771e3a
Share a channel id, not a hash
2017-07-06 14:47:02 +02:00
852b2eaf1d
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 14:27:32 +02:00
26a83003b5
Create an owned channel
2017-07-06 14:27:13 +02:00
5b5a7ab286
Hide the friend button when the resquest is accepted
2017-07-06 12:31:31 +02:00
d3bbdc27c0
lint compliance
2017-07-06 10:33:31 +02:00
bce0b03ba4
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 10:25:53 +02:00
909e00bbc3
create a listmap object using public key crypto
2017-07-06 10:25:43 +02:00
96fde4e5ed
Add missing file
2017-07-06 10:24:28 +02:00
df53166b37
implement and use prototype curve encryptors
2017-07-06 10:22:20 +02:00
d293ba4d44
add support for invite hashes
2017-07-06 09:44:39 +02:00
37d5b0afb9
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-05 18:42:51 +02:00
95e2efab89
Add to friend list
2017-07-05 18:42:32 +02:00
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
4016a95540
prototype invite app
2017-07-05 16:01:50 +02:00
465ef74f2b
Fix rpc
2017-07-05 16:02:22 +02:00
bf17ad3f1e
Friend button in the userlist
2017-07-05 15:59:36 +02:00
8dc8aa27ab
Lint
2017-07-05 12:27:40 +02:00
35e8c1a63b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-05 12:27:08 +02:00
43ac71603c
Move pad attributes in pad data
2017-07-05 12:26:42 +02:00
9f6ecea5d9
fix nacl reference error in media tag
2017-07-05 11:57:53 +02:00
69f4ce2abd
Fix middle click on the drive button
2017-07-04 17:03:54 +02:00
cbd9fc4076
Merge branch 'staging'
2017-07-04 17:03:20 +02:00
3fe0baa956
disable pin limit caching
2017-07-04 15:50:52 +02:00
9c1eaf9c1a
lint compliance
2017-07-04 15:48:20 +02:00
cab595f959
Fix duplicate folders in the drive
2017-07-04 14:51:35 +02:00
ac8da0d52d
load codemirror in the correct context. fix selection events
2017-07-04 12:37:24 +02:00
43b877ad27
fix styling on media tag download button
2017-07-04 10:28:50 +02:00
1fd0ba488a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-04 10:21:35 +02:00
04a28433ae
replace inner content of media tag download buttons
2017-07-04 10:21:29 +02:00
f85af7ef4c
hide useless messages
2017-07-04 10:19:18 +02:00
a59853f9c2
use new media tag
2017-07-04 10:15:45 +02:00
8cf694bea6
Lint
2017-07-03 18:41:41 +02:00
47c6c64b8a
Allow emojis in default avatars
2017-07-03 18:37:50 +02:00
ffd184d50e
Fix overflowing names in the new userlist
2017-07-03 17:41:34 +02:00
92d88d1644
don't change allowed media types until we have media-tag scoping
2017-07-03 16:45:40 +02:00
fa2d857d70
Fix css issues with Safari
2017-07-03 16:11:41 +02:00
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-03 14:43:17 +02:00
8b0210baf1
hide useless error
2017-07-03 12:26:34 +02:00
991cb896bd
Fix avatar in /pad
2017-07-03 12:25:05 +02:00
6ac056e314
make explicit file size RPCs unauthenticated
2017-07-03 11:38:39 +02:00
5694505719
Fix syntax highlighting
2017-07-03 11:16:28 +02:00
335898a4c7
Hack the drawer to close it when clicking outside
2017-06-30 18:23:23 +02:00
472a62730b
Fix profile creation and add a link to the profile app
2017-06-30 17:24:22 +02:00
b153dda6ff
Add avatars in the user list
2017-06-30 16:57:23 +02:00
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:36:34 +02:00
568ce70afd
Add a spinner for the history and update history buttons
2017-06-30 12:36:21 +02:00
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:11:55 +02:00
c25f2df721
Added caching versions to some of the images which are loaded by js
2017-06-30 12:11:44 +02:00
7e69d051c4
Lint errors
2017-06-30 11:46:20 +02:00
26193aeaa7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 11:42:59 +02:00
b9320e6005
Toolbar improvements
2017-06-30 11:42:54 +02:00
75c2a1fd73
jshint compliance
2017-06-30 11:20:56 +02:00
b8934c0b97
smarter redraws of drive/settings usage bar
2017-06-30 11:20:40 +02:00
cc5b7615ad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 18:05:49 +02:00
ed0121d172
Lint errors
2017-06-29 18:05:34 +02:00
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 17:54:29 +02:00
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
2017-06-29 17:51:30 +02:00
b037cfbfdb
set usage tips relative to bottom of screen, not top
2017-06-29 17:25:06 +02:00
1763cf72d1
tell anonymous users they can't upload
2017-06-29 16:28:58 +02:00
7a87775372
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 15:21:09 +02:00
45f180955b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 15:20:46 +02:00
56a25e1036
Small fixes for the new toolbar
2017-06-29 15:15:40 +02:00
1179992a90
update feedback key name
2017-06-29 14:48:33 +02:00
39149a052b
add new feedback keys
2017-06-29 14:16:20 +02:00
9b8866ed72
handle RPC_NOT_READY error for logged out users
2017-06-29 11:13:48 +02:00
a9f8f42e3c
use minified less compiler
2017-06-29 10:50:21 +02:00
877c5a8d0e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-28 17:15:42 +02:00
19ff8a345d
Avatar upload in the profile app
2017-06-28 16:59:35 +02:00
5e56ad912e
remove the last bit of compiled css
2017-06-28 14:51:49 +02:00
7a7307d560
fix logging when resetting
2017-06-28 12:08:16 +02:00
6c94605b9b
File upload in the profile
2017-06-28 10:59:29 +02:00
1c1869a22c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-27 18:26:10 +02:00
f232675cc9
create a favicon if it does not already exist
2017-06-27 18:07:03 +02:00
3be6433fdf
send feedback on name changes
2017-06-27 18:06:32 +02:00
bb74935b08
allow pin limit caching to occur at api level
2017-06-27 15:37:42 +02:00
00a554ca0d
Fix the donate button style with the new toolbar
2017-06-27 14:36:49 +02:00
e9bfaa9a60
compile less clientside. remove compiled css
2017-06-27 14:25:02 +02:00
67a096a8a4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-27 09:57:32 +02:00
7b37146034
don't let spacebar keyups propagate outside of the title
2017-06-26 18:32:29 +02:00
9195c0cd12
is isOverPinLimit in toolbar
2017-06-26 18:13:06 +02:00
fce0a37f50
cache pin data once retrieved from the server
2017-06-26 17:32:31 +02:00
33ea8cb183
Make sure we don't call both the yes and no handlers in prompts
2017-06-26 16:23:55 +02:00
51e06e68a7
don't change slides when navigating through history
2017-06-26 14:40:48 +02:00
38f568635d
Fix duplicate media-tag in slides when adding or removing a slide
2017-06-26 14:08:14 +02:00
cc341ca6d4
Lint error
2017-06-23 17:57:29 +02:00
0d4d104e08
Mobile support for the new toolbar
2017-06-23 17:56:14 +02:00
b4b851959f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 17:42:32 +02:00
61a891267f
more feedback
2017-06-22 17:42:24 +02:00
c1d2fa6b52
Unhack validateKey for the history mode
2017-06-22 17:35:54 +02:00
2710279904
Use the new share button in the file app
2017-06-22 17:03:51 +02:00
684269fdda
Userlist in polls
2017-06-22 16:14:54 +02:00
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 15:52:31 +02:00
13288ee18b
Update the userlist in code, slide and pad
2017-06-22 15:52:25 +02:00
852c028822
don't allow editing if pad type is wrong
2017-06-22 14:31:55 +02:00
92b6e60573
Small improvements for the new toolbar
2017-06-22 11:13:53 +02:00
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 11:12:51 +02:00
115813c191
Merge branch 'new-templates' into staging
2017-06-22 11:11:32 +02:00
ab54dcf84d
make libs pass jshint
2017-06-22 10:03:58 +02:00
8d956c3de6
New toolbar
2017-06-21 18:04:35 +02:00
48f9745619
clientside templating
2017-06-21 18:02:38 +02:00
b7a0547b77
New toolbar colors
2017-06-20 17:59:11 +02:00
3052ec8abb
Merge branch 'newCk' into staging
2017-06-20 14:57:19 +02:00
c22f610d5c
Fix the drive integrity check
2017-06-20 12:59:44 +02:00
fb388f2610
Fix an issue with invalid drive before migration
2017-06-20 12:42:30 +02:00
59fb5bd8be
One toolbar color per app
2017-06-20 12:33:50 +02:00
5a248db267
Merge branch 'staging' into newCk
2017-06-20 10:57:40 +02:00
728272d936
Fix undefined function
2017-06-20 10:29:03 +02:00
a38819f5b9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 14:41:38 +02:00
1ad1b78c64
Fix the history mode with readOnly and old URLs
2017-06-19 14:41:31 +02:00
f29f430e7c
better handling of non-rpc messages
2017-06-19 12:38:24 +02:00
e40f43bd20
Migrated pads were not displayed instantly in the drive
2017-06-19 11:52:57 +02:00
a5924cb803
Make sure the initial title is set in the userDoc when creating a new pad
2017-06-15 18:50:39 +02:00
0e9ebddf11
fix the things
2017-06-15 18:13:24 +02:00
c0e2c1060e
don't reload when slide hash changes
2017-06-15 17:54:35 +02:00
594405de73
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 15:36:23 +02:00
cbe21959b4
Update UI for the file/media app
2017-06-15 15:35:52 +02:00
17146d7af9
send feedback for uploads
2017-06-15 15:34:13 +02:00
2068a8b85b
Embed the mediatag library in the file app
2017-06-15 14:58:18 +02:00
66b076111e
Add an upload button to the slide's file picker
2017-06-15 12:32:44 +02:00
b480346f5b
more efficient media-tag
2017-06-15 12:05:25 +02:00
0d47e68d3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 11:19:24 +02:00
0eb50b8b6c
drop pdf.js dependency
2017-06-15 11:19:06 +02:00
a237eec41e
Add a file picker in the slide app
2017-06-15 11:04:58 +02:00
d25a0893cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 17:24:49 +02:00
3184e5d235
don't reload page on hash mode change
2017-06-14 17:24:44 +02:00
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 15:55:10 +02:00
a98353af6c
Add a button to upload a file in the drive
2017-06-14 15:55:03 +02:00
295f9c00a6
send feedback on buttons
2017-06-14 15:36:46 +02:00
497ddeee6d
Upload files with drag&drop in the drive
2017-06-14 12:47:37 +02:00
687b4d8307
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 11:10:26 +02:00
69c3bd392f
update built media tag to latest XWiki version
2017-06-14 11:09:51 +02:00
d8ebe566d8
Don't call mediatag for non-image files
2017-06-13 18:38:53 +02:00
37d3d04f0e
Clean mediatag integration code
2017-06-13 17:57:27 +02:00
802146e2af
don't put download buttons in a div
2017-06-13 17:54:15 +02:00
19cb920a7c
Don't redraw a media-tag everytime the content has changed
2017-06-13 17:21:22 +02:00
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 16:15:11 +02:00
f9c26645cf
Upload images using the slide app
2017-06-13 16:15:04 +02:00
17e4e9be27
download anything that isn't an image in media-tag
2017-06-13 16:12:13 +02:00
1b574da053
fix typo
2017-06-13 12:24:32 +02:00
7ad89bd9af
don't interrupt boot because of localStorage failure
2017-06-13 12:02:36 +02:00
3337e2133a
more thorough tests for localStorage presence
2017-06-13 11:57:21 +02:00
4eeea93265
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 11:38:16 +02:00
11e2226f1a
Fix lint errors
2017-06-13 11:38:04 +02:00
c779e328e8
warn users if their browser does not support localStorage
2017-06-13 11:33:25 +02:00
d7292e69c6
Fix undefined variable
2017-06-13 11:25:12 +02:00
803bad1421
Move the file upload code in a separate file
2017-06-13 11:21:26 +02:00
a58162a617
Make the drive tests work when not logged in
2017-06-12 17:49:33 +02:00
2fb5e3ae35
Merge branch 'staging' into newToolbar
2017-06-12 17:00:07 +02:00
969cec5d60
Make sure everything is synced before migrating the drive
2017-06-12 16:19:45 +02:00
7dd9ed543a
Merge branch 'newDrive' into staging
2017-06-12 16:08:09 +02:00
376b60c21c
New toolbar temp
2017-06-12 15:59:24 +02:00
c9725af508
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 14:34:01 +02:00
db9b9547d9
don't complain about missing callbacks for messages which are not our responsibility
2017-06-12 14:33:50 +02:00
30bdb9881c
Fix undefined element in select dropdown menus
2017-06-12 14:23:06 +02:00
8471dab6b1
Provide hints in theme and language dropdowns
2017-06-12 12:47:25 +02:00
a5cb5f2ceb
Merge branch 'staging' into newDrive
2017-06-12 10:51:38 +02:00
9cc25d4c9f
Merge branch 'staging' into newDrive
2017-06-09 17:03:01 +02:00
a57f7c6ce7
Fix lint errors
2017-06-09 16:39:44 +02:00
4bcad3e154
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-09 16:26:36 +02:00
47857ec382
use cached pinned usage data
2017-06-09 16:17:20 +02:00
75c3c10b20
Merge branch 'soon' into staging
2017-06-09 15:56:45 +02:00
c1402fbb0a
Lint error
2017-06-09 15:56:18 +02:00
b36484931d
Lint
2017-06-09 15:55:46 +02:00
1fb638f519
clean the code
2017-06-09 15:50:13 +02:00
23318357a6
make fewer RPC calls for usageBar
2017-06-09 15:33:03 +02:00
df586a223c
update limits, usage, plan, and note whenever they are checked
2017-06-09 15:31:43 +02:00
8bad0c556e
change log to error
2017-06-09 15:29:55 +02:00
b0e00d337e
more careful validation
2017-06-09 15:28:53 +02:00
fd88162624
Merge branch 'staging' into newDrive
2017-06-09 14:47:37 +02:00
7c9e86e351
Merge branch 'soon' into staging
2017-06-09 14:47:15 +02:00
9694272083
Fix html code not parsed
2017-06-09 14:42:55 +02:00
9ca10ba524
Merge branch 'staging' into newDrive
2017-06-09 14:40:26 +02:00
7f120c8fc1
Merge branch 'soon' into staging
2017-06-09 14:38:36 +02:00
78e6118153
Merge branch 'staging' into newDrive
2017-06-09 14:38:21 +02:00
444c41974e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-09 14:37:54 +02:00
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
2017-06-09 14:36:38 +02:00
6a96aa6819
Disconnect the network when migrating the drive in another tab
2017-06-09 14:36:35 +02:00
2a94bdaf05
test
2017-06-09 13:41:11 +02:00
ca95b5c42b
Remove unused console.log
2017-06-09 12:31:07 +02:00
f8c69573fd
Disconnect other tabs when migrating the drive
2017-06-09 12:23:28 +02:00
c4e5741ae0
update upgrade button logic
2017-06-09 12:12:39 +02:00
f1a9002417
use upgradeURL with usage bar
2017-06-09 10:46:11 +02:00
51e0d40572
Make sure the old storage key is removed after migration
2017-06-08 18:35:20 +02:00
b0fe04381d
Merge branch 'staging' into newDrive
2017-06-08 18:14:31 +02:00
1c2ea04f11
Drive refactoring
2017-06-08 17:52:00 +02:00
fe42f5e88c
ask for new cookies and resend commands on NO_COOKIE errors
2017-06-08 14:19:14 +02:00
da533b106a
improve type checking in getFileSize
2017-06-08 11:24:20 +02:00
d25477e8c6
don't let tooltips interfere with DOM interaction
2017-06-06 18:08:23 +02:00
5641a4a839
Add the file app in the 'new' dropdown menus
2017-06-06 11:52:47 +02:00
ac91d2f413
Fix the upgrade and donate buttons in the home page
2017-06-06 11:37:54 +02:00
ee57458158
Remove the pin limit alert
2017-06-06 10:49:32 +02:00
767793b5ca
fix stuck loading tip
2017-06-02 12:13:11 +02:00
f631973f1f
optimize file upload
2017-06-01 18:16:02 +02:00
55af84cc90
lower spinner timeout interval
2017-06-01 14:27:06 +02:00
07279c8dc7
export boolean Test.testing
2017-06-01 10:23:24 +02:00
71bd808e4f
Send everything through the test global function
2017-06-01 00:09:39 +02:00
244bd7b378
;;;
2017-05-31 23:32:47 +02:00
7d557df74b
a new and more horrible way of sniffing the logs out of the instance
2017-05-31 23:29:58 +02:00
0d4b74cfba
;;;;;; keep these ;;; for later ;;;;;
2017-05-31 19:46:23 +02:00
24f37ea414
Delicious testing
2017-05-31 19:40:17 +02:00
7b94106bac
fix inverted conditional :/
2017-05-31 18:15:31 +02:00
2e03485db4
remove known bad entries from localStorage.userHash...
2017-05-31 18:12:58 +02:00
936bf8df9d
return falsey if userHash is junk
2017-05-31 18:08:41 +02:00
105e5cdac9
fix 'undefined/' userHash
2017-05-31 18:01:12 +02:00
401e908963
use media-tag with xhr error handling
2017-05-31 17:17:01 +02:00
3465710237
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
2017-05-31 12:55:05 +02:00
21c39572be
Update media-tag and fix bower dependencies
2017-05-31 11:53:25 +02:00
ebfa228bc0
add upgrade button to all static pages
2017-05-30 18:39:41 +02:00
149568689a
color donate button green
2017-05-30 17:58:31 +02:00
ec6ad6772b
send feedback on donation
2017-05-30 17:25:36 +02:00
cb2efe138b
Media Tag integration, image, audio, video, pdf
2017-05-30 16:36:06 +02:00
9ca5bc507e
add support for donate button
2017-05-30 15:42:53 +02:00
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
2017-05-26 18:09:31 +02:00
3f3d64992d
resolve merge conflicts
2017-05-26 12:44:58 +02:00
57017c68fa
hacks for cross-domain safari
2017-05-26 12:42:12 +02:00
cf658c1b3a
backport live changes
2017-05-26 12:41:30 +02:00
df2b00122a
New drive structure without file names
2017-05-24 18:59:44 +02:00
d9f7470f06
copy user details into sessionStorage for safari
2017-05-24 18:28:16 +02:00
fd83ae3e61
implement createRandomInteger
2017-05-24 11:34:40 +02:00
dc80b6b11f
throttle markdown preview
2017-05-24 11:27:16 +02:00
e6c04ccb49
bump server after paying for an account
2017-05-23 16:11:07 +02:00
6324d9bbb0
feedback on template feature usage
2017-05-23 14:54:40 +02:00
c3437382fb
Fix the release version in the what's new popup
2017-05-23 11:22:32 +02:00
4fae1b16c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 18:43:14 +02:00
70cae0d2c3
safely access pin reset response
2017-05-22 18:43:06 +02:00
d55b7e411c
Display an alert in the drive when the limit is reached
2017-05-22 17:56:27 +02:00
71dc0af6c7
better test for success error codes
2017-05-22 14:37:57 +02:00
9c00a730f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 10:41:55 +02:00
538aec6ef5
Display a message when pinPads returns an error
2017-05-22 10:41:47 +02:00
ba5ef5157e
show pretty representations of storage usage
2017-05-19 18:37:31 +02:00
e78299aed6
use async file decryption, listen for progress events.
2017-05-19 11:46:47 +02:00
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-19 09:13:38 +02:00
d014fccfce
Fix lint error
2017-05-18 18:52:14 +02:00
2082b328b4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 18:51:21 +02:00
814c81fb13
Display an alert when CryptPad has a new version
2017-05-18 18:51:08 +02:00
34606ea8ba
use newest xwiki media-tag
2017-05-18 18:24:24 +02:00
2cee9534c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 17:58:33 +02:00
164342920e
fix inverted condition
2017-05-18 15:39:24 +02:00
620f4dc512
Add translations for the markdown preview button title
2017-05-18 15:05:37 +02:00
51bd41d4e8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 14:57:12 +02:00
0bd4caeb7e
Add the task list code to the markdown renderer
2017-05-18 14:57:04 +02:00
d187945e94
jshint compliance
2017-05-18 14:55:16 +02:00
2b60b81a68
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 14:27:10 +02:00
d13dde856a
Add the markdown renderer file and change code's default content
2017-05-18 14:26:56 +02:00
73ec91aa5e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 12:46:36 +02:00
7befaccd88
move more rpc calls into pinpad
2017-05-18 12:36:12 +02:00
56bcdff890
Add a preview of the markdown content in the code editor
2017-05-18 12:16:26 +02:00
b72415b56b
Fix old hashes not working with the new parser
2017-05-18 10:13:08 +02:00
6b7aeb9121
Fix the text example
2017-05-17 15:48:09 +02:00
fe0f21594a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-16 14:41:51 +02:00
953e7155f0
Send only the hostname to the accounts server
2017-05-16 14:41:40 +02:00
afef456b18
fix undefined reference
2017-05-16 14:15:42 +02:00
1a7c4d5ebe
Store the FS_hash in the user object after the merge
2017-05-16 11:25:37 +02:00
87fa28180a
Display an upgrade button in the settings page
2017-05-16 10:34:50 +02:00
c1b43db363
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-15 18:21:25 +02:00
1542aa96bc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-15 18:17:56 +02:00
dc2cdb7c08
Add the usage bar in the settings page
2017-05-15 18:16:22 +02:00
2dd04f7631
get limits from the server
2017-05-15 18:03:12 +02:00
8172f117a7
Fix Hash.alert not a function
2017-05-15 14:21:15 +02:00
0e58859393
Fix lint error
2017-05-15 13:55:40 +02:00
771348720b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-15 13:54:25 +02:00
57979f6314
Display the public key using a href in the settings page
2017-05-15 13:53:43 +02:00
a9b670fdf5
don't parse trailing slash as part of encryption key in old hashes
2017-05-15 11:17:46 +02:00
06f3d0eefe
shim isArray if not exists. correctly report how often this occurs
2017-05-15 10:26:52 +02:00
50d9f72b3a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-12 18:06:37 +02:00
601226115b
New anonymous drive
2017-05-12 18:06:29 +02:00
30f6ef3f85
handle more response codes, use metadata
2017-05-12 17:34:29 +02:00
18d959ef16
handle non-200 status codes
2017-05-12 17:07:30 +02:00
ed95bbb08f
Fix lint errors
2017-05-12 16:43:01 +02:00
89a993be3c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-12 16:33:56 +02:00
0f13198119
Move the parseHash code into parsePadUrl
2017-05-12 16:33:45 +02:00
42f3a62cac
handle errors with XHR
2017-05-12 16:13:09 +02:00
6c68b5e6ca
use new media-tag, listen for decryption events
2017-05-12 15:42:01 +02:00
7dd5907ff0
Merge branch 'limit' into staging
2017-05-12 14:21:46 +02:00
a993ab6616
use new encrypted file encoding in media-tag
2017-05-12 11:25:07 +02:00
8c49150725
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-12 10:54:32 +02:00
e0293a1162
Merge branch 'master' into staging
2017-05-11 18:26:09 +02:00
57ee7de7d4
Update and return the storage limit
2017-05-11 16:12:44 +02:00
371edff943
Fix an error when moving unsorted files to root in the drive
2017-05-11 14:24:16 +02:00
b76dcba1d6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-11 12:43:49 +02:00
6d30d7f89f
strip junk bytes from base64 more safely
2017-05-10 18:15:33 +02:00
8f5989b6b0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-10 17:05:13 +02:00
cf81b02096
Make sure the spinner is always centered in the loading screen
2017-05-10 16:11:41 +02:00
5c8586f8a3
Fix typo in file upload
2017-05-10 15:00:05 +02:00
96ccb94397
Add the share button when a file upload is complete
2017-05-10 14:44:01 +02:00
c00158d23a
Move code to common-history
2017-05-10 13:39:14 +02:00
922e7803e9
remove extraneous slashes from hashes when parsing
2017-05-10 11:54:05 +02:00
a338b23f40
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-09 18:36:27 +02:00
df47b913e3
fetch array buffers in cryptpad-common
2017-05-09 18:36:18 +02:00
ff16084719
Fix lint errors
2017-05-09 18:10:02 +02:00
50c8a859e6
Move the CodeMirror cursor code to common-codemirror
2017-05-09 17:57:27 +02:00
9eb8e55cf6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-09 17:48:07 +02:00
c79a6e3b2b
Move Metadata, CodeMirror and title functions in separate files
2017-05-09 17:47:47 +02:00
63710e1ccc
Move the code related to the title in another file
2017-05-09 14:32:41 +02:00
ce5cdce917
Fix an issue where the username was lost on websocket reconnect
2017-05-09 14:31:28 +02:00
42dcfb9661
unceremoniously kick web clients when you 'log out everywhere'
2017-05-05 18:25:55 +02:00
9206d89531
Fix lint errors
2017-05-05 17:58:32 +02:00
bbc08bbcfd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-05 17:57:05 +02:00
5a883d5a57
Use the new toolbar and move the userlist code in a separate file
2017-05-05 17:56:49 +02:00
6847906ac9
Move the userlist code in a separate file
2017-05-05 15:47:46 +02:00
3a338e0890
fix undefined reference
2017-05-05 15:20:41 +02:00
a173e4c7a0
add 'log out everywhere' functionality in settings
2017-05-05 15:09:07 +02:00
5a5b02b82b
Don't store in the drive pads without a hash
2017-05-05 11:55:19 +02:00
3e118c6a38
allow instance-wide custom salt for login
2017-05-05 09:10:31 +02:00
706120ae5b
Display images uploaded in the File app with the Media app
2017-05-04 18:24:58 +02:00
28cb40d7ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 17:14:30 +02:00
1b6fae4dd2
Update mediatag
2017-05-04 17:14:24 +02:00
a0c420af8e
jshint compliance
2017-05-04 16:37:25 +02:00
1864dac84f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:16:16 +02:00
78b11584f8
remove unused variables
2017-05-04 16:16:09 +02:00
4335b050af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:08:21 +02:00
a190c99426
Toolbar refactoring
2017-05-04 16:08:12 +02:00
7573b86946
call back with error if an RPC is made while disconnected
2017-05-04 11:36:24 +02:00
410a9dfb17
temporary solution for testing pin limits
2017-05-04 11:20:52 +02:00
ef89451a83
Display the storage limit in the drive
2017-05-02 17:14:53 +02:00
f2672d587a
fix variable redefinition
2017-05-02 09:42:51 +02:00
0e7eeb285c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-29 14:24:14 +02:00
f414d480a9
Add the history mode to the CryptDrive
2017-04-28 18:23:41 +02:00
cf4dee28f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-28 17:13:18 +02:00
28e4ef1b13
WIP RPC code
2017-04-28 17:11:50 +02:00
afb0061d7b
Fix an issue with anonymous user unable to store new pads
2017-04-28 17:11:07 +02:00
56aaeea003
Fix the drive toolbar not displaying the displayName
2017-04-28 17:03:47 +02:00
3fa0a73025
prevent using string methods on undefined variable
2017-04-28 16:09:46 +02:00
1b3ce5aa96
fix typo
2017-04-28 16:08:47 +02:00
a51a35da70
Fix an issue with hashes ending with a slash
2017-04-28 15:47:31 +02:00
ef58120819
Prevent multiple concurrent clicks to get the history
2017-04-28 14:09:59 +02:00
16f6ab813c
Make it clear that the number is the history represents a version
2017-04-28 13:06:55 +02:00
c820b3485c
Fix function undefined when loading a template
2017-04-28 12:16:45 +02:00
0ef1c14d7f
Fix lint errors
2017-04-28 12:12:17 +02:00
fc760b4820
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-28 12:08:21 +02:00
a165332c15
Don't store a pad in the drive if the limit has been reached
2017-04-28 12:08:05 +02:00
e51c7f9cf0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-28 11:46:24 +02:00
bf7c7c45d0
Add the storage limit warning in the toolbar
2017-04-27 18:46:46 +02:00
aedc46bdaf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-27 12:47:27 +02:00
a97e7223f1
implement getBlobPathFromHex
2017-04-27 12:47:21 +02:00
520dabe094
Remove the unsorted files category
2017-04-26 18:46:40 +02:00
f50aa5c29b
Move the mediatag viewer into a media app
2017-04-26 14:55:06 +02:00
6a8274518b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 18:42:33 +02:00
9882a3a923
Add support for the file applicaiton in the drive
2017-04-25 18:42:21 +02:00
12898b3358
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 18:28:48 +02:00
74bcec8b31
programming is hard okay
2017-04-25 18:28:39 +02:00
2a417ddae8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 17:22:07 +02:00
d985b144cc
Add a new hash version for the file viewer
2017-04-25 17:19:13 +02:00
3309087277
send feedback if isArray is not supported
2017-04-25 17:09:39 +02:00
5194677443
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 14:57:34 +02:00
c9c7d61ad1
Media tag viewer
2017-04-25 14:55:38 +02:00
729d1460b9
Merge branch 'master' into staging
2017-04-25 14:35:24 +02:00
a840fb9e85
add example hashes and start working on hash v2
2017-04-25 14:33:57 +02:00
d1fa68e30d
build UCF Media Tag
2017-04-24 17:13:32 +02:00
fdd51ec18d
Don't remove a folder moved into unsorted or into itself
2017-04-24 15:38:03 +02:00
4fdc5f897e
only feedback migration if user had legacy store
2017-04-24 14:26:55 +02:00
218f2ff76c
feedback when logging in or registering
2017-04-24 14:15:17 +02:00
4c3e842664
Fix focus issues with the history input in ckeditor
2017-04-24 13:55:03 +02:00
f7e96b4e8c
resolve merge conflicts and jquery errors
2017-04-24 13:43:18 +02:00
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
2017-04-24 11:41:00 +02:00
18e2e66b06
jshint compliance
2017-04-24 11:39:39 +02:00
92ea03d7d9
View and restore the history of a pad
2017-04-21 17:31:47 +02:00
4c0d7bf8e8
support multiple calls to cryptpad.ready
2017-04-21 16:51:32 +02:00
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
c51073f211
support batch getFileSize calls
2017-04-21 14:51:20 +02:00
3afaf029cb
feedback about how often we migrate an old drive
2017-04-20 17:06:09 +02:00
e8b053e48b
use bootloader in feedback.html
2017-04-18 17:31:35 +02:00
347459781c
show the size of your files, if you're logged in
2017-04-18 15:49:04 +02:00
2b8579e8b7
add pretty-printers for byte-counts
2017-04-18 15:44:15 +02:00
2a25afae5f
Merge branch 'soon' into staging
2017-04-18 12:24:45 +02:00
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
da69c1822c
ask users to sign back if signing keys are missing
2017-04-18 11:58:41 +02:00
821c1a3ec6
annotate code which we hope to be able to deprecate in the future
2017-04-14 18:44:08 +02:00
43c045721c
Get the channel history
2017-04-14 18:36:36 +02:00
a27cc76fc0
uppercase LOL
2017-04-14 15:35:02 +02:00
402ce2db93
better validation of inputs
2017-04-14 15:34:22 +02:00
c7eae9675b
keep exporting isArray for backwards compatibility
...
but prevent internal use
2017-04-14 15:34:05 +02:00
fbebbf0dca
minor clean up
2017-04-14 15:32:12 +02:00
525d35c9ec
redefine alert
2017-04-14 14:54:43 +02:00
f694a81a5c
move more interface code out of cryptpad-common
2017-04-14 12:25:32 +02:00
a4157b9908
remove more unused functions
2017-04-14 12:14:10 +02:00
e10901edb2
begin to move interface code out of cryptpad-common
2017-04-14 12:09:00 +02:00
95789d3cbe
expose rpc for pinned usage
2017-04-14 11:41:51 +02:00
8f4dbcf4c6
remove getPadTitle
2017-04-14 11:41:18 +02:00
f42da4ecd8
move hashChannelList into common-hash.js
2017-04-14 11:40:28 +02:00
63960bd38c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-13 19:47:04 +02:00
520ae822fc
correct undefined reference
2017-04-13 19:46:52 +02:00
633d60ccd0
Remove a TODO
2017-04-13 17:19:32 +02:00
81d83897ec
Rename hash.js
2017-04-13 17:04:15 +02:00
07705cd5c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-13 15:04:23 +02:00
eb2a3c1bbf
Fix lint errors
2017-04-13 15:04:17 +02:00
607d9652f5
jshint compliance
2017-04-13 14:48:15 +02:00
3ba90332bb
Merge branch 'refactor' into staging
2017-04-13 14:44:55 +02:00
daabb0b3ad
Integrate and fix the new fileObject (userObject)
2017-04-13 14:06:40 +02:00
df4a250359
use feedback api instead of app=
2017-04-13 12:18:08 +02:00
86c37bfa37
fix find+replace error
2017-04-13 11:11:45 +02:00
e618483395
extract all code for encoding and decoding hashes
2017-04-13 11:05:28 +02:00
fdd2716ad5
move constants to the top of cryptpad-common.js
2017-04-13 10:31:08 +02:00
c1e0316d43
Refactor fileObject
2017-04-12 18:54:22 +02:00
5212539a16
move standalone functions from common into their own file
2017-04-12 17:54:44 +02:00
7437d6b902
remove unused function
2017-04-12 17:09:42 +02:00
4e590a9dd1
remove even more dead code
2017-04-12 16:16:58 +02:00
85fcaa9bbc
remove more dead code
2017-04-12 16:13:25 +02:00
401936a91e
move singly-used css file out of /common/
2017-04-12 16:09:05 +02:00
7a59183bb1
pinpad.create should always be async
2017-04-12 16:02:42 +02:00
8de3610532
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-12 16:02:09 +02:00
9aa0548b1f
remove dead cursor code
2017-04-12 15:59:30 +02:00
4e61b79f9a
Clean fileObject
2017-04-11 15:11:33 +02:00
cde724399c
Pin the pads
2017-04-11 14:53:44 +02:00
2c8d1b8183
jshint compliance
2017-04-10 19:12:22 +02:00
05a50b1f4c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-10 17:42:43 +02:00
a14bb1480a
progress for implicit pinning
2017-04-10 17:42:35 +02:00
f82278a25c
handle return of undefined hash
2017-04-10 17:38:25 +02:00
1d933be5a6
make reset return the hash, not an array with containing it
2017-04-10 15:57:38 +02:00
f34492be94
Remove duplicates uid in the user list
2017-04-10 15:27:01 +02:00
cfc5d634f4
Merge branch 'templates' into staging
2017-04-10 14:19:48 +02:00
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
2017-04-10 14:19:15 +02:00
84d8615cf1
Save and use templates in pad, code and slides
2017-04-07 18:20:03 +02:00
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
2017-04-07 17:24:25 +02:00
a70388284d
disable unnecessary messages
2017-04-07 17:21:04 +02:00
abd87e1322
jshint compliance
2017-04-07 16:33:14 +02:00
e4b15bc616
implement 'getCanonicalChannelList'
2017-04-07 15:52:34 +02:00
a2f692b9a3
clean up serverside and clientside pinning logic
2017-04-07 15:20:30 +02:00
fdede0d1fd
remove some dead code
2017-04-07 12:18:03 +02:00
e87992c7ec
implement atomic pin reset rpc
2017-04-07 11:37:19 +02:00
3380cf0348
implement getTotalSize rpc
2017-04-07 10:09:59 +02:00
5c292fb1fa
jshint compliance
2017-04-06 08:32:31 +02:00
64089c5f6b
implement pad pinning
2017-04-05 17:28:04 +02:00
13514dff63
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 15:00:10 +02:00
46a5eee597
Display the spinner in the toolbar for local changes
2017-04-05 14:57:07 +02:00
6c7cdc90a9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 12:24:17 +02:00
212baeb3a6
better cookie schema. expire old sessions
2017-04-05 12:24:01 +02:00
54d271c4e7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 12:04:18 +02:00
a9777ce560
Fix input losing focus in polls with Chrome 57
2017-04-05 12:04:01 +02:00
3e47b8a38d
remove dead code
2017-04-05 10:42:24 +02:00
182dbfc874
implement pinning logic in pinpad.js
2017-04-04 12:13:31 +02:00
a5e5ddae08
rpc all the things
2017-04-03 19:24:57 +02:00
04069cc7f4
fix font size
2017-03-31 13:28:30 +02:00
6e9968f989
add 'lol' code theme
2017-03-31 09:19:45 +02:00
9b4b642d4a
protect against subtly corrupted user objects
2017-03-30 17:19:49 +02:00
d4ce3dc6b9
don't rewrite css rules. FOUC is too long
2017-03-29 16:02:04 +02:00
3cfd0a4326
commit some garbage
2017-03-29 15:40:34 +02:00
ed89a13fe6
progress on adding version string to some css
2017-03-29 12:55:36 +02:00
76990ac1b2
version toolbar.css for cache-busting
2017-03-29 11:56:03 +02:00
a0c17d7c9b
latest rpc code
2017-03-27 18:15:15 +02:00
59a80d5fde
remove silly TODO
2017-03-27 12:08:19 +02:00
a8ffac5dcd
Remove old code
2017-03-27 11:30:09 +02:00
fa9249ef29
don't notify for userlist changes if a user joins twice
2017-03-24 13:17:51 +01:00
40f5e1706f
add a unique id to user objects, define a getter
2017-03-24 12:17:49 +01:00
994d640f8b
Fix an issue causing the lag icon to lose its color
2017-03-21 14:52:49 +01:00
6fbd1f0028
Store the dates as number and not strings to avoid ot issues
2017-03-21 14:46:40 +01:00
51033ab70a
Remove useless links in the context menu and properties for readonly pads in the drive
2017-03-21 12:09:07 +01:00
7afde2309d
Add properties to the files not in the trash
2017-03-21 11:34:18 +01:00
b542245086
fix lint error
2017-03-20 18:11:26 +01:00
cc43bb8362
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-20 18:05:39 +01:00
98027dad27
jshint compliance
2017-03-20 18:02:11 +01:00
4a173e30dc
set user's cursor to either the beginning or end of the document
2017-03-20 17:51:56 +01:00
29174b2922
Update the lag icon
2017-03-20 16:39:33 +01:00
26edb77cf0
Fix style and usability issues in slides
2017-03-20 15:20:42 +01:00
d422c7e165
support old hashes in getUserChannelList
2017-03-16 17:14:54 +01:00
5ed6223313
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-16 14:47:03 +01:00
c9c9dd0999
use userChannelList if a list is not supplied to pinpad
2017-03-16 14:46:17 +01:00
e8c3cf6aa5
implement rpc message signing
2017-03-16 14:45:38 +01:00
d85a42c776
include User_hash in user channel list
2017-03-16 14:43:57 +01:00
7761aaa89f
Add search UI
2017-03-16 14:16:42 +01:00
c3c866fa2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 18:59:53 +01:00
d19bbcb001
Add support for search in the drive
2017-03-15 18:59:55 +01:00
5eb32b33ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 18:59:38 +01:00
298725b3c2
don't show usage tips on error screens
2017-03-15 18:58:39 +01:00
0a6373852e
add signing keys to user object at login and register time
2017-03-15 18:57:13 +01:00
b9c64a526a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 17:15:03 +01:00
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
2017-03-15 17:14:49 +01:00
8129b8cdc1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 16:05:05 +01:00
15a67afc75
jshint compliance
2017-03-15 16:04:52 +01:00
13d7b3cadc
Merge branch 'd' into staging
2017-03-15 16:01:29 +01:00
7187d3c550
implement getUserChannelList
2017-03-15 15:55:55 +01:00
306f6ce806
resolve merge-conflict with accounting branch
2017-03-14 15:52:04 +01:00
f10149db1c
Make sure the tip is always visible when the loading screen is removed
2017-03-14 12:49:22 +01:00
71db08eac2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-14 12:40:25 +01:00
09afba80db
add support for logging in from register page
2017-03-14 12:39:50 +01:00
16e5788011
Call the callback if we can't parse the local Drive to import it
2017-03-14 12:09:52 +01:00
413d9a6f0b
add a style-callback to confirm
2017-03-14 12:01:42 +01:00
803e57c958
add more parameters to confirm dialogs
2017-03-13 19:30:56 +01:00
ceaf757680
Allow right click on the CryptPad logo/link in the top left corner
2017-03-13 18:49:30 +01:00
f2aa531f27
apply styles to confirm buttons if provided
2017-03-13 18:18:38 +01:00
df6298eeb6
apply styles to confirm buttons if provided
2017-03-13 18:18:17 +01:00
07a2d8e189
apply translations on feedback page
2017-03-13 12:56:49 +01:00
b7986ff6b1
Replace the spinner code with a font awesome spinner
2017-03-13 11:52:39 +01:00
d9996cc874
current work for pinning
2017-03-13 10:56:08 +01:00
b3cc8da315
implement basic clientside RPC infrastructure
...
and provide a basic example for testing it
2017-03-10 18:03:52 +01:00
81027b4200
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
2017-03-10 10:49:33 +01:00
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
404fa378e6
Move the store to the 'common' folder, it is not customizable anymore
2017-03-08 16:47:38 +01:00
0c1efd361b
Make sure the href is updated everywhere when importing a stronger link
2017-03-08 15:49:02 +01:00
b701e3cc85
Fix lint errors
2017-03-08 14:59:51 +01:00
4206382865
Fix the settings app to allow backup for unregistered users
2017-03-08 14:45:39 +01:00
f62267f8a1
Ability to import local pads in the user object
2017-03-07 18:39:21 +01:00
e2418a6be2
sketch of how pinning rpc will look
2017-03-07 17:33:31 +01:00
dc567fa7f3
signing keys are stored in hex so encode and decode them
2017-03-07 17:30:32 +01:00
9ad33574e9
Fix the function returning the pads list in the drive
2017-03-07 14:30:07 +01:00
d93a270336
Ability to display tips in the loading screen
2017-03-06 17:20:09 +01:00
77d09f64e1
Display anonymous users in the user list
2017-03-06 14:56:41 +01:00
cb88227e2b
Autocomplete on key press in some dropdown menus
2017-03-06 12:20:23 +01:00
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
ed9bcca96f
Close the websocket network when CryptGet/CryptPut is done
2017-03-03 12:48:00 +01:00
0bb10a8a0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-02 17:59:35 +01:00
e1303a16da
add support for title attributes on dropdowns
2017-03-02 17:40:29 +01:00
52793385ea
Fix lint errors
2017-03-02 17:17:55 +01:00
01c4d7d4a7
Merge branch 'maybe' into staging
2017-03-02 17:09:06 +01:00
c884782d57
here are some changes
2017-03-02 17:08:50 +01:00
9a7c2dd5e2
Add a 'settings' link to the user menu in static pages
2017-03-02 16:38:22 +01:00
c5f983ecd7
Convert read-only link to editing link in the drive
2017-03-02 16:01:34 +01:00
a9afa24428
return empty string instead of blowing up when fixing HTML
2017-03-02 11:38:20 +01:00
8bdc8415ab
Find a pad in the drive
2017-03-02 10:15:13 +01:00
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
7db0e14bc0
add 'force' flag to override removal of html elements
2017-03-01 17:05:57 +01:00
cb5e01815c
validate all alertify strings by default. require 'force' argument to bypass
2017-03-01 15:07:34 +01:00
2c5c6da0d9
Fix XSS in alertify logs
2017-03-01 13:09:14 +01:00
5797aab3f2
Fix XSS with display names in the user list
2017-03-01 13:08:36 +01:00
26e3971482
Fix XSS in the user dropdown menu
2017-03-01 13:08:09 +01:00
5d39125004
Make onSettle Async Again
2017-02-28 13:12:04 +01:00
4f4075ed6e
Make the settings app available to anonymous users
2017-02-28 11:23:50 +01:00
12aec60a12
hack around onSettle not doing its job
2017-02-28 11:05:59 +01:00
1a259bb3aa
check if user has disallowed feedback api
2017-02-27 20:02:54 +01:00
498f4065cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 14:29:55 +01:00
66dc166936
Make sure the realtime is synced with onSettle when using cryptget
2017-02-27 14:28:12 +01:00
de5a21fe57
add a simple feedback api and text explaining what it is
2017-02-27 12:06:49 +01:00
88b29e8bdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-24 18:55:48 +01:00
5303e76ece
Make sure the content is correctly applied in onReady
2017-02-24 18:55:41 +01:00
cc829d51f8
jshint compliance
2017-02-24 18:23:43 +01:00
42b6cca18d
Fix new pad not working
2017-02-24 16:55:43 +01:00
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
e15a6a347f
Fix the forget pad button
2017-02-24 15:22:26 +01:00
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
ba0b314f5e
Fix the 'new' button in drive which was broken in non root categories
2017-02-23 18:15:44 +01:00
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
2017-02-22 12:25:29 +01:00
7e77c6828a
more correct pluralization
2017-02-21 18:55:48 +01:00
c72bbd4c37
Use the file name as initial title
2017-02-21 17:42:58 +01:00
47b8fefd9e
Load messages.js only once, in cryptpad-common
2017-02-21 14:16:23 +01:00
11d9c9e813
Merge branch 'master' into staging
2017-02-21 10:44:03 +01:00
2103f0afa8
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-02-21 10:42:35 +01:00
0bdf59c1dd
Fix broken link in the 'New' button on cryptpad.fr
2017-02-21 10:42:06 +01:00
d81d17b86c
Remove old translations keys no longer used
2017-02-17 17:39:27 +01:00
239e2bcc1f
Fix issue with null entries in Cryptpad_RECENTPADS
2017-02-17 15:18:09 +01:00
1540ae3f6f
Fix issue with null entries in Cryptpad_RECENTPADS
2017-02-17 15:16:30 +01:00
94417d9a8b
jshint compliance
2017-02-17 14:28:18 +01:00
c9b8889380
add cache-busting to chainpad-crypto
2017-02-17 11:26:43 +01:00
09fade6127
add cache-busting to chainpad-crypto
2017-02-17 11:25:35 +01:00
2daa9f8658
Link to main page was opened in the inner iframe
2017-02-17 10:57:56 +01:00
deda40375a
Use the new onSettle from chainpad to determine if the realtime is synced
2017-02-17 10:31:07 +01:00
92d50ded64
Merge branch 'soon' into staging
2017-02-16 16:48:12 +01:00
97762f9f9a
Make sure all the elements in RECENTPADS are non-null objects
2017-02-16 16:07:43 +01:00
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
2017-02-16 15:35:03 +01:00
7762ffcbff
Ability to use Ctrl+click on the cryptpad logo in apps
2017-02-15 18:31:36 +01:00
7497e0d1c5
Add a dropdown user menu to the top bar in static pages
2017-02-15 17:57:42 +01:00
7758d056fa
Ability to import/export a user realtime object
2017-02-15 12:40:28 +01:00
cd9cea8fa4
Create a settings app to manage user objects
2017-02-14 19:04:57 +01:00
71b84afdb2
Redirect to the pad when logging in or signing up from a pad
2017-02-14 11:29:08 +01:00
92050eb04f
Fix the trash button in toolbar not always working
2017-02-14 10:56:38 +01:00
aae3fba284
Fix the storage when the hash is invalid
2017-02-13 17:54:01 +01:00
b1b294aade
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 11:10:40 +01:00
3aa03225c9
Add a spinner when hashing the password and translate homepage
2017-02-13 11:09:30 +01:00
fbcf4ccec4
force usernames to be lowercase
2017-02-13 11:01:30 +01:00
5614bea271
redirect users to login and register from toolbar
2017-02-13 10:51:54 +01:00
f723585758
add api to check whether the realtime has synced with the server
2017-02-13 10:42:17 +01:00
d0edf75c89
signup link directs users to register page, not user
2017-02-10 16:48:28 +01:00
1232aa8a79
jshint compliance
2017-02-10 14:25:02 +01:00
8eec7ec7c8
Fix typo
2017-02-10 11:00:34 +01:00
f92ba193c3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-09 17:16:03 +01:00
e100110741
implement log in as an api
2017-02-09 16:31:57 +01:00
f8366e0cfc
Remove support for legacy store and add a way to import legacy pads
2017-02-09 15:23:09 +01:00
67d881b2cf
Remove the drive entry from the user menu if already in drive
2017-02-08 16:25:52 +01:00
914c442615
Do not redirect to home page when logging out from another tab
2017-02-08 12:54:07 +01:00
702798f65a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 18:47:24 +01:00
1e2cc6bea4
Fix race condition with the iframe store
2017-02-07 18:47:10 +01:00
6e97082ff9
remove dead code from login function
2017-02-07 17:27:36 +01:00
8a1acc3c37
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 10:40:03 +01:00
6f07a3b7b4
erase lingering sessionStorage values when logging out
2017-02-07 10:39:42 +01:00
ac79fbb5a2
Improve mobile support for the toolbar and the drive
2017-02-06 18:06:59 +01:00
9f1789b2d2
Fix creation of pads from non-root category in the drive
2017-02-06 14:47:37 +01:00
ad82a275bc
Replace the Apps button by a New button again
2017-02-06 11:39:04 +01:00
fd33ffd56f
Fix issue creating a patch everytime the user clicked in an app
2017-02-06 11:12:08 +01:00
87abfac5e0
Fix lint error
2017-02-03 16:53:47 +01:00
02439e0f61
Improve the homepage with new images and translations
2017-02-03 16:03:36 +01:00
2c6b4b9c6a
Hide disabled applications from the context menu in drive
2017-02-02 18:40:39 +01:00
91299f5f30
Ability to access the drive from any pad
2017-02-02 18:22:59 +01:00
b0fb56fa63
Allow logge din users to access the home page
2017-02-02 18:09:27 +01:00
65054119cf
Fix a bug preventing reconnection in drive
2017-02-01 17:21:54 +01:00
757ae7a3ad
Fix a cross origin frame issue with dropdowns
2017-02-01 12:19:54 +01:00
39c85ca3f7
Fix race condition causing missing translations in homepage
2017-01-31 12:01:33 +01:00
5e69b78334
Remove the domain from the href in store
2017-01-30 18:52:27 +01:00
58d8a30b5b
Redirect to the main page when logging out
2017-01-30 15:26:32 +01:00
5ef074370b
Name a place before creating it in the drive
2017-01-27 17:51:08 +01:00
0e9e0e545f
Load the new pad when the hash is changed
2017-01-27 14:57:45 +01:00
e41cbb92d8
Use default FILES_DATA name if not provided
2017-01-26 16:52:23 +01:00
c44f3a1044
Delete multiple elements could also remove unselected ones
2017-01-26 16:18:43 +01:00
3f44444f41
Display the 'New' button in the trash
2017-01-26 13:19:40 +01:00
11f0a9ae5f
Revert the changes adding anonymous pads
2017-01-25 15:35:40 +01:00
f42665ba49
Remove the unowned pads category
2017-01-25 14:27:06 +01:00
cb85ad3fdf
Merge branch 'newtoolbar' into ownedpads
2017-01-25 10:23:03 +01:00
373b07ed28
Fix lint errors
2017-01-25 10:21:31 +01:00
015e6fc262
Make sure we have the same hash in all the tabs when disconnecting
2017-01-24 18:17:23 +01:00
88021f2264
Anonymous pads fo anonymous users
2017-01-24 18:14:29 +01:00
9d275daebb
Backport changes for the login page from hpbs branch
2017-01-24 12:47:53 +01:00
99b8898e54
Apply new title when clicking on the page without pressing enter
2017-01-19 15:41:25 +01:00
88d5b4cc9c
Add a 'New pad' button in the toolbar
2017-01-18 11:00:46 +01:00
a9063e0459
Reload all tabs when the user logs in or out
2017-01-16 14:08:44 +01:00
efed1f5efe
Add handlers to login and logout buttons
2017-01-13 17:39:41 +01:00
767ba8b549
Select what we want to display in the toolbar
2017-01-13 17:14:44 +01:00
2afdc11327
Replace the username button by a dropdown menu
2017-01-13 17:11:12 +01:00
4adde0f0c0
Use the new dropdown for userlist and share
2017-01-13 15:05:00 +01:00
efffd4974f
Add createDropdown and createLanguageSelector in cryptpad-common
2017-01-12 18:28:38 +01:00
29c8f0bbef
Use a FontAwesome spinner to replace the old unaligned one
2017-01-12 17:05:16 +01:00
3f1e287811
Fix an issue causing a user object to be turned into a pad
2017-01-12 11:09:45 +01:00
569ea21705
Replace the language selector by our custom dropdown menu
2017-01-11 10:59:09 +01:00
26dd4ea11f
Fix lint errors
2017-01-10 15:33:21 +01:00
4278ac7637
Merge branch 'soon' into fileManager
2017-01-10 15:07:48 +01:00
2be5db9540
Ability to open files in readonly mode
...
Fix CSS issues
2017-01-10 15:04:02 +01:00
f74d0a46a4
Remove the alert when pressing del in 'all files'
2017-01-09 18:38:05 +01:00
1c3f1a15cd
make sure that /pad is resized after loading
2017-01-09 17:02:01 +01:00
5b08fed7fa
Ability to add files from the drive toolbar
...
Fix CSS issues with the different toolbars
Translate the backup URL button alert
2017-01-09 16:29:16 +01:00
d5561910d4
Move the file manager into /drive and add a toolbar
2017-01-06 18:26:41 +01:00
1e70af0c16
Use the same network for the apps and the file store
2017-01-06 13:52:53 +01:00
e56cc49f79
catch errors that popped up because of a cross-origin iframe
2017-01-05 14:14:26 +01:00
5cd714b18a
configure filestore usage via customize/application_config.js
2017-01-03 12:10:11 +01:00
91a806ab86
focus on OK button when we pop an alert
2016-12-29 17:10:59 +01:00
89e5830409
make alertify display time configurable
2016-12-28 17:13:00 +01:00
5e1d8292c5
guard against trying to parse special fragments
2016-12-26 14:23:17 +01:00
52a593c2c2
fix jshint complaints
2016-12-22 17:27:56 +01:00
53a4d4738a
really make sure you're logged out
2016-12-22 17:22:32 +01:00
5534da8abf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
2016-12-22 16:54:51 +01:00
9b6c9e3891
Add support for templates in the file manager
2016-12-22 16:53:38 +01:00
29d406b7a9
implement cryptput
2016-12-22 16:00:13 +01:00
87abfff66b
Fix Flash Of Unstyled Content (fouc)
2016-12-21 18:33:21 +01:00
1682d23c1c
remove old user prototype
2016-12-21 18:06:05 +01:00
c359c27997
Use user object as default store in file manager
2016-12-20 17:27:45 +01:00
4aed585574
Fix style issues in the toolbar
2016-12-20 14:40:00 +01:00
bd6992da0a
create a random hash
2016-12-20 11:13:15 +01:00
2cd50498c2
add log(in|out) functions to common
2016-12-20 11:11:40 +01:00
7df460c766
implement createChannelId api
2016-12-19 14:55:39 +01:00
5a14db9f07
Merge branch 'test-filemanager' into login
2016-12-19 12:37:28 +01:00
303953a431
Merge branch 'soon' into login
2016-12-19 11:04:46 +01:00
6b9529b121
implement ajax-like functionality for zk docs
2016-12-19 10:59:18 +01:00
5bc7766f44
Use a consistent toolbar across all apps
2016-12-16 18:35:49 +01:00
2968488278
convert uint8 arrays to hex
2016-12-16 15:18:06 +01:00
8e6830d080
Fix file manager with a chosen hash
2016-12-12 18:24:45 +01:00
ee56f5608f
Fix the infinite spinner bug with the file manager store
2016-12-08 18:52:36 +01:00
43ccd11adc
Merge branch 'infiniteSpinner' into fileManagerMerge
2016-12-08 16:03:18 +01:00
05fd6c1563
Fix the infinite spinner problem
2016-12-08 16:01:46 +01:00
cb43eb9ca1
Merge branch 'newpoll' into fileManagerMerge
2016-12-07 16:59:43 +01:00
9b3719e0ae
Merge branch 'soon' into fileManagerMerge
2016-12-07 16:59:32 +01:00
6dff82ede2
Improve UI, scrollbar in the table, publish/admin buttons
2016-12-05 18:54:46 +01:00
90804ed9e0
Add usernames/userlist in the toolbar and fix publish button
2016-12-01 18:40:09 +01:00
5a5451d94c
Sort elements in the trash, add properties in the context menu, fix issue with Edge
2016-11-23 18:21:45 +01:00
a957b72598
Create a new pad from the file manager
2016-11-21 18:49:13 +01:00
d6e1215166
Refresh the directory if needed when the object has changed
2016-11-18 17:17:48 +01:00
118829617f
Use the FS store as default store
2016-11-17 18:27:55 +01:00
c2770a7a74
set correct hash even if browser does not implement replaceState
2016-11-07 15:03:17 +01:00
303c65f2c3
use replaceState if available, instead of setting the hash
2016-11-07 11:20:30 +01:00
2d5448458b
export messages
2016-11-03 12:45:11 +01:00
d512b113cd
address failure to parse url when hash is not present
2016-11-02 18:28:19 +01:00
ab1d3958ce
Add a pencil icon when hovering the title
2016-10-26 17:49:16 +02:00
6d1e06cca3
Add notifications when a user joins or leaves the channel
2016-10-26 15:02:30 +02:00
54a63267cd
Add a share button and merge the viewers and editors buttons
2016-10-25 18:34:23 +02:00
87d86384ac
Fix broken elements in the new toolbar
2016-10-25 17:29:13 +02:00
6351d1856f
Remove the top bar and move its content in the applications' toolbars
2016-10-25 15:22:35 +02:00
3d74290c7d
Merge branch 'usability5' into staging
2016-10-24 18:33:10 +02:00
9e92a597b3
Ability to edit the title in the toolbar by clicking it
2016-10-24 18:32:43 +02:00
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
2016-10-24 14:54:35 +02:00
10bb5e1607
Add the title in the toolbar
2016-10-21 18:16:27 +02:00
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
2016-10-21 15:17:15 +02:00
51a79c5218
Remove unused dependency
2016-10-18 13:38:48 +02:00
9a733bb360
Fix dropdown menus with Edge
2016-10-13 15:00:53 +02:00
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
2016-10-13 14:24:59 +02:00
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
2016-10-12 18:40:26 +02:00
d2389a5729
Change the userlist in the toolbar
2016-10-11 18:39:43 +02:00
91b4446c0b
Merge branch 'fix-chrome-style-bug' into soon
2016-10-10 17:07:50 +02:00
bb2317d8e6
fix chrome style bug by forcing reload of style sheet
2016-10-07 17:41:52 +02:00
765498e88e
Remove the support for old.cryptpad.fr
2016-10-07 10:39:48 +02:00
c322aa440e
Fix the username icon hcih was not working anymore
2016-10-05 18:19:52 +02:00
8575f3f79f
Fix the "rename" feature which was not working anymore in some cases
2016-10-05 17:22:56 +02:00
a989b51d74
Fix race conditions with Alertify
2016-10-05 16:04:21 +02:00
74df38f94f
Fix race conditions that could prevent applications from being loaded
2016-10-05 11:19:18 +02:00
dbc8f01b8b
fix merge errors and reach full jshint compliance
2016-10-04 16:58:10 +02:00
a30e17121d
Merge branch 'readonlyButton' into soon
2016-10-04 15:48:52 +02:00
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
2016-10-04 15:44:12 +02:00
2ac1b02572
Merge branch 'config-sockets' into soon
2016-10-04 14:38:50 +02:00
3dfa19b786
more flexible websocket configuration (WIP)
2016-10-03 19:19:38 +02:00
76fdadee7f
Store only the strongest hash in the localstorage
2016-10-03 18:23:59 +02:00
17b4f91810
Do not share the title in the doc if it is the default title
2016-10-03 16:05:39 +02:00
391728ee6d
Use CodeMirror in /slide #2
...
Fix title errors in the slide app caused by the present mode
2016-10-03 14:21:39 +02:00
8c33218ceb
Move the codemirror themes in /common
2016-10-03 14:19:37 +02:00
2609af2105
Use the CodeMirror editor in the slide application
2016-09-30 17:39:16 +02:00
f03018f3bc
Improve the top bar and use the font awesome icons in /code
2016-09-28 15:28:25 +02:00
3d54413343
Improve the UI with FontAwesome icons
2016-09-27 18:33:03 +02:00
d6525087c7
jshint compliancy
2016-09-23 17:53:24 +02:00
d46bd1af5c
Improve the toolbar UI with the username displayed
2016-09-22 17:56:51 +02:00
79884e2400
Use the same username for all pads
2016-09-22 17:12:46 +02:00
dde519795d
Merge branch 'newhash' into newhashNoConflict
2016-09-22 16:14:48 +02:00
f29e3d7b0d
don't let notifications interfere with document titles
2016-09-21 14:34:56 +02:00
83705ae058
Improve the UI in read-only mode
2016-09-20 18:22:40 +02:00
fa8199bc75
don't try to use experimental user code
2016-09-20 16:22:00 +02:00
99b50465c7
Add the read-only mode for /pad and /code
2016-09-19 17:52:37 +02:00
42f14873cd
Merge branch 'translations' into newhashmerge
2016-09-19 14:53:40 +02:00
391b7690e6
Set the pad to readonly mode when using a 'view' url
2016-09-19 14:52:36 +02:00
368e253c9f
Ability to send a read-only URL
2016-09-16 18:45:40 +02:00
5c63585952
Complete the French translation
2016-09-15 18:35:09 +02:00
0d9f63b977
Merge branch 'translations' - part one
2016-09-15 10:36:05 +02:00
f086492e50
Improve the localization system
...
Improve and enable the French translation
2016-09-14 18:08:52 +02:00
25c8d16bf5
Use a new version-prefixed hash parser
2016-09-13 17:43:56 +02:00
c736caceba
Use a better default pad title
2016-09-13 12:24:06 +02:00
97415d8158
Merge branch 'users'
2016-09-01 17:38:25 +02:00
8e86be81b2
Merge branch 'better-slides'
2016-09-01 16:01:21 +02:00
fb21b4e46b
fix up /render/
2016-09-01 15:54:21 +02:00
4941c1493e
better user integration. a few more common utils
2016-09-01 12:15:30 +02:00
30ea1b59b7
integrate users into common utilities
2016-08-30 18:09:53 +02:00
6d775f61c6
add missing functions
2016-08-30 10:06:14 +02:00
168338b898
add missing functions
2016-08-29 18:10:15 +02:00
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2016-08-25 17:59:37 +02:00
f40b798d88
Merge pull request #30 from xwiki-labs/reconnect
...
Ability to reconnect after a connection failure
2016-08-25 17:57:45 +02:00
c168ce2d1c
Ability to reconnect after a connection failure
2016-08-25 17:56:17 +02:00
1bec02239c
coerce dates into strings
2016-08-25 11:19:09 +02:00
0add01a940
remove dead code
2016-08-25 11:08:15 +02:00
8c914dfe1f
better filenames
2016-08-19 10:47:07 +02:00
7eaa4ce733
recognize pads with the same type and hash as identical no matter their domain
2016-08-05 17:17:49 +02:00
5131f47cca
jshint compliance
2016-08-03 17:03:50 +02:00
306d524416
fix broken removal call
2016-08-03 16:53:41 +02:00
dd3a5d47be
migrate localStorage so people go to cryptpad.fr
2016-08-03 11:08:45 +02:00
a094e3c02e
use correct store api calls in frame.js
...
also don't log unnecessarily
2016-08-03 11:02:40 +02:00
dcc9810a42
avoid extra call to store if there are no keys to remove
2016-08-03 09:42:49 +02:00
9a5294016d
fix incorrect usage of store api
2016-08-03 09:35:16 +02:00
4e5f381325
add spinner to API. update bower deps
2016-08-02 18:56:35 +02:00
fa654a7646
slightly better regex
2016-08-02 17:08:46 +02:00
cd18075ac7
add some redirection logic to support old hash types
2016-08-02 15:17:20 +02:00
600f3151e9
don't use the store until it's ready to be used
2016-08-02 12:11:40 +02:00
fffa9acf15
remove unused files from fs and jshintignore
2016-08-02 11:59:54 +02:00
551d38c930
let the abstraction take care of stringification
2016-07-29 18:05:58 +02:00
0ada6a3d0a
jshint compliance. gotta keep those tests green
2016-07-28 17:52:26 +02:00
1f24d7126c
big ugly commit that will be really hard to audit
...
This changeset applies new styles to the poll.
it also uses the new asynchronous wrappers around the localStorage api.
this is necessary because we're migrating to a storage system that will
use an async api.
The changes to the poll just happened to coincide with the async stuff.
My apologies to anyone who wants to read this whole thing
2016-07-28 17:44:40 +02:00
7f02c899ea
add snippet for copying text to the clipboard
2016-07-28 10:08:51 +02:00
42eafe9e29
don't create duplicate stylesheets in the document head
2016-07-25 15:39:54 +02:00
c6bdb7506d
forget everything about a pad when you forget it
2016-07-22 15:18:09 +02:00
e84fbf0bc3
more helpers in common
2016-07-22 12:24:54 +02:00
ff74a67a09
translate alertify button messages
2016-07-12 16:43:33 +02:00
d39ab5c250
point to the actual translation file
2016-07-12 15:52:36 +02:00
dea8e225db
fix double scrollbar issue
2016-07-12 15:45:49 +02:00
3eccec7054
better effort for translation
2016-07-11 17:36:53 +02:00
cbeaa8d609
major refactoring for toolbar. CAN HAZ LESS
2016-07-08 16:45:48 +02:00
7504f79e05
add log and warn methods to cryptpad common
2016-07-08 16:45:15 +02:00
3ad5d71ab1
make sure the regular favicon is set
2016-07-07 13:43:08 +02:00
fd3cd73d0b
try to fix favicon bug
2016-07-07 13:40:03 +02:00
589b0087a1
listen for keyup events while alertify prompts are active
2016-07-07 13:27:45 +02:00
deae7ac78f
don't hide the notification until it has been seen
2016-07-07 10:45:09 +02:00
3d3c6e4800
add wrappers for alertifyjs
2016-07-06 22:20:15 +02:00
73d2b6561a
add small modules for page visibility api and notification apis
2016-07-06 22:16:17 +02:00
d8b467422a
fix default title in localStorage migration
2016-07-04 16:43:39 +02:00
7a5877d12a
don't filter pads after 30 days
2016-07-04 15:34:43 +02:00
d844551fba
add a forget button. clean up toolbar a bit
2016-06-30 17:24:25 +02:00
8a82e11306
make sure title is defined for home page usage
2016-06-30 15:53:13 +02:00
71b1f71ba0
fix migration to include ctime
2016-06-30 15:15:38 +02:00
7da58a0de9
improve pad naming UX, slight refactoring
...
* prevent naming conflicts
* migrate localestorage to use named attributes
* use ctime and atime
* display default names in table
* sort pads by most recent atime
* move more functions into cryptpad common
* change table styles
2016-06-30 15:10:32 +02:00
a3da10766a
add rename button to /code/ and /pad/
2016-06-30 10:51:19 +02:00
93dcf29c15
more functions for working with localstorage
2016-06-30 10:43:56 +02:00
d025d13295
address some jshint complaints
2016-06-23 16:44:20 +02:00
12bbf3e8f6
don't drop values onto the window
2016-06-23 16:38:40 +02:00
ca45e3533d
pass loaded file to callback when importing
2016-06-23 16:38:24 +02:00
1a5905d9fd
more work on highlighting modes in codemirror
...
* style the select menu
* add more modes
* preset language selection to 'javascript'
* don't prompt the user with a silly hash when changing their name
2016-06-23 12:07:51 +02:00
31aa09d6f6
work a bit more on import/export and code highlighting
2016-06-22 20:58:50 +02:00
242c9a99e3
implement import and export in /pad/
2016-06-22 17:00:07 +02:00
0a8137e7eb
move rememberPad to cryptpad common and simplify it a bit
2016-06-21 18:46:19 +02:00
c3d2568d3c
add file export for codepad
...
addresses #24
2016-06-17 10:59:45 +02:00
2b8c21d292
set styles with setAttribute. fixes style fights
2016-06-16 13:00:48 +02:00
1746a4e732
use crypto from bower
2016-06-06 12:35:06 +02:00
2a3ff256b9
remove libraries which are now in bower
2016-06-06 12:29:45 +02:00
f72cb24fc5
rm LORIA
2016-06-06 12:27:42 +02:00
2c3de49922
remove realtime-input, since it's in bower now
2016-06-06 12:15:00 +02:00
2798d1b1f9
all of the list/map api's dependencies are now on bower
2016-06-06 11:54:37 +02:00
58c968b319
minor cleanup in realtime-input
2016-06-03 18:55:32 +02:00
288b4d5b66
depend on main passing in the crypto module for now
2016-06-03 18:52:35 +02:00
85dbd5cb6e
pass in websocketURL from main
2016-06-03 17:27:01 +02:00
d9a4f2f22c
missed one
2016-06-03 16:44:15 +02:00
ff0f7d15dc
use json-ot from bower
2016-06-03 16:23:25 +02:00
58633af943
listmap can be reused. put it in common/
2016-06-03 15:47:34 +02:00
dbf1e2b870
support reusing the netflux network
...
export more internals from realtime input
2016-06-03 15:30:51 +02:00
83696495a8
use chainpad from bower, not local
2016-06-02 16:54:47 +02:00
954ee26f4d
fix undefined disconnect reason
2016-06-01 12:19:54 +02:00
9336c4de5c
import latest chainpad
2016-05-31 12:35:01 +02:00
058548b95a
revert my reversion
...
Revert "Revert "Added checkpoints with the new code from ChainPad""
This reverts commit 6e2e8bf21f
2016-05-30 14:58:20 +02:00
6e2e8bf21f
Revert "Added checkpoints with the new code from ChainPad"
...
This reverts commit da2bfe2de9
2016-05-30 10:20:08 +02:00
ce99bd9ba3
Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
2016-05-28 13:15:33 +02:00
a0c73c95d8
do away with a bit of boilerplate
2016-05-28 13:13:54 +02:00
da2bfe2de9
Added checkpoints with the new code from ChainPad
2016-05-26 17:09:02 +02:00
cf85de6113
remove old bencoding code
2016-05-25 11:54:36 +02:00
d99bb8ff84
WIP : fallback to old parsing doesn't work
2016-05-20 17:46:48 +02:00
f04be53d11
fall back to old parsing if the message is bencoded?
2016-05-20 16:45:25 +02:00
976a08cc7a
move to chainpad version 2
2016-05-20 16:34:55 +02:00
cae750cd75
update padrtc for to use bower libraries
2016-05-13 17:35:17 +02:00
7faf57602b
implement log level settings from application layer
2016-05-10 09:39:20 +02:00
523aff3067
use upstream chainpad.js
2016-05-09 15:50:19 +02:00
c752e4a6e5
remove sharejs
2016-05-09 14:20:11 +02:00
6b2e986789
remove deprecated textsocket library
2016-05-09 11:57:40 +02:00
150ebaba7b
add ability to force text diffing
2016-04-27 17:58:55 +02:00
ba17b78f7a
restyle name change button
2016-04-27 15:32:58 +02:00
492054a938
Fix the cursor position when a remote patch is applied
2016-04-27 12:17:06 +02:00
5bb2e12db2
Merge branch 'beta' into migrate
2016-04-27 10:51:51 +02:00
cc51e6d6ed
Update CodeMirror pad to work with Netflux
2016-04-27 10:44:04 +02:00
3b6fe44378
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
2016-04-26 14:31:57 +02:00
85d5f5c47f
Convert netflux to es5
2016-04-25 15:29:39 +02:00
5f16ad4a58
Update to most recent chainpad
2016-04-22 18:17:00 +02:00
aa07dd31ee
have json-ot initialize its own debug module, instead of relying on a window variable's existence
2016-04-22 17:35:07 +02:00
d3203d1c2a
Remove Crypto from the modules loaded with RequireJS in realtime-input
...
It now has to be passed in the config in the main JS file
2016-04-22 14:26:37 +02:00
8ac69ca262
Add a missing "time" property in the netflux client causing incorrect
...
timeout errors
2016-04-22 11:46:27 +02:00
b140b6429d
remove a little bit of dead code
2016-04-22 09:46:06 +02:00
bbdc9da853
delete duplicated file
2016-04-22 08:19:28 +02:00
5f4825f3a0
don't change the hash from realtime input
...
let applications handle that logic
2016-04-21 19:03:50 +02:00
4f426651ad
remove TextPatcher from RealtimeTextSocket
2016-04-21 17:41:50 +02:00
02ff1a63a4
Merge branch 'netflux' into beta
...
Conflicts:
www/assert/main.js
2016-04-21 15:47:07 +02:00
a18c793f98
use latest hyperjson
2016-04-21 14:53:53 +02:00
9efcc443cd
add 'format' to TextPatcher's API
2016-04-21 12:16:11 +02:00
0769e50414
move TextPatcher to highest application layer
2016-04-20 18:56:18 +02:00
1d70335228
provide all callbacks before starting
2016-04-20 18:27:20 +02:00
a3787ee4dc
Merge branch 'netflux' into beta
2016-04-20 15:25:00 +02:00
010566d3c3
pushDelta was mistakenly deprecated. restored.
2016-04-20 14:20:34 +02:00
3598c93098
move new hyperjson into common
2016-04-20 14:14:06 +02:00
103bb69daa
move custom hyperscript into common
2016-04-20 14:13:08 +02:00
b83fb7b823
improve brFix logic
...
stop exporting functions which we wish to deprecate
2016-04-20 12:29:16 +02:00
cb979844f6
implement text patching at application layer
2016-04-17 14:06:30 +02:00
4a41575e6d
accept onLocal in config
2016-04-17 14:05:33 +02:00
d3c2c901b6
implement cursor transformation in a common library
2016-04-17 14:02:45 +02:00
92d89f6cac
start to factor sharejs into two modules
2016-04-15 18:17:45 +02:00
13dc77b7f6
remove commented line
2016-04-15 18:16:54 +02:00
41e635b2e5
realtime-input.js : turn on logging
2016-04-14 16:27:34 +02:00
69e8e18283
Remove the pipe character in the hash
2016-04-14 16:10:08 +02:00
d62e9fc1c9
add a missing semicolon
2016-04-14 15:41:02 +02:00
c32045d7d0
Fix an issue with missing characters when several users were typing at the same time
2016-04-14 15:30:42 +02:00
be09a1808d
Remove old code from realtime-input
2016-04-14 14:46:42 +02:00
6884b0890a
Fix the typong tests not working properly
2016-04-14 12:24:17 +02:00
e207d8b579
Merge branch 'diffdom' into netflux
2016-04-13 16:19:56 +02:00
f4c5b2a996
Add sane defaults to TextPatcher diffs
2016-04-13 14:51:15 +02:00
259772dd62
Turn on TextPatcher logging for _socket
2016-04-13 13:54:25 +02:00
0537c28919
Add switchable logging to TextPatcher.js
2016-04-13 13:53:20 +02:00
8a36963582
Enable ChainPad PARANOIA mode but remove the part which causes most slowness
2016-04-13 13:51:01 +02:00
19cd991dba
trim dead code, comment, very minor optimizations
2016-04-12 17:29:20 +02:00
9f45ccb2d9
use console.error for stack traces
2016-04-12 16:47:30 +02:00
368d72b337
add missing semicolons to TextPatcher.js
2016-04-12 15:39:53 +02:00
851ccfbdb6
detect falsey operations in OT and ignore them
2016-04-12 15:37:47 +02:00
400f6efde1
json-ot.js : jshint compliance
2016-04-12 15:37:47 +02:00
ca94d30386
detect falsey operations in OT and ignore them
2016-04-12 15:35:07 +02:00
9f9cd8d8cd
realtime-input.js : fixes for jshint compliance
2016-04-12 15:07:05 +02:00
793149a608
json-ot.js : jshint compliance
2016-04-12 15:00:46 +02:00
06a3b63923
jshint compliance for toolbar.js
2016-04-12 14:58:24 +02:00
5cead3fad3
add missing semicolons to TextPatcher.js
2016-04-12 14:51:06 +02:00
94e57e4a26
update location of text-patcher.js
2016-04-12 14:21:31 +02:00
b37dab1f49
Merge branch 'diffdom' into netflux
...
Simple cleanup and unit tests
2016-04-12 14:15:04 +02:00
6b9d982d40
stabilize _socket/realtime-input.js
...
...as common/RealtimeTextSocket.js
2016-04-12 13:10:57 +02:00
39071021eb
stabilize typingTest.js as /common/TypingTests.js
2016-04-12 12:53:23 +02:00
9805958ad7
stabilize text-patcher.js into /common/TextPatcher.js
2016-04-12 12:46:49 +02:00
7782069dbd
Merge pull request #15 from xwiki-labs/diffdom
...
merge diffdom into netflux
2016-04-12 10:21:19 +02:00
a1f9b10175
remove offending line from chainpad entirely
...
RTCHAINPAD-3
2016-04-12 10:02:11 +02:00
4ba68eb2bf
fix leaky variable in chainpad
...
Patch.transform declared a 'toTransform' variable without using 'var'
this caused it to leak onto the window during operational transformations
2016-04-12 09:52:36 +02:00
05108efdfa
correct chainpad's transformation function
...
addresses RTCHAINPAD-3
Pending further testing, this change will still need
to be corrected in https://github.com/xwiki-contrib/chainpad/
2016-04-12 09:44:08 +02:00
713c90242b
Hide the usernames when they have not been changed
2016-04-11 15:00:22 +02:00
0b3d6e15b8
Replace the Netflux old client (netflux.js) by the Netflux2 client.
...
Move the WebRTC peer-to-peer use case in /padrtc, which still uses the old
Netflux client
Use es6-promises.min.js to solve a issue with some browser and the new
Netflux client
2016-04-08 16:54:03 +02:00
cf9f60bd57
The server don't send back anymore messages to their sender
2016-04-07 11:27:14 +02:00
eb4ea7a6b0
Remove the content from the ACK messages sent by the server
2016-04-05 15:06:38 +02:00
ba4faea939
Update the pads to run with the latest improvements to the websocket server
2016-04-05 12:17:43 +02:00
5ef7e29a9b
Add the latest changes from _socket into the netflux pad
2016-04-01 17:58:33 +02:00
b59a14c5ac
merge hyperjson changes from realtime xwiki
...
more resilient class serialization.
comments
2016-04-01 11:20:19 +02:00
b41f0e8c50
Merge branch 'cjd-fixed-it-with-hax' into netflux2
2016-04-01 10:51:27 +02:00
c50690349b
comments describing the role of each argument
2016-04-01 10:46:54 +02:00
96e03fcfa4
Use latest chainpad without mutations
2016-03-30 15:29:28 +02:00
d5772c6315
when json-ot produces json that fails to parse...
...
export the relevant data to a window variable so we can inspect it better
2016-03-30 14:39:41 +02:00
6c340a6527
chainpad testing = true, reject non-compliant messages
2016-03-29 16:53:40 +02:00
afa1104d85
Pull the cursor out of bogus BR tarpits when it gets stuck
2016-03-29 15:36:03 +02:00
bac0e0ff88
implement hyperjson filtering
2016-03-29 15:35:40 +02:00
478ccbf984
revert changes to chainpad
2016-03-29 11:04:34 +02:00
b372b0b77c
small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state
2016-03-25 17:35:07 +01:00
98c85cef8b
xxx
2016-03-25 16:49:27 +01:00
62eabbc7ae
If a message does not match parent hash, don't delete it from storage
2016-03-25 15:23:19 +01:00
dbf31798d5
json-ot triggering PARANOIA errors in ChainPad
2016-03-25 15:01:17 +01:00
03932d0169
small changes to chainpad for testing
2016-03-25 14:52:44 +01:00
420a7098a6
more testing and crap
2016-03-25 12:45:51 +01:00
e066730b68
add notes about how hyperjson is to be used
2016-03-24 12:46:35 +01:00
c047d5310f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
Conflicts:
www/common/convert.js
2016-03-24 12:16:42 +01:00
0d33af773f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
2016-03-24 12:11:31 +01:00
475ca9bea8
hyperjson.js : used split instead of filter... oops
2016-03-23 12:33:05 +01:00
1bd5cb9e27
hyperjson.js : used split instead of filter... oops
2016-03-23 12:31:16 +01:00
b2753ef7b7
fix string manipulation off-by-one
2016-03-22 19:29:58 +01:00
f98fda7604
fix string manipulation off-by-one
2016-03-22 19:28:50 +01:00
4f3fcb08a4
better error reporting when the operational transform fails to parse JSON
2016-03-22 12:13:15 +01:00
0ff4906f0e
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
2016-03-22 12:13:01 +01:00
fbe6225681
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
2016-03-22 12:12:46 +01:00
0c6222b5f9
better error reporting when the operational transform fails to parse JSON
2016-03-22 10:19:13 +01:00
79a9998b13
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
2016-03-22 10:16:14 +01:00
bd24821c6c
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
2016-03-22 10:06:42 +01:00
38d797a4f1
Fix issue with Chrome and WebRTC
2016-03-16 17:38:26 +01:00
7237c751d5
Move 'vdom' to the main 'pad'.
...
Hide the right-hand panel (can de bisplayed with a 'debug' button)
Hide the IDs of users if they don't change their name
2016-03-16 17:09:08 +01:00
e77d85bc82
Trigger an onReady() method when the user's pad is fully synced (the history is loaded)
2016-03-16 14:00:14 +01:00
eca4ec699c
Ability to change the username (the user ID is displayed by default)
2016-03-16 12:02:39 +01:00
6e50ae94dd
Remove unused code
2016-03-15 10:51:19 +01:00
5da8560e22
Fix the user list in the toolbar keeping old data with the WebSocket server
...
Chainpad is no longer responsible for the userlist or the ping
2016-03-15 10:37:27 +01:00
3a188625e0
Improve the detection of a disconnected peer to update the user list with the WebRTC service
2016-03-14 15:20:00 +01:00
77e7fb5724
Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel
2016-03-14 14:49:19 +01:00
06e5c84702
Clean some code
2016-03-11 17:32:45 +01:00
b1e8bcddef
Fix the user list not working with the WebRTC service and causing major issues
2016-03-11 17:09:27 +01:00
c576241104
Add a Chainpad adapter to make Chainpad know the userList
2016-03-10 18:48:38 +01:00
ae8f6f7f2c
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
2016-03-10 14:03:31 +01:00
b7885eb539
Fix channel history
2016-03-09 18:35:39 +01:00
8258018c1d
Revert "fix undefined reference"
...
This reverts commit 7d65540123
2016-03-09 10:32:57 +01:00
c67451bc1a
Revert "remove broken functions from convert module"
...
Because I forgot that the /render/ page was still using vdom
This reverts commit 93fb944e1f
2016-03-09 10:29:51 +01:00
c536ecbc1c
Temp commit
2016-03-08 15:13:57 +01:00
870b2dbb7e
Add the WebRTC server in Cryptpad
2016-03-08 11:45:03 +01:00
c4f62fb812
First try with WebRTC
2016-03-08 11:25:37 +01:00
09a06a8bc5
Replace the chainpad server by the netflux server
2016-03-07 17:35:31 +01:00
60c3aceb0d
Add chatflux server
2016-03-07 17:18:47 +01:00
deb2084fc5
Add the socket connection checker
2016-03-07 12:00:45 +01:00
d3e2a2f52e
make verbose logging switchable via a conditional
2016-03-07 11:59:36 +01:00
fefb904261
realtime input changes
2016-03-07 11:34:16 +01:00
fd99dba4a3
modify realtime-input api to take a single object as configuration. merge netflux API
2016-03-07 11:33:46 +01:00
62ba579d4a
Add Netflux API with WebSocket service V1
2016-03-07 11:07:37 +01:00
d7b34cf6be
don't call toolbar from within realtime-input.js
2016-03-04 16:45:11 +01:00
5e1566eaec
fix incomplete 'onAbort' block
2016-03-04 11:07:12 +01:00
1d6ccc99a1
add 'onAbort' hook to realtime-input.js
2016-03-03 18:04:14 +01:00
6ff5b10486
remove local diffDOM version
2016-03-03 16:04:08 +01:00
93fb944e1f
remove broken functions from convert module
2016-03-03 15:18:05 +01:00
7d65540123
fix undefined reference
2016-03-03 15:12:43 +01:00
6884fabda9
Use local diffDOM instead of bower_components
...
At least until the PR gets accepted
2016-02-29 17:05:04 +01:00
f5a8727254
remove some unused functions from cursor.js
2016-02-29 16:52:07 +01:00
db1515c445
cursor.js : commit before cleaning up
2016-02-29 16:27:55 +01:00
91ada5ce7a
export Operation from chainpad. for use with OT
2016-02-29 15:28:32 +01:00
5425699f43
check if possible parent exists before checking if it contains another element
2016-02-29 15:27:11 +01:00
67bdb8a65a
fix a bad regex that occasionally threw an error
...
'nothing to repeat'
2016-02-25 12:35:11 +01:00
39f56d4fd1
throw error when checking for the index of a node that has no parent.
...
it probably isn't in the dom if this is the case.
Check if it's there before using this function
2016-02-23 15:53:58 +01:00
de46be85ba
add better helpers for finding and resetting the cursor
2016-02-23 15:52:58 +01:00
c09036bd29
snapshot cursor.js, as some things are working quite well now
2016-02-22 18:00:46 +01:00
4eee1f5210
add orderOfNodes function to tree library
2016-02-22 17:56:17 +01:00
7689151fc0
pull json validation for OT into its own module for reuse
2016-02-22 17:54:59 +01:00
2c8a2406c6
cursor.js : snapshot before code deletion
2016-02-19 14:07:43 +01:00
1beb3f5355
snapshot of treesome.js before deletion
2016-02-19 14:07:16 +01:00
8ead5ca129
realtime-input.js : add notes regarding integration of the netflux api
2016-02-16 15:14:38 +01:00
d1885fbab6
better jshint compliance for common files
2016-02-15 15:42:08 +01:00
539cc3a2fa
remove unused files from common directory
2016-02-15 15:41:36 +01:00
afa2811472
remove local version of marked.js, prefer bower version
2016-02-15 11:49:47 +01:00
a600ece5c5
fix jshint complaints in common directory
2016-02-12 16:22:20 +01:00
2c5a2b6023
remove unused code, add todos, fix minor errors
2016-02-12 12:03:15 +01:00
967d636df9
address more jshint complaints
2016-02-12 11:39:37 +01:00
f6c848385f
hyperjson.js : jshint complains about var index in for loop
2016-02-12 11:21:33 +01:00
7f92abc7bf
Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect
2016-02-12 10:24:11 +01:00
86c4a69a97
Switch to patching with DiffDOM for testing :D
2016-02-11 16:10:44 +01:00
653ba33b65
Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect
2016-02-11 13:15:57 +01:00
2031191261
testing=false
2016-02-11 13:13:58 +01:00
37db31b09e
Attempt an operational transformation and if the result is not valid JSON then fail
2016-02-11 12:34:06 +01:00
c22269e36e
cursor.js : make the console a little less noisy
2016-02-11 10:02:47 +01:00
99a23154b7
files for unstubbing OT
2016-02-11 09:38:58 +01:00
c740c0ec92
add stuff for walking the tree
2016-02-11 09:32:58 +01:00
ad184b1114
add stuff to recover the cursor
2016-02-11 09:32:41 +01:00
019750bea8
realtime-input.js : callback onInit if exists
2016-02-10 10:40:52 +01:00
7102a0a164
make rainbows
2016-02-05 11:48:34 +01:00
d2f6c63d8a
realtime-input.js : changed the api and left an undefined reference. fixed
2016-02-03 12:58:54 +01:00
d96124229b
clean up realtime-input.js, break API
...
use an object for configuration, so as to be more extensible.
modify applications which use the API to match.
2016-02-03 12:45:45 +01:00
ed03a48092
minor patches that make things a bit more reliable, still some bugs
2016-02-01 19:41:13 +01:00
ac0f7852fc
committing latest changes for review
2016-02-01 15:28:33 +01:00
2016550e01
virtual-dom.js : identify problem area?
2016-02-01 14:28:13 +01:00
fd1e5d5735
better styling on render page
...
now solarized dark
2016-01-30 14:18:20 +01:00
b18dfef656
sharejs textarea is used by realtime-input.js
2016-01-29 12:27:29 +01:00
997ce1147f
realtime input wraps up basic realtime stuff
...
so we don't have to rewrite the realtime api for every application.
starting to move towards a portable api :D
2016-01-29 12:26:49 +01:00
40b8c0efe8
drop in chjj's marked.js for a cool demo
2016-01-29 12:26:27 +01:00
0c2e057f9d
export component APIs from convert
2016-01-27 10:10:47 +01:00
b958caebdd
dom, vdom, hyperjson, and an api which provides a matrix of conversions
2016-01-26 17:26:33 +01:00
2ed9f0867a
Merge branch 'master' of github.com:xwiki-labs/cryptpad into codepad
2016-01-15 11:24:21 -05:00
ff52f050e5
chainpad.js : pull in upstream changes to chainpad.js. new APIs
2016-01-13 09:47:11 -05:00
9fc44cdf0c
add notes to clientside js files
2016-01-13 05:43:58 -05:00
9a932a3f56
Patch Realtime into CodeMirror in CryptPad
2015-11-25 10:09:23 +01:00
88fb6772e8
Cleaned up the front page and added a little piece of code to show recent pads
2015-02-02 17:53:10 +01:00
51544db9a2
Completed adding of customization system and bottom infobar
2015-02-02 16:01:33 +01:00
0e44b10aeb
Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet
2015-01-30 16:52:23 +01:00
e039e90a24
upgrade to most recent chainpad
2015-01-30 16:41:01 +01:00
50c10f818e
Added cryptsheet to cryptpad suite!
2015-01-29 17:55:18 +01:00
yflory