Commit graph

3102 commits

Author SHA1 Message Date
yflory
3188ea3f35 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-14 14:59:06 +01:00
yflory
a08cf8faa8 Allow drive to receive updates after leaving history mode 2017-12-14 09:44:20 +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
ansuz
7b8321c263 make a test fail so we don't forget to fix the bug 2017-12-12 13:43:55 +01:00
yflory
a863011a0c Fix profile in read-only mode 2017-12-12 12:14:32 +01:00
yflory
0d05d880ee Fix the bounce app 2017-12-12 10:47:01 +01:00
yflory
b30efff5d1 Better way to check if we're using the safe origin in bounce 2017-12-12 10:44:20 +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
353b146644 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-11 12:21:17 +01:00
yflory
1922dbfd75 Creation page with mobile support 2017-12-11 12:19:44 +01:00
Caleb James DeLisle
dd44b4da99 Removed old /less/ directory which is nolonger used :) 2017-12-08 14:56:13 +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
0080dd7624 Fix codemirror width with small screens in the code app 2017-12-07 17:28:05 +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
e397f66b56 lint compliance 2017-12-04 15:27:48 +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