yflory
|
bba974947b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
6bcc72ff83
|
Fix pads using an old URL
|
7 years ago |
|
Caleb James DeLisle
|
8582f92892
|
Attempt to handle the possible scenario where we are overwriting an existing pad with the initial content.
|
7 years ago |
|
ansuz
|
50b6a23067
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
76af3b90a7
|
stub createUnpinnedWarning0
|
7 years ago |
|
ansuz
|
7b8321c263
|
make a test fail so we don't forget to fix the bug
|
7 years ago |
|
yflory
|
a863011a0c
|
Fix profile in read-only mode
|
7 years ago |
|
yflory
|
0d05d880ee
|
Fix the bounce app
|
7 years ago |
|
yflory
|
b30efff5d1
|
Better way to check if we're using the safe origin in bounce
|
7 years ago |
|
yflory
|
b1765c6ae3
|
Fix pad creation screen with anonymous users
|
7 years ago |
|
yflory
|
c269929319
|
Fix creation page not displayed in pad and slide
|
7 years ago |
|
yflory
|
362104ec09
|
lint compliance
|
7 years ago |
|
yflory
|
89cc583f53
|
Call the handler if onReady is called for a ready channel
|
7 years ago |
|
yflory
|
dcfccf88cd
|
Merge branch 'creationpage' into staging
|
7 years ago |
|
yflory
|
353b146644
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
1922dbfd75
|
Creation page with mobile support
|
7 years ago |
|
Caleb James DeLisle
|
dd44b4da99
|
Removed old /less/ directory which is nolonger used :)
|
7 years ago |
|
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
|
7 years ago |
|
Caleb James DeLisle
|
008b2cc67e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
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
|
7 years ago |
|
ansuz
|
06422e6d5a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
38bd27303b
|
WIP rpc framework
|
7 years ago |
|
Caleb James DeLisle
|
617c4b6044
|
CSS refactorings and pad-is-not-pinned work
|
7 years ago |
|
yflory
|
e96d54e655
|
Add a pad creation page
|
7 years ago |
|
yflory
|
0080dd7624
|
Fix codemirror width with small screens in the code app
|
7 years ago |
|
yflory
|
4377f2cee7
|
Fix missing translations in the drive
|
7 years ago |
|
yflory
|
203c5d64c1
|
Focus codemirror after using the markdown toolbar
|
7 years ago |
|
yflory
|
e72270d4a4
|
Add feedback when sharedworker is defined
|
7 years ago |
|
yflory
|
1ac4abc482
|
Remove old code
|
7 years ago |
|
yflory
|
64303b4090
|
Merge branch 'refactor' into staging
|
7 years ago |
|
yflory
|
3e064e6638
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
604ea1c95f
|
Feedback about webworkers
|
7 years ago |
|
Caleb James DeLisle
|
ba74f9d37a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
1dabea84d9
|
Overrides to colortheme.less will nolonger block the adding of new keys to the original file
|
7 years ago |
|
yflory
|
61935500f4
|
Lint compliance
|
7 years ago |
|
yflory
|
9eb33e39e6
|
Enable change events in the drive
|
7 years ago |
|
Caleb James DeLisle
|
c702a23c77
|
Initial work on the 'pad will expire' logic
|
7 years ago |
|
yflory
|
17636769e4
|
Remove the second network created for the drive
|
7 years ago |
|
ansuz
|
291eb57027
|
fix auth app
|
7 years ago |
|
yflory
|
52712c4bb9
|
Use the network from the async store for pads
|
7 years ago |
|
yflory
|
e397f66b56
|
lint compliance
|
7 years ago |
|
yflory
|
de7806504b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
f52d987515
|
Ability to resize avatars before uploading them
|
7 years ago |
|
ansuz
|
34223e4b78
|
remove accidental inclusion
|
7 years ago |
|
ansuz
|
0b54a76211
|
lint compliance
|
7 years ago |
|
ansuz
|
cd29208267
|
fix toolbar's incorrect gotoDrive title
|
7 years ago |
|
ansuz
|
e85e2dcabd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
d3d9e2e771
|
WIP: refactoring rpc code
|
7 years ago |
|
ansuz
|
afcc888a8b
|
make flat dom quiet again
|
7 years ago |
|
yflory
|
e164edec03
|
Fix the webworker app
|
7 years ago |
|
yflory
|
b14228da18
|
Merge branch 'staging' into refactor
|
7 years ago |
|
yflory
|
c59c6072f3
|
Remove jquery from outer
|
7 years ago |
|
yflory
|
fc027ba00b
|
Test webworker app
|
7 years ago |
|
yflory
|
c6b8bbea59
|
Fix tests
|
7 years ago |
|
yflory
|
04e02871bc
|
Merge branch 'refactor2' into staging
|
7 years ago |
|
yflory
|
4903bd0757
|
Enable messenger in async store
|
7 years ago |
|
yflory
|
bd85f1b003
|
Fix file upload and remove unnecessary dependencies
|
7 years ago |
|
Caleb James DeLisle
|
7c8572c99d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
5187b3f26c
|
Flow compliance and fix a few bugs in rpc.js
|
7 years ago |
|
yflory
|
664625a6ef
|
Fix more async store issues
|
7 years ago |
|
yflory
|
d1277d7026
|
Merge branch 'staging' into refactor2
|
7 years ago |
|
ansuz
|
3f892e04a5
|
fix codemirror overflow css
|
7 years ago |
|
yflory
|
5c3237e093
|
Fix issues with the async store
|
7 years ago |
|
yflory
|
b3688db202
|
Use async store
|
7 years ago |
|
yflory
|
0840570fbf
|
Async store part 1
|
7 years ago |
|
ansuz
|
96cf83af34
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
385ac9607c
|
pass 'self' into common-util instead of using window
|
7 years ago |
|
yflory
|
acd8ab7446
|
Add the markdown toolbar in profile
|
7 years ago |
|
yflory
|
b0a384e8e0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
74e59a513a
|
Add the markdown toolbar to the slide and poll apps
|
7 years ago |
|
ansuz
|
22c5ff757b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
650d26afea
|
use unified listmap in profile app
|
7 years ago |
|
yflory
|
68d602f74a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
644f6e9985
|
Use the bounce app to open links from inner
|
7 years ago |
|
ansuz
|
5eacc158d9
|
make tests pass again
|
7 years ago |
|
ansuz
|
812df7de6f
|
Merge branch 'merge-staging' into staging
|
7 years ago |
|
ansuz
|
be5c5831dd
|
lint compliance
|
7 years ago |
|
yflory
|
444ba91287
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
b0f553e9ea
|
Add a markdown toolbar to help with the markdown syntax
|
7 years ago |
|
ansuz
|
77c81f2426
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging
|
7 years ago |
|
ansuz
|
4ff4ccd1d3
|
use faster and more correct 'find' implementation
|
7 years ago |
|
ansuz
|
e3f04ef076
|
Merge branch 'soon' into staging
|
7 years ago |
|
ansuz
|
71cf3a4ddf
|
fix creation of personal todo list
|
7 years ago |
|
ansuz
|
701af29192
|
fix broken register/login process
|
7 years ago |
|
ansuz
|
a3c093838c
|
merge latest staging and resolve conflicts
|
7 years ago |
|
ansuz
|
56102d3689
|
use unified listmap
|
7 years ago |
|
ansuz
|
661db129b2
|
lint compliance
|
7 years ago |
|
ansuz
|
80978377f2
|
return transformed cursor value
|
7 years ago |
|
ansuz
|
2e00214783
|
drop unreachable code
|
7 years ago |
|
ansuz
|
ee6c2097f5
|
resolve merge conflicts
|
7 years ago |
|
yflory
|
9795ac32cb
|
Ability to burn an anonymous drive from the browser
|
7 years ago |
|
yflory
|
4b5abdecbe
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
280a7c2765
|
Clean cryptpad-common
|
7 years ago |
|
ansuz
|
98c2b0c802
|
Merge branch 'soon' into staging
|
7 years ago |
|
ansuz
|
3ff0eb116b
|
don't let search interfere with renaming
|
7 years ago |
|
yflory
|
eba1c9dfac
|
Add chainpad log to the debug app
|
7 years ago |
|
yflory
|
a660c03f97
|
Fix scrollbar in the debug app
|
7 years ago |
|
yflory
|
30cea8888d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
06011065d2
|
Add a debug app
|
7 years ago |
|
ansuz
|
60c4973d62
|
resolve merge conflicts
|
7 years ago |
|
ansuz
|
585f9d2e4e
|
repair broken 'clear channel' button
|
7 years ago |
|
yflory
|
000f3edd1d
|
Constants file
|
7 years ago |
|
yflory
|
477f14bb8b
|
Put constants in a separate file
|
7 years ago |
|
ansuz
|
9d662bd337
|
fix right-click pad creation in drive
|
7 years ago |
|
ansuz
|
d726c95f0b
|
fix namespace collision
|
7 years ago |
|
ansuz
|
c8a9afb6c8
|
remove duplicate loading screen
|
7 years ago |
|
yflory
|
7f88d1d43a
|
Improve drive loading speed
|
7 years ago |
|
yflory
|
06ede6b294
|
Fix export in apps using framework
|
7 years ago |
|
yflory
|
c35e3d644e
|
Make sure dates are stored as numbers in the drive
|
7 years ago |
|
yflory
|
655dfe971d
|
Add translation for the edit username button in the userlist
|
7 years ago |
|
yflory
|
eb88efd83f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
80803ad076
|
Fix empty codemirror after thumbnail creation
|
7 years ago |
|
ansuz
|
a8d5a68eb5
|
open links correctly in contacts app
|
7 years ago |
|
ansuz
|
7441a68fb9
|
update test after merging api changes
|
7 years ago |
|
ansuz
|
d1beb6493b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
b96ea47f1f
|
strip tracking parameters when parsing urls
|
7 years ago |
|
yflory
|
e2cf46d725
|
Add new keyboard shortcuts for the drive search
|
7 years ago |
|
yflory
|
cf26c4c286
|
Improve the toolbar UI for smaller screens
|
7 years ago |
|
yflory
|
fc02f97d78
|
Use less2 classes in the user menu
|
7 years ago |
|
yflory
|
41a082c46d
|
Fix video thumbnails
|
7 years ago |
|
yflory
|
fd258fc277
|
Fix preview button tooltip in code
|
7 years ago |
|
yflory
|
fe9261f6a2
|
Fix modules order in TODO
|
7 years ago |
|
yflory
|
af8aa25228
|
Add an option to never rename a file during the session
|
7 years ago |
|
yflory
|
31b31654ec
|
Lint compliance
|
7 years ago |
|
yflory
|
25d3d321da
|
Ability to rename a file before uploading it to the server
|
7 years ago |
|
yflory
|
2813b7219e
|
Fix the public key using the wrong domain in settings
|
7 years ago |
|
yflory
|
a96e49d55a
|
Fix filepicker creating a new netflux network when initialized
|
7 years ago |
|
yflory
|
630ac45948
|
Fix laggy and blinking tooltips
|
7 years ago |
|
yflory
|
1f53304ad3
|
Display a dropdown menu inside another one
|
7 years ago |
|
yflory
|
014e12b5b5
|
Ability to update the username from the userlist
|
7 years ago |
|
yflory
|
bdd24ed14f
|
lint
|
7 years ago |
|
yflory
|
7cfe64fc5b
|
Remove cryptpad-common dependency for some inner apps
|
7 years ago |
|
yflory
|
1514ad5df3
|
Move the 'logged out' screen inside the sframe
|
7 years ago |
|
yflory
|
5a2afb5c95
|
Remove Realtime and Messaging from common
|
7 years ago |
|
yflory
|
30c8c253dd
|
Remove util and hash from common
|
7 years ago |
|
yflory
|
c9e1de042c
|
Remove common-interface dependency from cryptpad-common
|
7 years ago |
|
yflory
|
dc207393fd
|
Separate UI elements from cryptpad-common
|
7 years ago |
|
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.
|
7 years ago |
|
Caleb James DeLisle
|
eaa7b6e8e5
|
Do content checks on the drive so if it gets corrupted, the patch will be rejected
|
7 years ago |
|
yflory
|
354c63bd64
|
Clean old code
|
7 years ago |
|
Caleb James DeLisle
|
ac66511f0a
|
Merge branch 'staging' into new-diff
|
7 years ago |
|
yflory
|
be848c1bec
|
Fix broken readonly link in drive
|
7 years ago |
|
yflory
|
f931574dac
|
lint compliance
|
7 years ago |
|
Caleb James DeLisle
|
7b62a8042e
|
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
|
7 years ago |
|
Caleb James DeLisle
|
840cd91bcb
|
manual merge
|
7 years ago |
|
Caleb James DeLisle
|
75130150d5
|
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
|
7 years ago |
|
yflory
|
cf5ccf04f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
101482b8cc
|
Migrate settings to use a sandboxed iframe
|
7 years ago |
|
ansuz
|
7f8147b18b
|
Merge branch 'soon'
|
7 years ago |
|
yflory
|
c1ba08cfc6
|
Make sure thumbnails are .png
|
7 years ago |
|
yflory
|
0956905ca8
|
Wipe localForage on log out
|
7 years ago |
|
yflory
|
6b9ffe8dd1
|
Make thumbnails more secure
|
7 years ago |
|
ansuz
|
454fc8498c
|
remove old* apps
|
7 years ago |
|
ansuz
|
e07bb0f7b3
|
roll back to old transform function, except in pad
|
7 years ago |
|
yflory
|
a592317e35
|
lint compliance
|
7 years ago |
|
yflory
|
fef97ed60e
|
Fix an creating duplicates mediatags in markdown preview
|
7 years ago |
|
yflory
|
9060464f37
|
Create thumbnails only when the tab is not focused
|
7 years ago |
|
yflory
|
a37e6c7979
|
lint compliance
|
7 years ago |
|
yflory
|
2a3a5c4342
|
Ability to disable thumbnails
|
7 years ago |
|
yflory
|
5dff9a32b6
|
Fix comments order in polls
|
7 years ago |
|
yflory
|
1871749b6f
|
Fix -1 viewer in the userlist when disconnected
|
7 years ago |
|
yflory
|
cf3024ef5b
|
Ability to display an error in the toolbar state
|
7 years ago |
|
yflory
|
8de9a596f1
|
Fix cursor in thumbnails
|
7 years ago |
|
yflory
|
fd7bb3aadb
|
Make sure the infinite spinner modal is not displayed multiple times
|
7 years ago |
|
yflory
|
3ebb5ca493
|
Fix issue in diffMarked creating text nodes for each character
|
7 years ago |
|
yflory
|
5438970ab4
|
typo
|
7 years ago |
|
yflory
|
e0f7df80b3
|
Fix avatar upload and use less2 everywhere in profile
|
7 years ago |
|
yflory
|
7f9b21405b
|
Add missing files for profile
|
7 years ago |
|
yflory
|
e99836bae2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
4250688856
|
Migrate profile to use sframe
|
7 years ago |
|
ansuz
|
744809101c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
867df1db56
|
fix '+New' button in drive toolbar
|
7 years ago |
|
yflory
|
907e2cb517
|
lint compliance
|
7 years ago |
|
yflory
|
abc511a56e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
68accaf653
|
Todo in sframe with less2
|
7 years ago |
|
ansuz
|
11b8b380fd
|
Merge branch 'staging' into evilham
|
7 years ago |
|
ansuz
|
04f26ff886
|
Merge branch 'staging' of github.com:evilham/cryptpad into evilham
|
7 years ago |
|
ansuz
|
0a14c715ad
|
add test for support of invite urls
|
7 years ago |
|
Evilham
|
5dcfbd07ab
|
Merge branch 'theming-improvement' into staging
|
7 years ago |
|
Evilham
|
4933aafbc8
|
Added default values to avoid breaking existing themes.
|
7 years ago |
|
ansuz
|
4c0049ad55
|
don't log presence of other users as 'joins' when you have first joined
|
7 years ago |
|
ansuz
|
325f685f3e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
1cbf1aec92
|
prevent undefined access in non-sframe apps
|
7 years ago |
|
yflory
|
ac1b67ad67
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
1245b4d244
|
Enable thumbnails in poll and whiteboard
|
7 years ago |
|
ansuz
|
d644054e3f
|
lint compliance
|
7 years ago |
|
ansuz
|
ed253e6c75
|
Merge branch 'staging' into evilham
|
7 years ago |
|
ansuz
|
df1a700cb2
|
disable thumbnail test. add test for flat dom
|
7 years ago |
|
ansuz
|
02cd7e5b58
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
69890ebd8f
|
prototype alternate datastructure for trees in listmap
|
7 years ago |
|
ansuz
|
23c305f71f
|
implement removeItem so localForage doesn't complain
|
7 years ago |
|
Evilham
|
735f0a7e30
|
Merge branch 'theming-improvement' into staging
|
7 years ago |
|
Evilham
|
83da9cf752
|
Moved colours to colortheme.less to enable theming
|
7 years ago |
|
yflory
|
8251247da2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
6f020b67ca
|
Add thumbnails to framework apps
|
7 years ago |
|
ansuz
|
98c66ef8f6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
bf817f20ee
|
Fix file upload in code and slide
|
7 years ago |
|
ansuz
|
f031af4e9d
|
fix broken media-tags in contacts
|
7 years ago |
|
yflory
|
24572a40d2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
f4adbd980e
|
Thumbnails for the code app
|
7 years ago |