Ryan P.C. McQuen
|
ff4a49d59b
|
Fix Org mode regex.
More details here: https://github.com/mickael-kerjean/nuage/pull/16
|
2018-01-18 08:32:37 -08:00 |
|
yflory
|
4bea1aa2df
|
Display default avatars in IE
|
2018-01-18 15:25:45 +01:00 |
|
yflory
|
adf7e14891
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-18 15:04:17 +01:00 |
|
yflory
|
bc9a88fbe9
|
Add support for org-mode in th code app
|
2018-01-18 15:04:06 +01:00 |
|
ansuz
|
b08c1d94a1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-18 12:20:10 +01:00 |
|
ansuz
|
02dbe9e458
|
enforce maxUploadSize
|
2018-01-18 12:19:58 +01:00 |
|
yflory
|
6a906e3770
|
Fix share modal extension point
|
2018-01-18 11:16:30 +01:00 |
|
yflory
|
e791add4ec
|
Remove + icons from folders in the trash
|
2018-01-18 11:06:47 +01:00 |
|
yflory
|
51b4d269be
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-18 10:54:08 +01:00 |
|
yflory
|
6e086ee779
|
Add shortcuts in the share modal
|
2018-01-18 10:53:43 +01:00 |
|
ansuz
|
fc8847dae4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-18 10:32:27 +01:00 |
|
yflory
|
08ae327386
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-17 18:40:09 +01:00 |
|
yflory
|
c5ebbe1a56
|
New share menu
|
2018-01-17 18:39:45 +01:00 |
|
ansuz
|
e52c1fe65c
|
remove Symbol polyfill
|
2018-01-17 14:27:26 +01:00 |
|
ansuz
|
a91a047d73
|
more polyfill for IE
|
2018-01-16 18:15:08 +01:00 |
|
ansuz
|
50e3e3ce91
|
polyfill Symbol for IE
|
2018-01-16 18:12:33 +01:00 |
|
ansuz
|
1dd07ea48a
|
polyfill MAX_SAFE_INTEGER everywhere
|
2018-01-16 18:03:55 +01:00 |
|
ansuz
|
3858aa976a
|
better warning in case of errors in /file/
|
2018-01-16 16:52:06 +01:00 |
|
yflory
|
4c49cd7592
|
Fix template picker not displayed anymore in framework
|
2018-01-16 14:39:56 +01:00 |
|
yflory
|
c77e4adf1e
|
Use local name instead of title in filepicker if it exists
|
2018-01-16 14:32:49 +01:00 |
|
yflory
|
2f74324dac
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-16 12:05:37 +01:00 |
|
yflory
|
f79e1dfda0
|
Fix a race condition that could wiped the content of coed and slide
|
2018-01-16 12:05:26 +01:00 |
|
ansuz
|
3118dd8312
|
set logLevel to 2 by default for sframe apps
|
2018-01-16 11:52:04 +01:00 |
|
yflory
|
88a04fdb07
|
Don't create sfcommon a second time in code and slide
|
2018-01-16 11:26:16 +01:00 |
|
yflory
|
ee605183e5
|
Make sure we don't have duplicates in the webchannel members
|
2018-01-15 15:40:52 +01:00 |
|
yflory
|
20f05d2f6f
|
Fix Phantom viewers' revenge
|
2018-01-15 15:38:18 +01:00 |
|
yflory
|
f3d8fd3590
|
Ability to import local pads on login
|
2018-01-12 18:17:32 +01:00 |
|
yflory
|
47203c37f1
|
Remove console error caused by setTimeout called with undefined
|
2018-01-12 17:44:56 +01:00 |
|
yflory
|
a40315aff7
|
Remove ability to delete comments in polls for readonly users
|
2018-01-12 17:15:11 +01:00 |
|
yflory
|
85edc028ff
|
Remove logging about filepicker rpc
|
2018-01-12 17:10:55 +01:00 |
|
yflory
|
a4b35728dc
|
Todo app has a hash in the omnibar
|
2018-01-12 17:08:41 +01:00 |
|
yflory
|
68ce7fe53d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-12 15:55:00 +01:00 |
|
yflory
|
d59bc4612d
|
Ability to disable the drive for anonymous users
|
2018-01-12 15:54:36 +01:00 |
|
ansuz
|
844d04df87
|
allow custom logout hooks defined in app config
|
2018-01-12 15:49:01 +01:00 |
|
ansuz
|
5b4e5480cb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-12 14:51:53 +01:00 |
|
ansuz
|
9b78580d8e
|
make usage-bar display optional
|
2018-01-12 14:50:56 +01:00 |
|
yflory
|
db0d2e161c
|
Hide pad creation screen features if it is disabled in app config
|
2018-01-12 14:50:39 +01:00 |
|
yflory
|
b01d00f74a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-12 09:50:17 +01:00 |
|
yflory
|
daef08a9b3
|
Add an advanced new pad modal
|
2018-01-12 09:50:11 +01:00 |
|
Caleb James DeLisle
|
cd26a4c093
|
Added a test of /login/
|
2018-01-11 18:11:06 +01:00 |
|
yflory
|
e377d606be
|
Fix spinner style in the new settings category
|
2018-01-11 17:15:39 +01:00 |
|
Caleb James DeLisle
|
69aee6c21b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-11 17:09:06 +01:00 |
|
Caleb James DeLisle
|
378322a521
|
Don't finish the test until ChainPad settles, trying to eliminate a flicker
|
2018-01-11 17:08:47 +01:00 |
|
yflory
|
c460e2820e
|
Fix a 1px offset for the userlist in Firefox/Windows
|
2018-01-11 16:09:29 +01:00 |
|
yflory
|
bd9c44dbb2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-11 16:02:18 +01:00 |
|
yflory
|
ef480fea79
|
Add a settings category for the pad creation screen
|
2018-01-11 16:02:05 +01:00 |
|
Caleb James DeLisle
|
4808c8b374
|
Fixed poll which was not working with automated testing
|
2018-01-11 15:57:09 +01:00 |
|
ansuz
|
05ad38cfe1
|
add more config parameters to share menu extension
|
2018-01-11 15:55:57 +01:00 |
|
ansuz
|
c31b5aa6c0
|
make extension point cover share menu for files
|
2018-01-11 15:55:57 +01:00 |
|
yflory
|
13b704d9f6
|
Fix undefined webchannel when uploading a file
|
2018-01-11 15:55:57 +01:00 |
|
ansuz
|
ca3697ae3a
|
implement extension point for share menu
|
2018-01-11 15:55:57 +01:00 |
|
ansuz
|
5346afe51f
|
step towards customizable login functionality
|
2018-01-11 15:55:57 +01:00 |
|
ansuz
|
1fba82540a
|
remove example code from todo app
|
2018-01-11 15:55:57 +01:00 |
|
Caleb James DeLisle
|
151d33db18
|
Added testing of /poll/ :D
|
2018-01-11 15:45:12 +01:00 |
|
yflory
|
8c9490868b
|
improve owned pads management in the drive
|
2018-01-10 17:57:40 +01:00 |
|
yflory
|
d74c2a0395
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-10 11:47:59 +01:00 |
|
yflory
|
e5b9f089fb
|
Fix undefined webchannel when uploading a file
|
2018-01-10 11:47:52 +01:00 |
|
Caleb James DeLisle
|
864e24b2ce
|
Fixed typo in test
|
2018-01-10 11:42:48 +01:00 |
|
yflory
|
73126ed597
|
Display the owner and expiration time of a pad in the properties modal
|
2018-01-09 18:19:24 +01:00 |
|
yflory
|
ecd8ef6418
|
improve thumbnails creation performances in code
|
2018-01-09 15:25:11 +01:00 |
|
yflory
|
77dcc1c705
|
Fix a race condition when switching language in the code app
|
2018-01-09 12:44:25 +01:00 |
|
yflory
|
65ccfe39ef
|
Add a 'properties' button in pads to display pad data
|
2018-01-09 12:02:56 +01:00 |
|
yflory
|
071d385850
|
Remove an unnecessary websocket connection
|
2018-01-09 12:02:22 +01:00 |
|
yflory
|
7defde3c59
|
lint compliance
|
2018-01-08 17:41:10 +01:00 |
|
yflory
|
0cea5f4596
|
Create an owned pad and view owned pads in the drive
|
2018-01-08 17:36:44 +01:00 |
|
yflory
|
1ec41f4e09
|
Ability to pick a background image in slides
|
2018-01-04 17:22:01 +01:00 |
|
yflory
|
59c4df3d9b
|
Fix 'NaN' txid for RPC when using IE
|
2018-01-03 17:14:35 +01:00 |
|
yflory
|
0f02d76b56
|
Fix missing callback when uploading files to the drive
|
2018-01-03 15:08:26 +01:00 |
|
yflory
|
d2845b95b6
|
Fix multiple file upload prompt
|
2018-01-03 11:42:23 +01:00 |
|
yflory
|
f329d65bc8
|
Ability to reduce the width of ckeditor
|
2017-12-22 18:01:15 +01:00 |
|
yflory
|
10aaa06781
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-22 16:25:52 +01:00 |
|
ansuz
|
869909b101
|
implement more reliable check for whether a channel on the server is new
|
2017-12-22 16:24:17 +01:00 |
|
ansuz
|
b6430d640e
|
temporary measure to address infinite reload loop due to inaccurate inNewFile condition
|
2017-12-22 14:59:41 +01:00 |
|
yflory
|
bc5554f5f6
|
Display an error when visiting the bounce app without href
|
2017-12-22 14:58:44 +01:00 |
|
yflory
|
2fd22c6db6
|
Fix task list in markdown when using one empty line between tasks
|
2017-12-22 14:56:01 +01:00 |
|
yflory
|
5e8b183ee6
|
Fix uncommited column in poll hidden in published mode
|
2017-12-22 14:42:37 +01:00 |
|
yflory
|
7164d2dfdd
|
lint compliance
|
2017-12-22 14:42:18 +01:00 |
|
ansuz
|
26f5a1fe74
|
signal that onLocal is called by onRemote
|
2017-12-22 13:16:15 +01:00 |
|
yflory
|
888739e333
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 18:21:14 +01:00 |
|
yflory
|
fa6106a6bb
|
Use CSS to remove the loading screen
|
2017-12-21 18:21:10 +01:00 |
|
ansuz
|
b0fe323a4c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 18:09:55 +01:00 |
|
ansuz
|
c0b5dc7536
|
make loading screen tip presence configurable
|
2017-12-21 18:09:49 +01:00 |
|
yflory
|
a26031c119
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 17:38:28 +01:00 |
|
yflory
|
0e6e68aaff
|
Remove print prompt in slides since the browsers already have a prompt
|
2017-12-21 17:38:22 +01:00 |
|
ansuz
|
892dfb18f7
|
check if users have service workers
|
2017-12-21 17:30:54 +01:00 |
|
ansuz
|
5f42a9749f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 17:23:58 +01:00 |
|
ansuz
|
4aa8d92a53
|
handle errors when constructing thumbnails from file metadata
|
2017-12-21 17:18:10 +01:00 |
|
yflory
|
5532b779fd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 15:56:28 +01:00 |
|
ansuz
|
d1d75f2f25
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 15:53:16 +01:00 |
|
Caleb James DeLisle
|
590e77aafa
|
lint, missing semicolon
|
2017-12-21 11:15:21 +01:00 |
|
Caleb James DeLisle
|
4117eb71cc
|
Report the number of tests
|
2017-12-21 10:40:48 +01:00 |
|
Caleb James DeLisle
|
c928be028a
|
Upgrade the testing framework to allow multiple tests
|
2017-12-20 18:36:53 +01:00 |
|
yflory
|
f7d30318cc
|
Disable editable inputs in poll's read-only mode
|
2017-12-20 15:46:44 +01:00 |
|
yflory
|
edc236e17b
|
Disable edition in pad read-only mode
|
2017-12-20 12:15:43 +01:00 |
|
yflory
|
f4078d68f0
|
Remove the 'edit username' button in the userlist in readonly mode
|
2017-12-20 11:54:30 +01:00 |
|
yflory
|
78f738143b
|
Hide the markdown toolbar in read-only mode
|
2017-12-20 11:41:47 +01:00 |
|
ansuz
|
3177fd7857
|
hide whiteboard palette in view mode
|
2017-12-20 11:01:23 +01:00 |
|
Caleb James DeLisle
|
37dcf7285a
|
Need to be exactly true, not just truthy
|
2017-12-19 19:16:53 +01:00 |
|
Caleb James DeLisle
|
dc7dbb3e96
|
Accidentally made a test which hangs...
|
2017-12-19 19:09:48 +01:00 |
|
Caleb James DeLisle
|
cbd7351d53
|
Improved logging if there's a non-empty-newdoc
|
2017-12-19 19:08:01 +01:00 |
|
Caleb James DeLisle
|
d9323cc458
|
stubbed a failing test
|
2017-12-19 19:01:02 +01:00 |
|
yflory
|
cfc9ce33d6
|
Hide the tags button for anonymous users
|
2017-12-19 11:58:45 +01:00 |
|
yflory
|
09433e0bf0
|
display existing tags in the prompt in drive
|
2017-12-19 10:16:53 +01:00 |
|
Caleb James DeLisle
|
3c0806659b
|
Better logging if we trigger the doc emptystring issue
|
2017-12-18 18:28:48 +01:00 |
|
Caleb James DeLisle
|
7842c730a4
|
support for testing on safari
|
2017-12-18 15:15:41 +01:00 |
|
Caleb James DeLisle
|
e587e9cd57
|
allow specifying the browser in selenium
|
2017-12-18 11:39:59 +01:00 |
|
ansuz
|
38e28ebc9a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-15 19:12:00 +01:00 |
|
ansuz
|
3c2d6af4f0
|
save pending tags when clicking OK on tagPrompt
|
2017-12-15 19:11:53 +01:00 |
|
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
|
f292407c6e
|
Fix present mode in the code app
|
2017-12-15 15:40:52 +01:00 |
|
yflory
|
50ddad5e41
|
Fix an issue with the tag prompt removing all keyup listeners
|
2017-12-15 15:33:53 +01:00 |
|
yflory
|
92a8e107d7
|
Use the correct hash when opening the todo app for the first time
|
2017-12-15 15:33:11 +01:00 |
|
Caleb James DeLisle
|
bb548b3428
|
Merge branch 'staging' into better-testing
|
2017-12-15 10:29:28 +01:00 |
|
yflory
|
3188ea3f35
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-14 14:59:06 +01:00 |
|
Caleb James DeLisle
|
6ac4fa4689
|
wip
|
2017-12-14 11:34:44 +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 |
|
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
|
b14228da18
|
Merge branch 'staging' into refactor
|
2017-12-01 17:04:03 +01:00 |
|
yflory
|
c59c6072f3
|
Remove jquery from outer
|
2017-12-01 16:05:23 +01:00 |
|
yflory
|
fc027ba00b
|
Test webworker app
|
2017-12-01 15:03:01 +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
|
7c8572c99d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-30 18:32:27 +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
|
d1277d7026
|
Merge branch 'staging' into refactor2
|
2017-11-30 17:25:23 +01:00 |
|
ansuz
|
3f892e04a5
|
fix codemirror overflow css
|
2017-11-30 17:24:43 +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
|
96cf83af34
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 18:26:11 +01:00 |
|
ansuz
|
385ac9607c
|
pass 'self' into common-util instead of using window
|
2017-11-27 18:26:04 +01:00 |
|
yflory
|
acd8ab7446
|
Add the markdown toolbar in profile
|
2017-11-27 18:10:37 +01:00 |
|
yflory
|
b0a384e8e0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 17:55:48 +01:00 |
|
yflory
|
74e59a513a
|
Add the markdown toolbar to the slide and poll apps
|
2017-11-27 17:55:20 +01:00 |
|
ansuz
|
22c5ff757b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 15:05:07 +01:00 |
|
ansuz
|
650d26afea
|
use unified listmap in profile app
|
2017-11-27 15:04:59 +01:00 |
|
yflory
|
68d602f74a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 14:44:57 +01:00 |
|
yflory
|
644f6e9985
|
Use the bounce app to open links from inner
|
2017-11-27 14:44:44 +01:00 |
|
ansuz
|
5eacc158d9
|
make tests pass again
|
2017-11-27 13:45:40 +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
|
444ba91287
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 12:17:46 +01:00 |
|
yflory
|
b0f553e9ea
|
Add a markdown toolbar to help with the markdown syntax
|
2017-11-27 12:17:35 +01:00 |
|
ansuz
|
77c81f2426
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging
|
2017-11-27 12:16:47 +01:00 |
|
ansuz
|
4ff4ccd1d3
|
use faster and more correct 'find' implementation
|
2017-11-27 11:30:50 +01:00 |
|
ansuz
|
e3f04ef076
|
Merge branch 'soon' into staging
|
2017-11-27 11:11:49 +01:00 |
|
ansuz
|
71cf3a4ddf
|
fix creation of personal todo list
|
2017-11-27 11:09:28 +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
|
2e00214783
|
drop unreachable code
|
2017-11-23 16:57:01 +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
|
4b5abdecbe
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-23 12:29:32 +01:00 |
|
yflory
|
280a7c2765
|
Clean cryptpad-common
|
2017-11-23 12:28:49 +01:00 |
|
ansuz
|
98c2b0c802
|
Merge branch 'soon' into staging
|
2017-11-22 17:38:49 +01:00 |
|
ansuz
|
3ff0eb116b
|
don't let search interfere with renaming
|
2017-11-22 17:23:14 +01:00 |
|
yflory
|
eba1c9dfac
|
Add chainpad log to the debug app
|
2017-11-21 18:50:33 +01:00 |
|
yflory
|
a660c03f97
|
Fix scrollbar in the debug app
|
2017-11-21 17:42:50 +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 |
|
ansuz
|
9d662bd337
|
fix right-click pad creation in drive
|
2017-11-21 15:21:37 +01:00 |
|
ansuz
|
d726c95f0b
|
fix namespace collision
|
2017-11-21 15:10:28 +01:00 |
|
ansuz
|
c8a9afb6c8
|
remove duplicate loading screen
|
2017-11-21 15:09:53 +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 |
|
yflory
|
eb88efd83f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-20 14:17:37 +01:00 |
|
yflory
|
80803ad076
|
Fix empty codemirror after thumbnail creation
|
2017-11-20 14:17:29 +01:00 |
|
ansuz
|
a8d5a68eb5
|
open links correctly in contacts app
|
2017-11-20 14:06:19 +01:00 |
|
ansuz
|
7441a68fb9
|
update test after merging api changes
|
2017-11-20 12:22:26 +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
|
e2cf46d725
|
Add new keyboard shortcuts for the drive search
|
2017-11-20 11:50:52 +01:00 |
|
yflory
|
cf26c4c286
|
Improve the toolbar UI for smaller screens
|
2017-11-17 18:21:45 +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
|
fd258fc277
|
Fix preview button tooltip in code
|
2017-11-17 18:19:35 +01:00 |
|
yflory
|
fe9261f6a2
|
Fix modules order in TODO
|
2017-11-17 18:19:11 +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
|
bdd24ed14f
|
lint
|
2017-11-14 11:57:13 +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
|
be848c1bec
|
Fix broken readonly link in drive
|
2017-11-09 17:27:50 +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
|
cf5ccf04f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-09 14:23:54 +01:00 |
|
yflory
|
101482b8cc
|
Migrate settings to use a sandboxed iframe
|
2017-11-09 14:23:40 +01:00 |
|
ansuz
|
7f8147b18b
|
Merge branch 'soon'
|
2017-11-07 15:06:57 +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
|
454fc8498c
|
remove old* apps
|
2017-11-07 13:50:07 +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
|
5dff9a32b6
|
Fix comments order in polls
|
2017-11-03 18:38:04 +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
|
5438970ab4
|
typo
|
2017-10-31 11:30:13 +01:00 |
|
yflory
|
e0f7df80b3
|
Fix avatar upload and use less2 everywhere in profile
|
2017-10-31 11:11:29 +01:00 |
|
yflory
|
7f9b21405b
|
Add missing files for profile
|
2017-10-31 10:27:41 +01:00 |
|
yflory
|
e99836bae2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-30 18:49:43 +01:00 |
|
yflory
|
4250688856
|
Migrate profile to use sframe
|
2017-10-30 18:49:28 +01:00 |
|
ansuz
|
744809101c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-30 16:24:55 +01:00 |
|
ansuz
|
867df1db56
|
fix '+New' button in drive toolbar
|
2017-10-30 16:24:41 +01:00 |
|
yflory
|
907e2cb517
|
lint compliance
|
2017-10-30 15:13:27 +01:00 |
|
yflory
|
abc511a56e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-30 15:12:29 +01:00 |
|
yflory
|
68accaf653
|
Todo in sframe with less2
|
2017-10-30 15:12:15 +01:00 |
|
ansuz
|
11b8b380fd
|
Merge branch 'staging' into evilham
|
2017-10-30 14:50:11 +01:00 |
|
ansuz
|
04f26ff886
|
Merge branch 'staging' of github.com:evilham/cryptpad into evilham
|
2017-10-30 14:41:21 +01:00 |
|
ansuz
|
0a14c715ad
|
add test for support of invite urls
|
2017-10-30 14:40:43 +01:00 |
|
Evilham
|
5dcfbd07ab
|
Merge branch 'theming-improvement' into staging
|
2017-10-27 18:32:08 +02:00 |
|
Evilham
|
4933aafbc8
|
Added default values to avoid breaking existing themes.
|
2017-10-27 18:31:52 +02: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
|
d644054e3f
|
lint compliance
|
2017-10-27 11:13:26 +02:00 |
|
ansuz
|
ed253e6c75
|
Merge branch 'staging' into evilham
|
2017-10-27 11:03:16 +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 |
|
Evilham
|
735f0a7e30
|
Merge branch 'theming-improvement' into staging
|
2017-10-26 20:44:56 +02:00 |
|
Evilham
|
83da9cf752
|
Moved colours to colortheme.less to enable theming
|
2017-10-26 20:29:14 +02:00 |
|
yflory
|
8251247da2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-26 12:31:33 +02:00 |
|
yflory
|
6f020b67ca
|
Add thumbnails to framework apps
|
2017-10-26 12:31:16 +02:00 |
|
ansuz
|
98c66ef8f6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-25 13:04:08 +02:00 |
|
yflory
|
bf817f20ee
|
Fix file upload in code and slide
|
2017-10-25 12:31:22 +02:00 |
|
ansuz
|
f031af4e9d
|
fix broken media-tags in contacts
|
2017-10-25 10:50:17 +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
|
ba97aa7ad2
|
allow file upload handler to create thumbnails for whiteboard
|
2017-10-24 18:09:38 +02:00 |
|
ansuz
|
6157c57a4b
|
disable color palette when interface is not editable
|
2017-10-24 17:59:19 +02:00 |
|
ansuz
|
8359902f6a
|
fix typo in poll
|
2017-10-24 17:42:08 +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 |
|
yflory
|
39b4cb9226
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-24 14:31:56 +02:00 |
|
yflory
|
18b5b20d27
|
Add thumbnails for PDFs
|
2017-10-24 14:31:42 +02:00 |
|
ansuz
|
aee51f1317
|
lint compliance
|
2017-10-24 14:02:29 +02:00 |
|
ansuz
|
447b0a74ee
|
handle errors for videos when uploading
|
2017-10-24 13:45:27 +02:00 |
|
yflory
|
30a69fae13
|
Add thumbnails for videos
|
2017-10-24 12:26:04 +02:00 |
|
yflory
|
21f8ae7570
|
Keep the correct ratio for image thumbnails
|
2017-10-24 11:45:07 +02:00 |
|
yflory
|
2dd3c42fd5
|
Fix handlers registered again on reconnect in drive and poll
|
2017-10-24 10:42:08 +02:00 |
|
yflory
|
a0bcb901d3
|
Add titles in poll when options or usernames are overflowing
|
2017-10-23 15:16:51 +02:00 |
|
yflory
|
74985fd0f2
|
Use text for the addUser button in polls
|
2017-10-23 15:12:27 +02:00 |
|
ansuz
|
6db5a34323
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 14:53:42 +02:00 |
|
ansuz
|
c17fc2efe7
|
improve option order in poll
|
2017-10-23 14:53:31 +02:00 |
|
yflory
|
2be22867c1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 14:39:31 +02:00 |
|
yflory
|
13718d0263
|
Fix recent pads in chrome
|
2017-10-23 14:38:38 +02:00 |
|
ansuz
|
2e5fdf709a
|
Merge branch 'soon' into staging
|
2017-10-23 14:29:01 +02:00 |
|
ansuz
|
de8339fea7
|
hide alertify when you are in presentation mode
|
2017-10-23 14:25:25 +02:00 |
|
Caleb James DeLisle
|
9b02b36724
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 14:22:54 +03:00 |
|
Caleb James DeLisle
|
d7e9498143
|
Fix and then disable the new OT
|
2017-10-23 14:22:33 +03:00 |
|
ansuz
|
288e141c1f
|
add missing sframe method
|
2017-10-23 12:33:50 +02:00 |
|
yflory
|
c1d05a00ba
|
Improve media-tag export in pad to work with existing CSP
|
2017-10-23 10:55:40 +02:00 |