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 |