db4c3e7e2c
Merge branch 'master' into staging
7 years ago
b5b84f540e
fix preview mode class
7 years ago
72f0952835
Make sure we can't open a pad using the wrong app
7 years ago
483160a96a
Fix tab notifications in code and slides
7 years ago
1131ef0172
Fix language selection in sandboxed iframes
7 years ago
0a656ca8d6
Fix the splitter in code and add it back
7 years ago
5f0383ae99
update version of sframe-boot because it was changed
7 years ago
47cfa0cf45
Focus the editable content when opening a codemirror pad
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
671c893e8a
Duplicating code like a moron, this should hopefully get fixed later.
7 years ago
9271b0c1a8
Try to fix half-codemirror bug
7 years ago
55fe882f64
Fix readonly mode in code
7 years ago
bd422178c4
Hide the filepicker button in readonly mode
7 years ago
f2aaaa9751
Move slide to secure iframe
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
204e45dfae
Enable templates in pad
7 years ago
d2787e3eff
Make code2 the default code app
7 years ago
0d008aaa2e
Add indent settings to code2
7 years ago
595fa4c2e4
Merge branch 'soon'
7 years ago
a99eb9365e
correctly set indentation preferences when changing languages
7 years ago
b081603455
Update requirejs
7 years ago
e7ef1e1c2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
7c49ca6e3f
Fix initial text size in code
7 years ago
2a8abc2699
comment out splitter code
7 years ago
66cacf08da
allow users to write with tabs instead of spaces
7 years ago
c8d7675ede
remove z-index on splitter in code
7 years ago
1c526feffb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
fbb880f277
implement customizable indentation widths
7 years ago
9dce40f3af
only add the splitter once
7 years ago
4026994310
make splitter work when scrolling
7 years ago
d47e26efd5
add margin in code
7 years ago
85e383d5c5
add invisible splitter
7 years ago
d15280c6ce
prevent pdfs from being huge
7 years ago
c427f375dd
add bootstrap css to /code for image uploader
7 years ago
66d81429bd
integrate file embed into code editor
7 years ago
fe826133b3
make some markdown styles reusable
7 years ago
c33d2a2db0
New tooltips
8 years ago
5d5f936682
Hide the upload table in code
8 years ago
e732284845
Lint
8 years ago
8f5a244999
Replace mediatag markdown syntax by html. Enable file upload in /code.
8 years ago
9f6ecea5d9
fix nacl reference error in media tag
8 years ago
ac8da0d52d
load codemirror in the correct context. fix selection events
8 years ago
f09ae9b19c
jshint compliance
8 years ago
5694505719
Fix syntax highlighting
8 years ago
b9320e6005
Toolbar improvements
8 years ago
7a5c5ce0a3
load scripts asynchronously
8 years ago
fca1ef4d36
hide unstyled content until the loading screen is displayed
8 years ago
7de2683169
make all apps use clientside templates
8 years ago
e9bfaa9a60
compile less clientside. remove compiled css
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
92b6e60573
Small improvements for the new toolbar
8 years ago
19cb920a7c
Don't redraw a media-tag everytime the content has changed
8 years ago
d1f4617419
Fix a race condition causing the preview part to be empty
8 years ago
5d6a0dcc1b
Fix width transition when dragging preview
8 years ago
ec9a4dec5e
Merge branch 'soon' into staging
8 years ago
77d4ffba86
animate preview mode sidebar
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
cf658c1b3a
backport live changes
8 years ago
a04f179d8b
hide preview mode on phones
8 years ago
dc2b0ae6b4
jshint compliance
8 years ago
b32c329269
remember whether you were using preview mode for a pad
8 years ago
a5ffd278a7
write styles for code in .less
8 years ago
3803f6a20f
only render preview if preview container is visible
8 years ago
617e027f12
catch markdown preview errors
8 years ago
c5bb830757
don't preview if hightlight mode is not markdown
8 years ago
378bf2aa94
yflory's word wrap fix
8 years ago
dc80b6b11f
throttle markdown preview
8 years ago
97cc4a6d54
add styling for tables in markdown preview
8 years ago
6faca87e73
set preview content in read only mode
8 years ago
0a54f0cf2d
better alignment of preview and code entry
8 years ago
620f4dc512
Add translations for the markdown preview button title
8 years ago
0bd4caeb7e
Add the task list code to the markdown renderer
8 years ago
56bcdff890
Add a preview of the markdown content in the code editor
8 years ago
c00158d23a
Move code to common-history
8 years ago
50c8a859e6
Move the CodeMirror cursor code to common-codemirror
8 years ago
c79a6e3b2b
Move Metadata, CodeMirror and title functions in separate files
8 years ago
63710e1ccc
Move the code related to the title in another file
8 years ago
5a883d5a57
Use the new toolbar and move the userlist code in a separate file
8 years ago
6847906ac9
Move the userlist code in a separate file
8 years ago
a0c420af8e
jshint compliance
8 years ago
a190c99426
Toolbar refactoring
8 years ago
bf7c7c45d0
Add the storage limit warning in the toolbar
8 years ago
f7e96b4e8c
resolve merge conflicts and jquery errors
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
43c045721c
Get the channel history
8 years ago
50277cb0ae
don't rely on 'info' in onRemote so we can call it anywhere
8 years ago
2ad0a65b71
Remove shortcuts that override browser actions
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
a8ffac5dcd
Remove old code
8 years ago
912215185f
add uid to userdata for better notifications
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
459b18c97b
Add the loading screen in the HTML so that it is displayed before JS is loaded
8 years ago
cb88227e2b
Autocomplete on key press in some dropdown menus
8 years ago
2a1b241592
Display a button to open the editing link while in read-only mode if we know it
8 years ago
868161a8a8
fix undefined reference in code
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
86adfbf27d
update cache-busting directive in all supported apps
8 years ago
2ad9debe58
Remove the placeholders in /code and /slide
8 years ago
e15a6a347f
Fix the forget pad button
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
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
914c442615
Do not redirect to home page when logging out from another tab
8 years ago
367a02c031
Add mobile support for the code app
8 years ago
7e7d1f7a16
Display the error when opening a document with the wrong app
8 years ago
7d6e15e465
Throw an error when trying to open a document with the wrong app
8 years ago
fbbf8a2829
Replace initialState by a placeholder in slide and code
8 years ago
a4286f1c83
Merge branch 'soon' into newtoolbar
8 years ago
ce1e792419
Merge branch 'soon' into newtoolbar
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
efdae19f0c
Update the lists in the code and slide toolbars to use the new dropdown
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
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
605072cfbf
Fix empty title with new documents
8 years ago
4963c77b61
Fix the title reset bug
8 years ago
1e70af0c16
Use the same network for the apps and the file store
8 years ago
f020fd5a75
remove /customize/pad.js from main apps
8 years ago
e9376a66c2
apply 'cp' class for unified styles
8 years ago
87abfff66b
Fix Flash Of Unstyled Content (fouc)
8 years ago
dd46b9425a
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
5bc7766f44
Use a consistent toolbar across all apps
8 years ago
f36d15d0db
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
319ce5d8c8
Fix the code app
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
a23b3d3517
use new ot in code too
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
e77ad4e909
better fixes for export
8 years ago
75dd4a5926
slightly better test for variable
8 years ago
b7d9998b9b
fix reference to undefined variable
8 years ago
303c65f2c3
use replaceState if available, instead of setting the hash
8 years ago
5f6ebb5cc1
fix incorrect regex for c-like title detection
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
c858b247c1
filter absent users from the userlist
8 years ago
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
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
a28daf2715
use websocket url configuration api
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
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
391728ee6d
Use CodeMirror in /slide #2
...
Fix title errors in the slide app caused by the present mode
8 years ago
8c33218ceb
Move the codemirror themes in /common
8 years ago
b5b0eacebc
Remove the old (non-bower) codemirror
8 years ago
261d2fecbc
Get codemirror from bower and use that version in the code app
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
a266f0bee1
query parameter for messages
8 years ago
c16e8d603b
Enable reconnecting websocket in code pad
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
99004428d5
Enable the read-only mode in Cryptpoll
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
83705ae058
Improve the UI in read-only mode
8 years ago
2d42cadb23
push /code/ 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
6363d3fb90
Pad titles are now shared with the userdoc
8 years ago
25c8d16bf5
Use a new version-prefixed hash parser
8 years ago
da6e5d73d0
fix undefined reference
9 years ago
043041523f
on import, fall back to setting language from file extension
9 years ago
deb63d2447
share syntax highlighting selection with peers
9 years ago
fd0a7337a3
wait a full minute until requirejs times out
9 years ago
975bff5794
show a spinner until the document has loaded
9 years ago
a58f58535b
better regex for pulling titles out of c-like comments
9 years ago
600f3151e9
don't use the store until it's ready to be used
9 years ago
9b16d529ca
add one more missing script that caused handlebar highlighting to break
9 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
9 years ago
efd190beca
export file with correct file extension, if possible
9 years ago
5e71a5473c
add another missing script
9 years ago
992bc4f449
add missing script
9 years ago
ansuz