yflory
8c42125ea0
Merge branch 'soon'
7 years ago
yflory
7ff9bbe2b0
Fix share modal with new pads
7 years ago
yflory
acf09c807d
Fix fonts
7 years ago
yflory
9ba912d953
Clean onlyoffice files
7 years ago
yflory
db71fe5bf8
Rename font files
7 years ago
yflory
d53ea25111
Merge branch 'soon'
7 years ago
yflory
5f50bedce2
Fix empty properties for readonly pads
7 years ago
yflory
15a8196037
Enable pad creation screen
7 years ago
yflory
2eef1e96e6
Remove invalid error reports
7 years ago
yflory
7cb3282634
New apps for text, slide and spreadsheet
7 years ago
yflory
766fa72841
Fix initial value of the preview link in the share modal
7 years ago
yflory
5c1e5a3f49
Merge branch 'staging' into oo
7 years ago
yflory
649fefad54
Send cookie when history keeper has changed
7 years ago
yflory
2ac9c3ba66
Report RPC errors when deleting owned pads
7 years ago
yflory
037a6ccc35
Fix INVALID_RESPONSE error in the file app
7 years ago
yflory
70e014cdfc
Hide infinite spinner and disconnect modals when pad is deleted
7 years ago
yflory
e83e589cf0
Kick from pad when an owned channel is deleted + whiteboard and poll
7 years ago
yflory
728a6a868d
Manage expired channels
7 years ago
yflory
3bb6d5a83c
Remove full history timeout
7 years ago
ansuz
d676a5e7db
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords
7 years ago
yflory
5bba9b6c39
Refactor login to remove duplicate code
7 years ago
yflory
4df4c48fbd
Improve UI for pad creation screen
7 years ago
yflory
83eb304716
lint compliance
7 years ago
yflory
970122b41d
Send the channel id to the text analyzer
7 years ago
yflory
80df45f257
Get text from ckeditor
7 years ago
yflory
fb192a2c45
Add a configurable background color in the file app in view mode
7 years ago
yflory
91e42f1518
Fix the bug introduced in the share modal fix
7 years ago
yflory
0b1795e5a1
Fix an issue preventing the share modal to be used more than once
7 years ago
yflory
bdafc101c9
Ability to remove owned channels from the drive
7 years ago
yflory
b6e91c772e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
a1d9f44bbd
Delete owned pads from server when removed from the owner's drive
7 years ago
ansuz
f134f11b73
new getDeletedPads rpc
7 years ago
yflory
5089f1206d
Pad creation screen translations and link to settings
7 years ago
yflory
36550b781f
Don't check for stronger hash if we have an edit hash
7 years ago
yflory
86144eda22
Display a message about pads deleted from the server
7 years ago
yflory
9a317018e2
Remove deleted pads from the drive
7 years ago
yflory
3d3f58b3fc
Improve share modal customization to make it work with async functions
7 years ago
yflory
5827905dbd
Import OnlyOffice code from the 'onlyoffice' branch and sframe it
7 years ago
ansuz
2b8414ca78
provide hints for running CryptPad
7 years ago
ansuz
80cd3e208a
lint compliance
7 years ago
ansuz
4e8335bfdd
fix support for custom button classes
7 years ago
yflory
2995782079
Different colors for ok and cancel in alertify
7 years ago
Caleb James DeLisle
4de6bd6195
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
014aacc76a
Added a new RPC to get file offsets of messages by hash or of last 2 checkpoints, also improved checking of valid channel names and fixed a pull-stream bug and exposed async-store to the window
7 years ago
yflory
69c33e2f83
Ability to disable profile
7 years ago
yflory
51587d1006
Ability to disable feedback on the entire instance
7 years ago
yflory
006d99e19a
Fix undefined friends
7 years ago
yflory
c90ba890ca
Add more configurable options and add a new way to use custom config
7 years ago
yflory
2e436f16c9
Refactor context menu in drive
7 years ago
yflory
4bea1aa2df
Display default avatars in IE
7 years ago
yflory
adf7e14891
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
bc9a88fbe9
Add support for org-mode in th code app
7 years ago
ansuz
b08c1d94a1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
02dbe9e458
enforce maxUploadSize
7 years ago
yflory
6a906e3770
Fix share modal extension point
7 years ago
yflory
51b4d269be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
6e086ee779
Add shortcuts in the share modal
7 years ago
ansuz
fc8847dae4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
08ae327386
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
c5ebbe1a56
New share menu
7 years ago
ansuz
e52c1fe65c
remove Symbol polyfill
7 years ago
ansuz
a91a047d73
more polyfill for IE
7 years ago
ansuz
50e3e3ce91
polyfill Symbol for IE
7 years ago
ansuz
1dd07ea48a
polyfill MAX_SAFE_INTEGER everywhere
7 years ago
yflory
4c49cd7592
Fix template picker not displayed anymore in framework
7 years ago
yflory
2f74324dac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
f79e1dfda0
Fix a race condition that could wiped the content of coed and slide
7 years ago
ansuz
3118dd8312
set logLevel to 2 by default for sframe apps
7 years ago
yflory
88a04fdb07
Don't create sfcommon a second time in code and slide
7 years ago
yflory
ee605183e5
Make sure we don't have duplicates in the webchannel members
7 years ago
yflory
20f05d2f6f
Fix Phantom viewers' revenge
7 years ago
yflory
47203c37f1
Remove console error caused by setTimeout called with undefined
7 years ago
yflory
a4b35728dc
Todo app has a hash in the omnibar
7 years ago
yflory
68ce7fe53d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
d59bc4612d
Ability to disable the drive for anonymous users
7 years ago
ansuz
844d04df87
allow custom logout hooks defined in app config
7 years ago
ansuz
5b4e5480cb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
9b78580d8e
make usage-bar display optional
7 years ago
yflory
db0d2e161c
Hide pad creation screen features if it is disabled in app config
7 years ago
yflory
daef08a9b3
Add an advanced new pad modal
7 years ago
yflory
bd9c44dbb2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
ef480fea79
Add a settings category for the pad creation screen
7 years ago
ansuz
05ad38cfe1
add more config parameters to share menu extension
7 years ago
ansuz
c31b5aa6c0
make extension point cover share menu for files
7 years ago
yflory
13b704d9f6
Fix undefined webchannel when uploading a file
7 years ago
ansuz
ca3697ae3a
implement extension point for share menu
7 years ago
ansuz
5346afe51f
step towards customizable login functionality
7 years ago
Caleb James DeLisle
151d33db18
Added testing of /poll/ :D
7 years ago
yflory
8c9490868b
improve owned pads management in the drive
7 years ago
yflory
e5b9f089fb
Fix undefined webchannel when uploading a file
7 years ago
yflory
73126ed597
Display the owner and expiration time of a pad in the properties modal
7 years ago
yflory
ecd8ef6418
improve thumbnails creation performances in code
7 years ago
yflory
77dcc1c705
Fix a race condition when switching language in the code app
7 years ago
yflory
65ccfe39ef
Add a 'properties' button in pads to display pad data
7 years ago
yflory
071d385850
Remove an unnecessary websocket connection
7 years ago
yflory
7defde3c59
lint compliance
7 years ago
yflory
0cea5f4596
Create an owned pad and view owned pads in the drive
7 years ago
yflory
1ec41f4e09
Ability to pick a background image in slides
7 years ago
yflory
59c4df3d9b
Fix 'NaN' txid for RPC when using IE
7 years ago
yflory
0f02d76b56
Fix missing callback when uploading files to the drive
7 years ago
yflory
d2845b95b6
Fix multiple file upload prompt
7 years ago
yflory
10aaa06781
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
869909b101
implement more reliable check for whether a channel on the server is new
7 years ago
ansuz
b6430d640e
temporary measure to address infinite reload loop due to inaccurate inNewFile condition
7 years ago
yflory
2fd22c6db6
Fix task list in markdown when using one empty line between tasks
7 years ago
yflory
7164d2dfdd
lint compliance
7 years ago
ansuz
26f5a1fe74
signal that onLocal is called by onRemote
7 years ago
yflory
888739e333
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
fa6106a6bb
Use CSS to remove the loading screen
7 years ago
ansuz
c0b5dc7536
make loading screen tip presence configurable
7 years ago
ansuz
892dfb18f7
check if users have service workers
7 years ago
ansuz
5f42a9749f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
4aa8d92a53
handle errors when constructing thumbnails from file metadata
7 years ago
yflory
5532b779fd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
d1d75f2f25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
590e77aafa
lint, missing semicolon
7 years ago
Caleb James DeLisle
4117eb71cc
Report the number of tests
7 years ago
Caleb James DeLisle
c928be028a
Upgrade the testing framework to allow multiple tests
7 years ago
yflory
f4078d68f0
Remove the 'edit username' button in the userlist in readonly mode
7 years ago
yflory
78f738143b
Hide the markdown toolbar in read-only mode
7 years ago
Caleb James DeLisle
cbd7351d53
Improved logging if there's a non-empty-newdoc
7 years ago
yflory
cfc9ce33d6
Hide the tags button for anonymous users
7 years ago
yflory
09433e0bf0
display existing tags in the prompt in drive
7 years ago
Caleb James DeLisle
3c0806659b
Better logging if we trigger the doc emptystring issue
7 years ago
Caleb James DeLisle
7842c730a4
support for testing on safari
7 years ago
Caleb James DeLisle
e587e9cd57
allow specifying the browser in selenium
7 years ago
ansuz
38e28ebc9a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
3c2d6af4f0
save pending tags when clicking OK on tagPrompt
7 years ago
yflory
47e4ce623a
Fix import pads from anon drive at registration
7 years ago
yflory
d666e9e7ee
Remove tag and filepicker buttons for anon users
7 years ago
yflory
c18d4297e1
Fix friend requests from the userlist
7 years ago
Caleb James DeLisle
6a2d79249d
Added some nice testing
7 years ago
yflory
50ddad5e41
Fix an issue with the tag prompt removing all keyup listeners
7 years ago
Caleb James DeLisle
bb548b3428
Merge branch 'staging' into better-testing
7 years ago
Caleb James DeLisle
6ac4fa4689
wip
7 years ago
ansuz
afcf3d06b3
unpin pads when they are removed from your drive
7 years ago
ansuz
1a0ac9830a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
c0e49211c4
eat errors related to cursors
7 years ago
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
yflory
a863011a0c
Fix profile in read-only mode
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
1922dbfd75
Creation page with mobile support
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
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
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
c59c6072f3
Remove jquery from outer
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
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
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
385ac9607c
pass 'self' into common-util instead of using window
7 years ago
yflory
74e59a513a
Add the markdown toolbar to the slide and poll apps
7 years ago
yflory
644f6e9985
Use the bounce app to open links from inner
7 years ago
ansuz
812df7de6f
Merge branch 'merge-staging' into staging
7 years ago
ansuz
be5c5831dd
lint compliance
7 years ago
yflory
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
7 years ago
ansuz
4ff4ccd1d3
use faster and more correct 'find' implementation
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
ee6c2097f5
resolve merge conflicts
7 years ago
yflory
9795ac32cb
Ability to burn an anonymous drive from the browser
7 years ago
yflory
280a7c2765
Clean cryptpad-common
7 years ago
yflory
eba1c9dfac
Add chainpad log to 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
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
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
fc02f97d78
Use less2 classes in the user menu
7 years ago
yflory
41a082c46d
Fix video thumbnails
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
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
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
101482b8cc
Migrate settings to use a sandboxed iframe
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
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
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
4250688856
Migrate profile to use sframe
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
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
yflory
6f020b67ca
Add thumbnails to framework apps
7 years ago
yflory
bf817f20ee
Fix file upload in code and slide
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
ansuz
69f9a7ebf3
make userlist change notifications configurable
7 years ago
Caleb James DeLisle
027b9fa383
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
aa37997aa3
Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
7 years ago
ansuz
bac608adfe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
dc90811090
only call onReady once in sframe-listmap
7 years ago
yflory
bac10472f3
lint compliance
7 years ago
yflory
39b4cb9226
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
18b5b20d27
Add thumbnails for PDFs
7 years ago
ansuz
aee51f1317
lint compliance
7 years ago
ansuz
447b0a74ee
handle errors for videos when uploading
7 years ago
yflory
30a69fae13
Add thumbnails for videos
7 years ago
yflory
21f8ae7570
Keep the correct ratio for image thumbnails
7 years ago
yflory
2be22867c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
13718d0263
Fix recent pads in chrome
7 years ago
ansuz
2e5fdf709a
Merge branch 'soon' into staging
7 years ago
Caleb James DeLisle
9b02b36724
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
d7e9498143
Fix and then disable the new OT
7 years ago
ansuz
288e141c1f
add missing sframe method
7 years ago
yflory
c1d05a00ba
Improve media-tag export in pad to work with existing CSP
7 years ago
yflory
3e4faf1be1
Add new state messages in the toolbar
7 years ago
yflory
6d080bcb45
Ability to export mediatag images in pad
7 years ago
yflory
a0dd867f33
Fix pending state not removed after friend invite rejected
7 years ago
yflory
c25be21138
Fix the upgrade button in the drive
7 years ago
Caleb James DeLisle
cc6b2192e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
515214aed1
Use present mode in embed code
7 years ago
yflory
201c974df6
Merge branch 'thumbnails' into staging
7 years ago
Caleb James DeLisle
81d0b3272d
Fix multiple infinite-spinner errors piling up on top of eachother
7 years ago
Caleb James DeLisle
9e4c48f537
lint errors
7 years ago
Caleb James DeLisle
a149152f11
Merge branch 'staging' into framework
7 years ago
yflory
4116d08dd1
Display thumbnails in the drive and then file picker
7 years ago
yflory
6920129126
Embed images from the drive in whiteboard
7 years ago
MacLemon
867b971c33
Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections.
7 years ago
yflory
2fd120100a
Merge branch 'wb' into staging
7 years ago
Caleb James DeLisle
15337603bb
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
854c1e94a4
make infinite spinner error message go away if ChainPad settles after it has been popped
7 years ago
yflory
6926d42292
Autoload template picker to make it faster to appear when used
7 years ago
yflory
1c8e1a36e8
Add file type in the pad attributes for existing files
7 years ago
yflory
b86f8e3f26
Fix uloaded files not moved to the correct folder in drive
7 years ago
Caleb James DeLisle
753e2d797e
Merge branch 'staging' into framework
7 years ago
yflory
62bc72847f
Add an error message when trying to tag a deleted pad
7 years ago
Caleb James DeLisle
c773b5d076
Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed
7 years ago
yflory
69dd3a60ab
Hide template and fileupload buttons for anonymous users
7 years ago
yflory
8e1f15e88d
Get title suggestion based on poll's description
7 years ago
yflory
95ad25973e
Ability to delete a stronger pad from readonly mode
7 years ago
yflory
b28c1537e8
Fix history in readonly mode
7 years ago
ansuz
f0bdc3b26f
second try
7 years ago
ansuz
d50a692986
add note about tags to prompt
7 years ago
Caleb James DeLisle
c8928a0811
Switch the transform function and also stop calling textPatcher without the metadata
7 years ago
yflory
035150614d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
484e216054
Fix hashtag button in the toolbar
7 years ago
ansuz
a12239405b
fix toolbar 'home link' to visit home page from drive
7 years ago
Caleb James DeLisle
828a685ba8
Fix broken browser fight logging
7 years ago
yflory
aa744567ed
Fix thumbnails in sframe apps
7 years ago
yflory
5e7bf0cfb8
Embed an image in whiteboard
7 years ago
Caleb James DeLisle
f0eb58ee95
Merge branch 'staging' into framework
7 years ago
yflory
1c7c37c121
Add the file class to pads in 'template' and 'recent' categories in the drive
7 years ago
yflory
ab3648a30a
Merge branch 'newpoll' into staging
7 years ago
ansuz
503111d26a
use recompiled media-tag
7 years ago
ansuz
427afc3954
override modified file name in pdfjs
7 years ago
ansuz
d85db64939
add tags from drive
7 years ago
Caleb James DeLisle
0aecfad854
Occasionally the language selector only says "Mode" rather than the language
7 years ago
ansuz
1f35798194
stop event propagation from tag prompt
7 years ago
Caleb James DeLisle
d9e97b86e6
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
383c2f54cb
1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.
7 years ago
yflory
26dfc65c25
Comments in polls
7 years ago
yflory
68bda92291
Use codemirror for description in poll
7 years ago
ansuz
b8ce149db6
add hint about tag usage
7 years ago
Caleb James DeLisle
d6570ad9f2
Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click.
7 years ago
yflory
5cf86bf74a
Update UI in poll and remove old code
7 years ago
ansuz
09c0a473e2
fix function signatures
7 years ago
yflory
3337689630
Wrong translation key in toolbar
7 years ago
yflory
126742a1c3
Fix bugs in sframe poll and update UI
7 years ago
ansuz
351b95d6a9
resolve merge conflicts
7 years ago
ansuz
6c7b135f91
lint compliance
7 years ago
ansuz
94c392b79f
secure messaging
7 years ago
Caleb James DeLisle
53f65f6a87
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
fa6938baa8
1. Migrated /slide/ to use framework
...
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
7 years ago
Caleb James DeLisle
1e5bc5da14
onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer
7 years ago
Caleb James DeLisle
12e82e80ec
When changing the title of a presentation, the title in the bottom of the slide should also change
7 years ago
ansuz
48c49e5a75
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
19e58cec94
prevent typeError
7 years ago
Caleb James DeLisle
f95acda758
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
7 years ago
Caleb James DeLisle
6dbc02e81a
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
1c791b5b51
Fix framework by removing some async and also fix media tags
7 years ago
Caleb James DeLisle
90d00c10b1
Make metadata-manager a bit more robust
7 years ago
yflory
8de1852ab9
Lint compliance
7 years ago
yflory
b4de31c827
Merge branch 'newdrive' into staging
7 years ago
Caleb James DeLisle
342b6012f7
manual merge of staging into framework
7 years ago
Caleb James DeLisle
cf6030ab8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
e62c5e1d07
Add some debugging lines to help synthesize error cases
7 years ago
yflory
345bfc1cea
Remove migration for pad attributes
7 years ago
ansuz
b3e066eaca
show loading screen tips during loading screen
7 years ago
Caleb James DeLisle
77fe6a9bba
small bug fixes
7 years ago
Caleb James DeLisle
1b01855dd2
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
1fd7a6e2b3
Mistake in mkEvent which makes all events only work once
7 years ago
Caleb James DeLisle
368a6b2406
manual merge, still wip
7 years ago
yflory
cdeac00633
Merge branch 'staging' into newdrive
7 years ago
yflory
a8eecee590
Fix access to undefined variable in drive
7 years ago
yflory
91e36171eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
138ad17e3e
Fix 'import local pads' in settings creating duplicates
7 years ago
yflory
d2f1d0c0e9
Fix readme pad not added at registration in sframe drive
7 years ago
Caleb James DeLisle
ae54cbca33
Refactor sframe-cpnf-inner to export chainpad
7 years ago
Caleb James DeLisle
44018ee7e1
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
7 years ago
Caleb James DeLisle
b15527565c
Allow passing arguments when firing events
7 years ago
Caleb James DeLisle
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
7 years ago
Caleb James DeLisle
d9845d3450
Refactor sframe-cpnf-inner to export chainpad
7 years ago
Caleb James DeLisle
f418ee9632
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
7 years ago
Caleb James DeLisle
72f03b2a47
Allow passing arguments when firing events
7 years ago
yflory
6aeb366767
Lint
7 years ago
yflory
0600ce59ec
Display the 'spinner' when typing in sframe apps
7 years ago
yflory
1d7683503f
Fix link origin in sframe upload table
7 years ago
yflory
92c808812a
Fix missing style in toolbar/less2
7 years ago
yflory
4049931924
Lint
7 years ago
yflory
c364377d7c
Use less2 in sframe drive
7 years ago
yflory
47fe7b1c53
Drive in sandboxed iframe
7 years ago
yflory
dfdeb7b113
Fix style and race condition for history mode
7 years ago
yflory
a810d7bd85
Fix style and race condition for history mode
7 years ago
yflory
456370b1aa
Base for Drive in sandboxed iframe
7 years ago
ansuz
95302366d1
lint compliance
7 years ago
ansuz
68f7d4bc0a
more conformant tagPrompt behaviour
7 years ago
ansuz
f990200996
drop any notion of crypto from sframe-listmap
7 years ago
ansuz
a1c124f1be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
c9223cb942
listmap does not care about 'readOnly' mode anymore
7 years ago
yflory
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
8a09e39f46
Enable tags in pads
7 years ago
ansuz
d2b27f3588
resolve merge conflicts
7 years ago
ansuz
4af01e6e9e
make listmap consume cpNfInner
7 years ago
yflory
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
732585ea7b
Sandboxed iframe for the whiteboard app
7 years ago
ansuz
d72146ba7f
use setAttribute for assigning attributes in hyperscript
7 years ago
yflory
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
7 years ago
yflory
1131ef0172
Fix language selection in sandboxed iframes
7 years ago
yflory
018f71df04
Add drop handlers for mediatags in ckeditor
7 years ago
ansuz
08e0ae424d
log errors in less compilation
7 years ago
ansuz
5b45e92250
delete range requests after they have completed
7 years ago
ansuz
47ce645897
implement slice
7 years ago
ansuz
6ed4f2fc64
fix a thing
7 years ago
ansuz
8a564bf350
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
513f8e73d4
refactor cryptpad.ready to use nthen
7 years ago
Caleb James DeLisle
b643ccc232
typo
7 years ago
Caleb James DeLisle
652c916690
change the command in the documentation so that it will not change itself
7 years ago
Caleb James DeLisle
845f75f8a7
remove a 100ms dead spot from page load
7 years ago
Caleb James DeLisle
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
7 years ago
Caleb James DeLisle
8a32b72ffc
1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released
...
2. change loading.js to use packaged css in order to get the loading screen up as quick as possible.
3. change LessLoader to cache less in cryptpadCache
7 years ago
ansuz
4d688289cc
lint-compliance
7 years ago
ansuz
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
47cfa0cf45
Focus the editable content when opening a codemirror pad
7 years ago
ansuz
f039fc7ff5
develop a system for avoiding z-index problems
7 years ago
yflory
bafa401473
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
fbd4be6135
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
ab64bf9e59
Use less2 for the loading screen
7 years ago
Caleb James DeLisle
710418f42f
Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
7 years ago
ansuz
a332168926
fix some bugs in prompts, alerts, confirms
7 years ago
ansuz
0db33d48fc
properly handle variable args in Cryptpad.alert
7 years ago
Caleb James DeLisle
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
789a923792
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
7 years ago
Caleb James DeLisle
d46cc8226d
Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs
7 years ago
ansuz
e1f090bb9d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
244e3ecba7
support forefront flag in alert config
7 years ago
Caleb James DeLisle
63cb5dfc1e
Make less loader rewrite urls to use version parameter
7 years ago
Caleb James DeLisle
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
e3c0ec29f7
Hopefully chase out a race in sframe-channel
7 years ago
yflory
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
437f50fd4a
Migrate the file to a sandboxed iframe
7 years ago
Caleb James DeLisle
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
7 years ago
yflory
7d720c73a9
Merge branch 'soon'
7 years ago
yflory
ddbda08c88
Fix an issue when cleaning the template category in the drive
7 years ago
ansuz
9d229b8868
lint compliance
7 years ago
ansuz
a87ccdc37e
remove redundant lines
7 years ago
ansuz
da0e31fa54
guard against possible type errors
7 years ago
ansuz
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
7 years ago
yflory
5a4836fe6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
79094aa4bb
Fix closing the title input when the title is not modified
7 years ago
ansuz
58c38dd77b
focus on the current window when you pop an alert
7 years ago
ansuz
b9545f45f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
306fec2d0e
improve messages for template picker confirm
7 years ago
ansuz
1943c83f69
clean up api for Cryptpad.confirm
7 years ago
Caleb James DeLisle
8d3ebdbaf7
I'm stupid
7 years ago
Caleb James DeLisle
041071e61c
manual merge
7 years ago
Caleb James DeLisle
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
7 years ago
yflory
304a8df808
Remove unneeded migration and fix attributes migration
7 years ago
ansuz
5a1abc8986
let's try using actual js syntax
7 years ago
ansuz
134c6057c1
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
7 years ago
ansuz
59d25b4c1a
use camel case, not snek case
7 years ago
ansuz
520b8967fd
allow people with short passwords to log in
7 years ago
yflory
5bf966633c
Merge branch 'staging' into slide2
7 years ago
yflory
514bff7065
Add slide number in the title in slide2
7 years ago
ansuz
0ed6846e07
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
b5b9f931c7
don't use common-realtime
7 years ago
ansuz
32e8c8ef4b
implement alertify without alertify
7 years ago
yflory
c3a07e879c
Merge branch 'staging' into slide2
7 years ago
yflory
fc069dac48
Ask the user before loading the template picker
7 years ago
yflory
05793c220c
Fix secure iframes on Edge
7 years ago
yflory
290d668ceb
Fix race condition preventing slide to work on Edge
7 years ago
ansuz
739903d511
don't check account usage if you aren't logged in
7 years ago
ansuz
bbf7ed3827
refactor drive to use dialog.selectable()
...
fix class on alertify-like boxes
7 years ago
yflory
f2aaaa9751
Move slide to secure iframe
7 years ago
ansuz
809b56625d
refactor ui elements
7 years ago
ansuz
bca9ba66cb
enforce a configurable minimum password length when registering
7 years ago
ansuz
fab6264ce6
use loading screen from pages.js
7 years ago
ansuz
e8298f165a
only display first letter of name if user has no avatar
7 years ago
ansuz
85003f7a23
lint compliance
7 years ago
ansuz
cca3c04d43
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
15e24ebe4f
ui for hashtag picker
7 years ago
ansuz
1b97996ef8
implement util.once
7 years ago
yflory
0423a5f4e2
Clean secure iframe code
7 years ago
yflory
04a04aef2b
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
7 years ago
yflory
61b228db79
Fix double / when storing a file
7 years ago
yflory
3ca9f41290
Get embed code for pad and code
7 years ago
yflory
0bb6698399
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
e85b34f127
Add embed options in the secure pad hashes
7 years ago
ansuz
b3d5e04bb4
lint compliance
7 years ago
ansuz
3d2a2da74e
add listAllTags api
7 years ago
ansuz
0e8a26e8eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
1c50bb3f61
clear hung tooltips
7 years ago
yflory
53eb9bb541
Remove the logo from the filepicker loading screen
7 years ago
yflory
729c013af7
Get mediatag embed code from the file app
7 years ago
yflory
4108520d20
Add contacts in the new menu if the user is logged in
7 years ago
yflory
78b338c379
Merge branch 'code2' into staging
7 years ago
yflory
db86a2dbee
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
7 years ago
yflory
d2787e3eff
Make code2 the default code app
7 years ago
ansuz
4069945bc4
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
7 years ago
ansuz
cd7b00d45b
make pixels 100px
7 years ago
ansuz
b1a1f4ba13
add encrypted thumbnails to metadata for images.
...
correct decryption logic
7 years ago
ansuz
b8e913c95a
more thumbnail methods
7 years ago
ansuz
ffbb21dd2c
use cryptpad-september build of media-tag
7 years ago
yflory
86e23ac19f
Use less2 in secure iframes
7 years ago
yflory
f12f4bb925
Integrate filepicker secure iframe in the code2 app
7 years ago
ansuz
1072e3e797
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
ae60b5845f
implement search-by-tag for filesData
7 years ago
ansuz
72ef730f23
implement tag-related functions
7 years ago
ansuz
0302c06d0e
send feedback if client does not support symbols
7 years ago
ansuz
52019dc763
make get and set pad attribute return only cloned data
7 years ago
yflory
89b7b644f3
Enable drag & upload in code2 and prepare filepicker
7 years ago
Caleb James DeLisle
e2719d9098
Add media-tag-nacl to cryptpad so it will be hosted on the server
7 years ago
yflory
885282ddea
Fix undefined friend
7 years ago
Caleb James DeLisle
a60709ff73
Infinite spinner popup leads to frame attempting to reload and failing
7 years ago
yflory
b8971cdc23
Add previewMode settings to code2
7 years ago
yflory
0d008aaa2e
Add indent settings to code2
7 years ago
yflory
f54dc7505c
Migrate indentation settings to a settings subobject
7 years ago
yflory
0893bcc0e5
Merge branch 'staging' into code2
7 years ago
yflory
f06683e949
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
0ce32464fd
Fix flickering avatar in firefox
7 years ago
ansuz
ba0e935add
stub localStorage, and handle errors that might come from touching localStorage
7 years ago
ansuz
be8ea4102e
keep trying to parse the hash until it works
7 years ago
yflory
a2ed266048
Move the code app in a secure iframe
7 years ago
ansuz
a34d1793e0
drop 'loading' text from loading screen
7 years ago
ansuz
181a19a9a0
polyfill for array.fill
7 years ago
yflory
51fa6287c1
Enable notifications in secure pads
7 years ago
yflory
642dc17910
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
901917983b
Fix an issue preventing pads to be stored in the drive
7 years ago
ansuz
8fb7fef3f5
regular expressions are never falsey
7 years ago
ansuz
24eac9b4a6
test for flakey tests
7 years ago
ansuz
7d2a76f4d6
delete dead code. fix off-by-one for messages. turn off history button when history is exhausted
7 years ago
ansuz
430a6f7b77
lint compliance
7 years ago
yflory
d9a4a32bf9
Fix avatar for anonymous users in secure pads
7 years ago
yflory
00fda0d7d7
Fix avatar in read-only mode (secure pads)
7 years ago
yflory
88cb4fd83c
Enable friend requests from secure pads
7 years ago
yflory
147d88d845
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
e43c68aa48
Fix viewers number in secure iframe
7 years ago
yflory
f89015d9ed
Update the tab title to match the pad title in pad2
7 years ago
ansuz
1280cd1659
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
51c065d13c
Fix link to main in the new toolbar
7 years ago
yflory
d9bf2abcd8
Fix old hashes not working anymore in pad
7 years ago
ansuz
536fe04790
emit notification when alert, confirm, or prompt are called
7 years ago
yflory
d4589c4699
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
6c65e5ff72
Fix the ghost icon in the drive and add missing text
7 years ago
ansuz
5c2b58e703
log error synchronously so we get a trace when pinPads has no callback
7 years ago
ansuz
841e3af8da
handle unfriends. clean up. better input validation
7 years ago
ansuz
c66a0c55e0
ensure that function signatures are correct
7 years ago
ansuz
91f6e3e543
remove a lot of dead code
7 years ago
ansuz
57d0c6c973
Merge branch 'new-messaging' into staging
7 years ago
ansuz
9e04d039d7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
22d754d514
handle user renames
7 years ago
Caleb James DeLisle
0a6f81850f
Handle infinite-spinner errors and properly inform the user
7 years ago
ansuz
f58d4c941f
clean up a bit
7 years ago
ansuz
b75a951a98
encode messages with 'author' field instead of 'channel'
7 years ago
Caleb James DeLisle
7bbea28831
minor anti-xss changes...
7 years ago
ansuz
013b75ae67
implement history range requests
7 years ago
ansuz
b71f1860db
make uid function reusable
7 years ago
Caleb James DeLisle
75fde58846
Well that was stupid... (fix bug introduced in acfaaa7d56
when trying to make jshint compliance)
7 years ago
Caleb James DeLisle
5d9599c9b7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
cbac5e417c
Make loading screen come much earlier on pad2
7 years ago
yflory
b6881349be
Fix an issue with the notifications in secure pads
7 years ago
yflory
ec64ac485d
Fix 'not a function' error
7 years ago
Caleb James DeLisle
acfaaa7d56
jshint compliance
7 years ago
Caleb James DeLisle
2ad9fcee17
Manual merge of notify.js
7 years ago
Caleb James DeLisle
8a9755611a
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
Caleb James DeLisle
2dacd57e76
fix caching on favicon
7 years ago
yflory
33025a9df9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
c33b128bf4
Enable feedback in pad2
7 years ago
yflory
e81bb3fe08
Fix profile link in the userlist
7 years ago
ansuz
002eed0d6f
make most of the messenger api async
7 years ago
Caleb James DeLisle
d9f5e3638e
Big caching improvements :D
7 years ago
yflory
b4864b96ac
Add a recent pads category in the drive
7 years ago
Caleb James DeLisle
4f3b4a30ee
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
Caleb James DeLisle
4b70fc9f49
Use resources from the original origin in pad2
7 years ago
yflory
aa9e0d3cd3
Enable AppConfig in pad2
7 years ago
yflory
f40d2c0b20
Add templates to pad2
7 years ago
yflory
8d020833af
Add missing file
7 years ago
yflory
8d837d22ea
Add history to pad2
7 years ago
yflory
b2e6df1f9d
Add import & export in pad2
7 years ago
yflory
e2d39de143
Forget button in pad2
7 years ago
yflory
e4020ba8d4
Fix pad creation in pad2
7 years ago
yflory
140c6f3776
Add limit warning in pad2
7 years ago
yflory
30aef71603
Enable avatars in pad2
7 years ago
yflory
f88a6f63fe
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
fb4808e1e1
Fix queries callback arguments
7 years ago
Caleb James DeLisle
6dd1643738
Manual merge work done on loading page to pad2
7 years ago
Caleb James DeLisle
8b702e0150
wip
7 years ago
yflory
e65b2f4e9f
Add shareButton to pad2
7 years ago
yflory
beb45740d0
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
90f892de9c
Useradmin menu, notifications and share button in pad2
7 years ago
ansuz
253ab68d8d
Merge branch 'staging' into new-messaging
7 years ago
Caleb James DeLisle
498c8229e9
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
7 years ago
ansuz
0693a98890
create a thumbnail when uploading images from whiteboard
7 years ago
ansuz
b17044ad98
add support for thumbnails in metadata
7 years ago
yflory
dd9b38066e
Change display name in useradmin menu
7 years ago
yflory
a96d447e8b
Add notifications in pad2
7 years ago
Caleb James DeLisle
cf6d8c83b2
Fix title setter logic and separate it from UI
7 years ago
Caleb James DeLisle
ec87f3f897
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
Caleb James DeLisle
415399ef64
Changes to support title change in metadata
7 years ago
yflory
d1affebd14
Title in pad2
7 years ago
yflory
604415b32c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
fab3d67b75
Enable title in pad2
7 years ago
Caleb James DeLisle
909bda4302
This should fix laxy metadata
7 years ago
ansuz
a4dbf39c4a
fix pdf display problems in chrome
7 years ago
Caleb James DeLisle
2490ee253f
Added setDisplayName RPC
7 years ago
yflory
887a26b1a6
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
Caleb James DeLisle
0b34ceb0eb
Added RPC setPadTitleInDrive()
7 years ago
ansuz
bed7d95bf3
use latest compiled cryptpad media-tag
7 years ago
ansuz
3a5526e247
infer pdfjs document title from iframe url
7 years ago
yflory
25466aa2f9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
1d237735ef
Useradmin menu in pad2
7 years ago
Caleb James DeLisle
3b5af3ea74
sframe common changes
7 years ago
yflory
d1157c4d72
Add missing file
7 years ago
yflory
d237c76f6c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
f5855a2870
Add account name in metadata manager
7 years ago
Caleb James DeLisle
3c0197cbf4
Firefox fails to boot the iframe if there is no number on setInterval
7 years ago
yflory
d88704fb50
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
Caleb James DeLisle
a4850a7fcc
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
fc5bdd3bed
Add lazy metadata to fix parse errors in pad2
7 years ago
Caleb James DeLisle
ad9f2ff223
Made pad2 server more generic and easy to implement
7 years ago
ansuz
a125253cde
lint compliance
7 years ago
ansuz
290763d6c5
don't complain about bad realtime state just because you disconnected
7 years ago
yflory
226ef1fd00
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
fb512c8923
Toolbar in pad2
7 years ago
ansuz
3b20dcd435
add optional cache-busting to favicon
7 years ago
ansuz
ee874878dd
clear tooltips when the userlist is redrawn
7 years ago
ansuz
f207edfd28
handle errors when deriving keys. fix incorrect reference
7 years ago
Caleb James DeLisle
e04c0b89a1
manual merge of staging
7 years ago
ansuz
130b330ede
refactor messaging
7 years ago
ansuz
736288a85b
lint compliance
7 years ago
ansuz
5037f444e9
update markdown sanitization strategy
7 years ago
Caleb James DeLisle
878a565f89
tiny little performance improvement in something that really doesn't need it
7 years ago
Caleb James DeLisle
7a698d092e
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
7 years ago
Pierre Bondoerffer
17b986a6ca
fix toolbar drive link (oops)
7 years ago
ansuz
284124a32d
WIP
7 years ago
Caleb James DeLisle
4acd9957a9
Set the url if there is none
7 years ago
Caleb James DeLisle
33e73dd5e5
fixed one last fight
7 years ago
Caleb James DeLisle
9c0b0cc6a8
Merge branch 'staging' into pad2
7 years ago
Caleb James DeLisle
1e56fa31c0
yay, they talk and they don't fight
7 years ago
ansuz
1c526feffb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
b3d349bf80
Merge branch 'staging' into pad2
7 years ago
Caleb James DeLisle
8efac4e661
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
Caleb James DeLisle
0dde1d7507
wip
7 years ago
Pierre Bondoerffer
baf64114a6
point to homepage in drive
7 years ago
Caleb James DeLisle
c304071492
wip
7 years ago
Caleb James DeLisle
e49a42db18
Merge branch 'staging' into pad2
7 years ago
Caleb James DeLisle
1f9bd866c3
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
Pierre Bondoerffer
edad5deeac
fix logo not showing sometimes in chrome
7 years ago
Caleb James DeLisle
52565076b9
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
Caleb James DeLisle
4b25ab80d6
wip
7 years ago
ansuz
844967a880
continued refactoring
7 years ago
Pierre Bondoerffer
a4aeada585
make the file dialog placeholder visible, center file list
7 years ago
Pierre Bondoerffer
e08ed72653
generate the tooltip after the button
7 years ago