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
|
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 |