Commit graph

1722 commits

Author SHA1 Message Date
yflory
47e4ce623a Fix import pads from anon drive at registration 2017-12-15 18:27:13 +01:00
yflory
d666e9e7ee Remove tag and filepicker buttons for anon users 2017-12-15 18:16:01 +01:00
yflory
c18d4297e1 Fix friend requests from the userlist 2017-12-15 16:19:22 +01:00
Caleb James DeLisle
6a2d79249d Added some nice testing 2017-12-15 16:09:30 +01:00
yflory
50ddad5e41 Fix an issue with the tag prompt removing all keyup listeners 2017-12-15 15:33:53 +01:00
Caleb James DeLisle
bb548b3428 Merge branch 'staging' into better-testing 2017-12-15 10:29:28 +01:00
Caleb James DeLisle
6ac4fa4689 wip 2017-12-14 11:34:44 +01:00
ansuz
afcf3d06b3 unpin pads when they are removed from your drive 2017-12-12 16:00:05 +01:00
ansuz
1a0ac9830a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-12 14:53:17 +01:00
ansuz
c0e49211c4 eat errors related to cursors 2017-12-12 14:51:51 +01:00
yflory
bba974947b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-12 14:45:39 +01:00
yflory
6bcc72ff83 Fix pads using an old URL 2017-12-12 14:45:25 +01:00
Caleb James DeLisle
8582f92892 Attempt to handle the possible scenario where we are overwriting an existing pad with the initial content. 2017-12-12 14:30:10 +01:00
ansuz
50b6a23067 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-12 13:47:35 +01:00
ansuz
76af3b90a7 stub createUnpinnedWarning0 2017-12-12 13:47:24 +01:00
yflory
a863011a0c Fix profile in read-only mode 2017-12-12 12:14:32 +01:00
yflory
b1765c6ae3 Fix pad creation screen with anonymous users 2017-12-11 17:58:59 +01:00
yflory
c269929319 Fix creation page not displayed in pad and slide 2017-12-11 17:17:06 +01:00
yflory
362104ec09 lint compliance 2017-12-11 14:49:41 +01:00
yflory
89cc583f53 Call the handler if onReady is called for a ready channel 2017-12-11 12:48:06 +01:00
yflory
dcfccf88cd Merge branch 'creationpage' into staging 2017-12-11 12:21:21 +01:00
yflory
1922dbfd75 Creation page with mobile support 2017-12-11 12:19:44 +01:00
Caleb James DeLisle
7a09bf43eb Fix a truly silly mistake in rpc.js and make the pad-not-pinned message get removed if a registered user joins 2017-12-08 14:46:32 +01:00
Caleb James DeLisle
008b2cc67e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-08 14:01:02 +01:00
Caleb James DeLisle
12b0f3e201 Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window 2017-12-08 14:00:53 +01:00
ansuz
06422e6d5a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-08 11:47:55 +01:00
ansuz
38bd27303b WIP rpc framework 2017-12-08 11:47:07 +01:00
Caleb James DeLisle
617c4b6044 CSS refactorings and pad-is-not-pinned work 2017-12-07 19:00:13 +01:00
yflory
e96d54e655 Add a pad creation page 2017-12-07 18:51:50 +01:00
yflory
4377f2cee7 Fix missing translations in the drive 2017-12-07 12:20:26 +01:00
yflory
203c5d64c1 Focus codemirror after using the markdown toolbar 2017-12-07 12:18:14 +01:00
yflory
e72270d4a4 Add feedback when sharedworker is defined 2017-12-07 10:50:45 +01:00
yflory
1ac4abc482 Remove old code 2017-12-07 10:35:48 +01:00
yflory
64303b4090 Merge branch 'refactor' into staging 2017-12-07 10:34:15 +01:00
yflory
3e064e6638 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-06 18:33:16 +01:00
yflory
604ea1c95f Feedback about webworkers 2017-12-06 18:32:48 +01:00
Caleb James DeLisle
ba74f9d37a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-05 18:32:29 +01:00
Caleb James DeLisle
1dabea84d9 Overrides to colortheme.less will nolonger block the adding of new keys to the original file 2017-12-05 18:32:23 +01:00
yflory
61935500f4 Lint compliance 2017-12-05 18:10:53 +01:00
yflory
9eb33e39e6 Enable change events in the drive 2017-12-05 18:09:43 +01:00
Caleb James DeLisle
c702a23c77 Initial work on the 'pad will expire' logic 2017-12-05 17:48:30 +01:00
yflory
17636769e4 Remove the second network created for the drive 2017-12-05 16:40:04 +01:00
ansuz
291eb57027 fix auth app 2017-12-05 15:07:35 +01:00
yflory
52712c4bb9 Use the network from the async store for pads 2017-12-04 19:16:38 +01:00
yflory
de7806504b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-04 15:03:57 +01:00
yflory
f52d987515 Ability to resize avatars before uploading them 2017-12-04 15:03:43 +01:00
ansuz
34223e4b78 remove accidental inclusion 2017-12-04 13:59:57 +01:00
ansuz
0b54a76211 lint compliance 2017-12-04 13:58:33 +01:00
ansuz
cd29208267 fix toolbar's incorrect gotoDrive title 2017-12-04 11:46:15 +01:00
ansuz
e85e2dcabd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-04 11:41:45 +01:00
ansuz
d3d9e2e771 WIP: refactoring rpc code 2017-12-04 11:10:25 +01:00
ansuz
afcc888a8b make flat dom quiet again 2017-12-04 10:16:17 +01:00
yflory
e164edec03 Fix the webworker app 2017-12-01 18:29:59 +01:00
yflory
c59c6072f3 Remove jquery from outer 2017-12-01 16:05:23 +01:00
yflory
c6b8bbea59 Fix tests 2017-12-01 14:56:34 +01:00
yflory
04e02871bc Merge branch 'refactor2' into staging 2017-12-01 14:50:19 +01:00
yflory
4903bd0757 Enable messenger in async store 2017-12-01 14:49:21 +01:00
yflory
bd85f1b003 Fix file upload and remove unnecessary dependencies 2017-12-01 10:16:48 +01:00
Caleb James DeLisle
5187b3f26c Flow compliance and fix a few bugs in rpc.js 2017-11-30 18:32:20 +01:00
yflory
664625a6ef Fix more async store issues 2017-11-30 18:22:26 +01:00
yflory
5c3237e093 Fix issues with the async store 2017-11-30 17:21:58 +01:00
yflory
b3688db202 Use async store 2017-11-30 15:01:17 +01:00
yflory
0840570fbf Async store part 1 2017-11-30 10:33:09 +01:00
ansuz
385ac9607c pass 'self' into common-util instead of using window 2017-11-27 18:26:04 +01:00
yflory
74e59a513a Add the markdown toolbar to the slide and poll apps 2017-11-27 17:55:20 +01:00
yflory
644f6e9985 Use the bounce app to open links from inner 2017-11-27 14:44:44 +01:00
ansuz
812df7de6f Merge branch 'merge-staging' into staging 2017-11-27 12:18:34 +01:00
ansuz
be5c5831dd lint compliance 2017-11-27 12:18:04 +01:00
yflory
b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
ansuz
4ff4ccd1d3 use faster and more correct 'find' implementation 2017-11-27 11:30:50 +01:00
ansuz
701af29192 fix broken register/login process 2017-11-24 15:12:00 +01:00
ansuz
a3c093838c merge latest staging and resolve conflicts 2017-11-24 13:46:59 +01:00
ansuz
56102d3689 use unified listmap 2017-11-24 13:40:21 +01:00
ansuz
661db129b2 lint compliance 2017-11-24 10:32:58 +01:00
ansuz
80978377f2 return transformed cursor value 2017-11-24 10:03:45 +01:00
ansuz
ee6c2097f5 resolve merge conflicts 2017-11-23 16:56:49 +01:00
yflory
9795ac32cb Ability to burn an anonymous drive from the browser 2017-11-23 14:36:42 +01:00
yflory
280a7c2765 Clean cryptpad-common 2017-11-23 12:28:49 +01:00
yflory
eba1c9dfac Add chainpad log to the debug app 2017-11-21 18:50:33 +01:00
yflory
30cea8888d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-21 17:37:53 +01:00
yflory
06011065d2 Add a debug app 2017-11-21 17:37:38 +01:00
ansuz
60c4973d62 resolve merge conflicts 2017-11-21 17:22:06 +01:00
ansuz
585f9d2e4e repair broken 'clear channel' button 2017-11-21 17:19:35 +01:00
yflory
000f3edd1d Constants file 2017-11-21 16:47:19 +01:00
yflory
477f14bb8b Put constants in a separate file 2017-11-21 16:46:19 +01:00
yflory
7f88d1d43a Improve drive loading speed 2017-11-21 11:09:59 +01:00
yflory
06ede6b294 Fix export in apps using framework 2017-11-21 10:26:33 +01:00
yflory
c35e3d644e Make sure dates are stored as numbers in the drive 2017-11-20 15:37:23 +01:00
yflory
655dfe971d Add translation for the edit username button in the userlist 2017-11-20 14:28:35 +01:00
ansuz
d1beb6493b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-20 12:20:13 +01:00
ansuz
b96ea47f1f strip tracking parameters when parsing urls 2017-11-20 12:09:17 +01:00
yflory
fc02f97d78 Use less2 classes in the user menu 2017-11-17 18:20:45 +01:00
yflory
41a082c46d Fix video thumbnails 2017-11-17 18:20:02 +01:00
yflory
af8aa25228 Add an option to never rename a file during the session 2017-11-17 10:57:54 +01:00
yflory
31b31654ec Lint compliance 2017-11-16 18:57:33 +01:00
yflory
25d3d321da Ability to rename a file before uploading it to the server 2017-11-16 18:11:13 +01:00
yflory
2813b7219e Fix the public key using the wrong domain in settings 2017-11-16 13:35:07 +01:00
yflory
a96e49d55a Fix filepicker creating a new netflux network when initialized 2017-11-15 16:56:50 +01:00
yflory
630ac45948 Fix laggy and blinking tooltips 2017-11-15 16:31:26 +01:00
yflory
1f53304ad3 Display a dropdown menu inside another one 2017-11-15 15:35:28 +01:00
yflory
014e12b5b5 Ability to update the username from the userlist 2017-11-15 11:32:54 +01:00
yflory
7cfe64fc5b Remove cryptpad-common dependency for some inner apps 2017-11-13 18:09:19 +01:00
yflory
1514ad5df3 Move the 'logged out' screen inside the sframe 2017-11-13 17:29:00 +01:00
yflory
5a2afb5c95 Remove Realtime and Messaging from common 2017-11-13 17:01:09 +01:00
yflory
30c8c253dd Remove util and hash from common 2017-11-13 16:32:40 +01:00
yflory
c9e1de042c Remove common-interface dependency from cryptpad-common 2017-11-13 12:00:26 +01:00
yflory
dc207393fd Separate UI elements from cryptpad-common 2017-11-13 10:23:18 +01:00
Caleb James DeLisle
50da6b3b2e Needs to be handled in chainpad-listmap
Revert "Do content checks on the drive so if it gets corrupted, the patch will be rejected"

This reverts commit eaa7b6e8e5.
2017-11-11 01:34:20 +01:00
Caleb James DeLisle
eaa7b6e8e5 Do content checks on the drive so if it gets corrupted, the patch will be rejected 2017-11-11 01:26:54 +01:00
yflory
354c63bd64 Clean old code 2017-11-09 18:17:49 +01:00
Caleb James DeLisle
ac66511f0a Merge branch 'staging' into new-diff 2017-11-09 17:44:45 +01:00
yflory
f931574dac lint compliance 2017-11-09 17:23:13 +01:00
Caleb James DeLisle
7b62a8042e Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window 2017-11-09 17:07:04 +01:00
Caleb James DeLisle
840cd91bcb manual merge 2017-11-09 15:38:32 +01:00
Caleb James DeLisle
75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad 2017-11-09 15:36:49 +01:00
yflory
101482b8cc Migrate settings to use a sandboxed iframe 2017-11-09 14:23:40 +01:00
yflory
c1ba08cfc6 Make sure thumbnails are .png 2017-11-07 15:04:45 +01:00
yflory
0956905ca8 Wipe localForage on log out 2017-11-07 14:56:50 +01:00
yflory
6b9ffe8dd1 Make thumbnails more secure 2017-11-07 14:51:53 +01:00
ansuz
e07bb0f7b3 roll back to old transform function, except in pad 2017-11-06 17:18:10 +01:00
yflory
a592317e35 lint compliance 2017-11-06 15:49:40 +01:00
yflory
fef97ed60e Fix an creating duplicates mediatags in markdown preview 2017-11-06 15:47:18 +01:00
yflory
9060464f37 Create thumbnails only when the tab is not focused 2017-11-06 13:36:54 +01:00
yflory
a37e6c7979 lint compliance 2017-11-03 18:39:06 +01:00
yflory
2a3a5c4342 Ability to disable thumbnails 2017-11-03 18:38:27 +01:00
yflory
1871749b6f Fix -1 viewer in the userlist when disconnected 2017-11-03 15:14:23 +01:00
yflory
cf3024ef5b Ability to display an error in the toolbar state 2017-11-03 14:30:59 +01:00
yflory
8de9a596f1 Fix cursor in thumbnails 2017-11-02 19:11:27 +01:00
yflory
fd7bb3aadb Make sure the infinite spinner modal is not displayed multiple times 2017-11-02 17:47:19 +01:00
yflory
3ebb5ca493 Fix issue in diffMarked creating text nodes for each character 2017-10-31 18:19:30 +01:00
yflory
4250688856 Migrate profile to use sframe 2017-10-30 18:49:28 +01:00
ansuz
4c0049ad55 don't log presence of other users as 'joins' when you have first joined 2017-10-27 14:20:31 +02:00
ansuz
325f685f3e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-27 14:14:25 +02:00
ansuz
1cbf1aec92 prevent undefined access in non-sframe apps 2017-10-27 14:14:19 +02:00
yflory
ac1b67ad67 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-27 13:31:54 +02:00
yflory
1245b4d244 Enable thumbnails in poll and whiteboard 2017-10-27 13:31:41 +02:00
ansuz
df1a700cb2 disable thumbnail test. add test for flat dom 2017-10-27 11:01:22 +02:00
ansuz
02cd7e5b58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-27 10:44:53 +02:00
ansuz
69890ebd8f prototype alternate datastructure for trees in listmap 2017-10-27 10:43:44 +02:00
ansuz
23c305f71f implement removeItem so localForage doesn't complain 2017-10-27 10:37:44 +02:00
yflory
6f020b67ca Add thumbnails to framework apps 2017-10-26 12:31:16 +02:00
yflory
bf817f20ee Fix file upload in code and slide 2017-10-25 12:31:22 +02:00
yflory
24572a40d2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 18:50:19 +02:00
yflory
f4adbd980e Thumbnails for the code app 2017-10-24 18:49:58 +02:00
ansuz
69f9a7ebf3 make userlist change notifications configurable 2017-10-24 17:29:58 +02:00
Caleb James DeLisle
027b9fa383 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 18:03:31 +03:00
Caleb James DeLisle
aa37997aa3 Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm> 2017-10-24 18:02:03 +03:00
ansuz
bac608adfe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 16:56:13 +02:00
ansuz
dc90811090 only call onReady once in sframe-listmap 2017-10-24 16:56:08 +02:00
yflory
bac10472f3 lint compliance 2017-10-24 14:32:47 +02:00