41afc28802
Fix conflicts, clean the code, add migration from old mediatags
7 years ago
6a4f25bc9f
Test widget filters
7 years ago
fd89811479
Clean mediatag plugin
7 years ago
5eab39ad75
Tets mediatag plugin using widgets
7 years ago
5747e1a492
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
7 years ago
4288f536f1
Use requireCSS to load FontAwesome
7 years ago
01dd6953b9
Fix the previous fix...
7 years ago
c3f7b74baf
Fix CkEditor's toolbar initial state
7 years ago
442f15df98
Add help text in all the apps + french translation
7 years ago
7a70d69d8e
Hide editor toolbars by default when using a small screen
7 years ago
b0dba481d8
Fix small UI issues and IE issues
7 years ago
ee3b926e84
Get rid of ckeditor's reset_all class...
7 years ago
2c90cb5907
Move help button in drawer and fix drawer style
7 years ago
d975bb9cc0
Fix focus after pad creation screen
7 years ago
60b2384885
Move initial state into a help block
7 years ago
80df45f257
Get text from ckeditor
7 years ago
fb192a2c45
Add a configurable background color in the file app in view mode
7 years ago
c460e2820e
Fix a 1px offset for the userlist in Firefox/Windows
7 years ago
f329d65bc8
Ability to reduce the width of ckeditor
7 years ago
edc236e17b
Disable edition in pad read-only mode
7 years ago
c269929319
Fix creation page not displayed in pad and slide
7 years ago
617c4b6044
CSS refactorings and pad-is-not-pinned work
7 years ago
c702a23c77
Initial work on the 'pad will expire' logic
7 years ago
644f6e9985
Use the bounce app to open links from inner
7 years ago
812df7de6f
Merge branch 'merge-staging' into staging
7 years ago
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
7 years ago
2e00214783
drop unreachable code
7 years ago
ee6c2097f5
resolve merge conflicts
7 years ago
cf26c4c286
Improve the toolbar UI for smaller screens
7 years ago
7b62a8042e
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
7 years ago
75130150d5
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
7 years ago
e07bb0f7b3
roll back to old transform function, except in pad
7 years ago
8de9a596f1
Fix cursor in thumbnails
7 years ago
5dcfbd07ab
Merge branch 'theming-improvement' into staging
7 years ago
4933aafbc8
Added default values to avoid breaking existing themes.
7 years ago
735f0a7e30
Merge branch 'theming-improvement' into staging
7 years ago
83da9cf752
Moved colours to colortheme.less to enable theming
7 years ago
6f020b67ca
Add thumbnails to framework apps
7 years ago
c1d05a00ba
Improve media-tag export in pad to work with existing CSP
7 years ago
6d080bcb45
Ability to export mediatag images in pad
7 years ago
a6b34491fc
freeze the editor when reconnecting
7 years ago
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
36aee2d174
lets try normalizing the dom before applying a patch
7 years ago
9509d538e0
Cursor not being updated at the right times before applying a patch.
7 years ago
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
7230c780a1
Get rid of last usages of cryptpad-common in pad/inner
7 years ago
f95acda758
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
7 years ago
6dbc02e81a
Merge branch 'staging' into framework
7 years ago
1c791b5b51
Fix framework by removing some async and also fix media tags
7 years ago
b4de31c827
Merge branch 'newdrive' into staging
7 years ago
342b6012f7
manual merge of staging into framework
7 years ago
69014e5fde
Fix mediatags in pad not cached
7 years ago
77fe6a9bba
small bug fixes
7 years ago
368a6b2406
manual merge, still wip
7 years ago
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
7 years ago
456370b1aa
Base for Drive in sandboxed iframe
7 years ago
95542bcdaf
Lint
7 years ago
8a09e39f46
Enable tags in pads
7 years ago
72f0952835
Make sure we can't open a pad using the wrong app
7 years ago
a78b597ebb
lint errors
7 years ago
1131ef0172
Fix language selection in sandboxed iframes
7 years ago
018f71df04
Add drop handlers for mediatags in ckeditor
7 years ago
c00d295466
Add missing translations
7 years ago
974658453c
Mediatag integration in pads
7 years ago
5f0383ae99
update version of sframe-boot because it was changed
7 years ago
710418f42f
Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
7 years ago
789a923792
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
7 years ago
041071e61c
manual merge
7 years ago
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
7 years ago
8ef27dca08
Lint
7 years ago
757d0a2800
Save the state of CKEditor's toolbar (visible or hidden)
7 years ago
1ae7076790
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
7 years ago
0423a5f4e2
Clean secure iframe code
7 years ago
04a04aef2b
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
7 years ago
47ec959032
make sure contenteditable is not set in read only mode
7 years ago
6a735b441f
use paul's print styles
7 years ago
e7de9229a8
Do not print toolbar and collaboration ( #178 ).
...
paul
7 years ago
204e45dfae
Enable templates in pad
7 years ago
86e23ac19f
Use less2 in secure iframes
7 years ago
0d008aaa2e
Add indent settings to code2
7 years ago
0893bcc0e5
Merge branch 'staging' into code2
7 years ago
9a23b77b46
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
be8ea4102e
keep trying to parse the hash until it works
7 years ago
4db4f66786
Remove an unnecessary fix for Safari
7 years ago
a2ed266048
Move the code app in a secure iframe
7 years ago
1044531806
Fix Safari iframe size issue
7 years ago
51fa6287c1
Enable notifications in secure pads
7 years ago
40f062abda
restore app usage report in new pad
7 years ago
fe03e6ae83
bad code, lint
7 years ago
190dff1c9b
Use the bounce app for opening a link with the right click
7 years ago
0b4e044540
Fix the plugin to open a link in a new tab in pad
7 years ago
88cb4fd83c
Enable friend requests from secure pads
7 years ago
f89015d9ed
Update the tab title to match the pad title in pad2
7 years ago
056285a7b6
Move pad2 to pad and create bounce app
7 years ago
b081603455
Update requirejs
7 years ago
3315449114
Lets try this...
7 years ago
6b174934c8
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
7 years ago
725e19925c
Yeah, that was silly...
7 years ago
b0b1ed037c
Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
7 years ago
638a94785f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
7ca60e55a7
Lock the pad's inner-iframe down with CSP
7 years ago
5e6e76dfc1
make regex case insensitive
7 years ago
2cc6c636db
Add some missing titles
7 years ago
dc7db074e8
open pad links when clicking in readOnly mode
7 years ago
331b4dddea
Clean debugging code
7 years ago
c33d2a2db0
New tooltips
7 years ago
88813aee02
Show that only html can be imported in pads
7 years ago
7be1e249e1
add fa-share-alt to pad initialText
7 years ago
fa2d857d70
Fix css issues with Safari
8 years ago
5a3e9c785c
Fix ckeditor toolbar
8 years ago
ed0121d172
Lint errors
8 years ago
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
8 years ago
7a5c5ce0a3
load scripts asynchronously
8 years ago
5e56ad912e
remove the last bit of compiled css
8 years ago
cfc5907237
remove unnecessary style rules
8 years ago
7de2683169
make all apps use clientside templates
8 years ago
e9bfaa9a60
compile less clientside. remove compiled css
8 years ago
0d4d104e08
Mobile support for the new toolbar
8 years ago
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
13288ee18b
Update the userlist in code, slide and pad
8 years ago
852c028822
don't allow editing if pad type is wrong
8 years ago
8d956c3de6
New toolbar
8 years ago
b7a0547b77
New toolbar colors
8 years ago
59fb5bd8be
One toolbar color per app
8 years ago
5a248db267
Merge branch 'staging' into newCk
8 years ago
f13d23241c
Upgrade CkEditor to version 4.7
8 years ago
d5c7eb49a4
send feedback on toolbar hide and CKE buttons
8 years ago
376b60c21c
New toolbar temp
8 years ago
ec9a4dec5e
Merge branch 'soon' into staging
8 years ago
76c530037b
enable donate button in all apps
8 years ago
99a44f119f
don't send referrer headers on pads which may link outward
8 years ago
1240b864ef
fix misconfigured history
8 years ago
716245f864
Make all the buttons look the same
8 years ago
c00158d23a
Move code to common-history
8 years ago
ff16084719
Fix lint errors
8 years ago
c79a6e3b2b
Move Metadata, CodeMirror and title functions in separate files
8 years ago
5a883d5a57
Use the new toolbar and move the userlist code in a separate file
8 years ago
78b11584f8
remove unused variables
8 years ago
a165332c15
Don't store a pad in the drive if the limit has been reached
8 years ago
f7e96b4e8c
resolve merge conflicts and jquery errors
8 years ago
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
8 years ago
92ea03d7d9
View and restore the history of a pad
8 years ago
c341fa8e94
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
8 years ago
50277cb0ae
don't rely on 'info' in onRemote so we can call it anywhere
8 years ago
df4a250359
use feedback api instead of app=
8 years ago
84d8615cf1
Save and use templates in pad, code and slides
8 years ago
233bb7a14f
reorganize some html tags for smaller diffs
8 years ago
71c59d7ae2
Remove unnecessary TODOs
8 years ago
d92a875ce5
Translate the 'wrong application' error message
8 years ago
a8ffac5dcd
Remove old code
8 years ago
912215185f
add uid to userdata for better notifications
8 years ago
4a173e30dc
set user's cursor to either the beginning or end of the document
8 years ago
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
8 years ago
a286599f93
Fix fast reconnect, and add support for reconnecting ws in polls
8 years ago
6e733b1329
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
459b18c97b
Add the loading screen in the HTML so that it is displayed before JS is loaded
8 years ago
8a48612de2
add some notes for later
8 years ago
c04819538b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
fcb9848b3a
hide toolbar when in read-only mode
8 years ago
2a1b241592
Display a button to open the editing link while in read-only mode if we know it
8 years ago
91eda5fa83
Implement stronger content-security-policy except in /pad/ which does not allow it.
...
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
8 years ago
7db0e14bc0
add 'force' flag to override removal of html elements
8 years ago
412815b042
Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
8 years ago
11d54256da
Make sure the display name is displayed in the same way everywhere
8 years ago
639376f1cb
don't use hyperjson.toString
8 years ago
86adfbf27d
update cache-busting directive in all supported apps
8 years ago
8741b50f5b
Set the file name as default title if a pad is created from the drive
8 years ago
e38df7ce47
Fix creation of new pads in /pad
8 years ago
f8d653406a
Add the new content for the default pad and add french translation
8 years ago
d4bf7cf9aa
Send the initial state only if it is a new pad in /pad
8 years ago
fadddb297c
Readonly mode in /pad had contenteditable set to true
8 years ago
88b29e8bdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
5303e76ece
Make sure the content is correctly applied in onReady
8 years ago
cc829d51f8
jshint compliance
8 years ago
e15a6a347f
Fix the forget pad button
8 years ago
a0340f1419
Open link in a new tab in /pad
8 years ago
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
8 years ago
3d0e7cb9a7
pull ckeditor config out of main.js
8 years ago
c72bbd4c37
Use the file name as initial title
8 years ago
47b8fefd9e
Load messages.js only once, in cryptpad-common
8 years ago
c17f28e5fe
Fix race condition #2
8 years ago
8167ed9048
implement cache-busting everywhere
8 years ago
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
8 years ago
2851ceb95a
Merge branch 'soon' into staging
8 years ago
1232aa8a79
jshint compliance
8 years ago
a995df25f6
disable new OT in pad and code app
8 years ago
d54262c8df
Use the same disconnecter error translation key for all the apps
8 years ago
3af7c9cff8
Replace the expand/collapse ckeditor button by our own to save space
8 years ago
914c442615
Do not redirect to home page when logging out from another tab
8 years ago
02439e0f61
Improve the homepage with new images and translations
8 years ago
a4286f1c83
Merge branch 'soon' into newtoolbar
8 years ago
373b07ed28
Fix lint errors
8 years ago
ce1e792419
Merge branch 'soon' into newtoolbar
8 years ago
69fb8b4d2f
Merge branch 'master' into soon
8 years ago
f8455875a9
Fix the NoScript (iframe not loaded) bug with inner iframes
8 years ago
1e1bfd275c
Don't show the tab notification when someone has joined the pad
8 years ago
88d5b4cc9c
Add a 'New pad' button in the toolbar
8 years ago
a9063e0459
Reload all tabs when the user logs in or out
8 years ago
efed1f5efe
Add handlers to login and logout buttons
8 years ago
767ba8b549
Select what we want to display in the toolbar
8 years ago
2afdc11327
Replace the username button by a dropdown menu
8 years ago
4adde0f0c0
Use the new dropdown for userlist and share
8 years ago
b5acdb8cc0
Disable zooming on mobile
8 years ago
40985f1811
Dubious height setting for iOS
8 years ago
52d8d8db1d
Get rid of margins on mobile
8 years ago
cd0931c951
UI improvements for mobile browsers
8 years ago
605072cfbf
Fix empty title with new documents
8 years ago
4963c77b61
Fix the title reset bug
8 years ago
6c5e8d3118
Safari is really the best browser in the world, even though you have to stick a screwdriver in it to get it to start up
8 years ago
569ea21705
Replace the language selector by our custom dropdown menu
8 years ago
4278ac7637
Merge branch 'soon' into fileManager
8 years ago
b39067d2a1
jshint compliance
8 years ago
1c3f1a15cd
make sure that /pad is resized after loading
8 years ago
5b08fed7fa
Ability to add files from the drive toolbar
...
Fix CSS issues with the different toolbars
Translate the backup URL button alert
8 years ago
a3cd100c94
apply yflory's safari patch
8 years ago
1e70af0c16
Use the same network for the apps and the file store
8 years ago
b33661d9d5
don't toggle maximization state after setting
8 years ago
f020fd5a75
remove /customize/pad.js from main apps
8 years ago
e9376a66c2
apply 'cp' class for unified styles
8 years ago
1772cc93c8
Fix the taildoc bug
8 years ago
87abfff66b
Fix Flash Of Unstyled Content (fouc)
8 years ago
4aed585574
Fix style issues in the toolbar
8 years ago
8a7fda6341
Merge branch 'soon' into login
8 years ago
a220742f68
fix reversed color settings
8 years ago
308db7fa79
fix uncolored /pad/ content in IE
8 years ago
f36d15d0db
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
ee56f5608f
Fix the infinite spinner bug with the file manager store
8 years ago
05fd6c1563
Fix the infinite spinner problem
8 years ago
de0863e232
use new ot
8 years ago
4cd9bd5534
strip listeners
8 years ago
4c5cb79c20
Merge pull request #58 from xwiki-labs/replaceState
...
use replaceState if available
8 years ago
c2770a7a74
set correct hash even if browser does not implement replaceState
8 years ago
d009b7400c
fall back to default title if one is not suggested
8 years ago
303c65f2c3
use replaceState if available, instead of setting the hash
8 years ago
3de4e5709b
Clean the code
8 years ago
ab1d3958ce
Add a pencil icon when hovering the title
8 years ago
6d1e06cca3
Add notifications when a user joins or leaves the channel
8 years ago
54a63267cd
Add a share button and merge the viewers and editors buttons
8 years ago
87d86384ac
Fix broken elements in the new toolbar
8 years ago
6351d1856f
Remove the top bar and move its content in the applications' toolbars
8 years ago
3d74290c7d
Merge branch 'usability5' into staging
8 years ago
9e92a597b3
Ability to edit the title in the toolbar by clicking it
8 years ago
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
8 years ago
10bb5e1607
Add the title in the toolbar
8 years ago
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
8 years ago
46c5f64369
remove absent users from the userlist
8 years ago
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
8 years ago
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
8 years ago
e739c49e7f
Remove the 'about' button in ckeditor
8 years ago
dbc8f01b8b
fix merge errors and reach full jshint compliance
8 years ago
a30e17121d
Merge branch 'readonlyButton' into soon
8 years ago
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
8 years ago
2ac1b02572
Merge branch 'config-sockets' into soon
8 years ago
5e76194262
use new config api
8 years ago
76fdadee7f
Store only the strongest hash in the localstorage
8 years ago
17b4f91810
Do not share the title in the doc if it is the default title
8 years ago
bc73fa2074
Merge branch 'fontawesome' into soon
8 years ago
f03018f3bc
Improve the top bar and use the font awesome icons in /code
8 years ago
0be8c333e0
Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
8 years ago
3d54413343
Improve the UI with FontAwesome icons
8 years ago
a266f0bee1
query parameter for messages
8 years ago
d6525087c7
jshint compliancy
8 years ago
ed9acf1c00
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
8 years ago
a82b7aaf8b
allow empty names
8 years ago
79884e2400
Use the same username for all pads
8 years ago
73d5ea967b
Fix an error created by the merge
8 years ago
dde519795d
Merge branch 'newhash' into newhashNoConflict
8 years ago
47e8be1681
Remove the IMPORT button and editor toolbars in read-only mode
8 years ago
f29e3d7b0d
don't let notifications interfere with document titles
8 years ago
a9e2ca8d72
make tests green again
8 years ago
83705ae058
Improve the UI in read-only mode
8 years ago
e6785b4dad
push /pad/ state once ready to avoid OT collision
8 years ago
bf8c9a2c4b
Add a button to get the read only URL
8 years ago
99b50465c7
Add the read-only mode for /pad and /code
8 years ago
391b7690e6
Set the pad to readonly mode when using a 'view' url
8 years ago
368e253c9f
Ability to send a read-only URL
8 years ago
6363d3fb90
Pad titles are now shared with the userdoc
8 years ago
25c8d16bf5
Use a new version-prefixed hash parser
8 years ago
7c5ee53e81
resolve conflict and merge
8 years ago
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
c168ce2d1c
Ability to reconnect after a connection failure
8 years ago
e386749e89
unlock the editor after your name has been set (or not)
8 years ago
2d5caf38d9
show a spinner until the document has loaded
8 years ago
fd0a7337a3
wait a full minute until requirejs times out
8 years ago
600f3151e9
don't use the store until it's ready to be used
8 years ago
1f24d7126c
big ugly commit that will be really hard to audit
...
This changeset applies new styles to the poll.
it also uses the new asynchronous wrappers around the localStorage api.
this is necessary because we're migrating to a storage system that will
use an async api.
The changes to the poll just happened to coincide with the async stuff.
My apologies to anyone who wants to read this whole thing
8 years ago
4833cf0d7b
add a fontpicker
8 years ago
6cb2f72aa6
pretty print html during export if possible
8 years ago
fe3f02f5e0
enable text foreground and background colors
8 years ago
992bc4f449
add missing script
8 years ago
a995f2306d
fix undefined variable reference
8 years ago
44fe95c76b
add titles to buttons on pad and code
8 years ago
d39ab5c250
point to the actual translation file
8 years ago
3eccec7054
better effort for translation
8 years ago
18ce69b756
use constants from toolbar.js, address linter warnings
9 years ago
750731d3db
workaround for favicon magic
9 years ago
fd3cd73d0b
try to fix favicon bug
9 years ago
a2a8570453
use alertify UI in /pad/
9 years ago
85702f2706
inform users of changes in /pad/ too
9 years ago
6075849ed7
add favicons to /pad/ and /code/
9 years ago
yflory