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 |