ansuz
|
ee6c2097f5
|
resolve merge conflicts
|
7 years ago |
|
yflory
|
80803ad076
|
Fix empty codemirror after thumbnail creation
|
7 years ago |
|
yflory
|
fd258fc277
|
Fix preview button tooltip in code
|
7 years ago |
|
yflory
|
7cfe64fc5b
|
Remove cryptpad-common dependency for some inner apps
|
7 years ago |
|
yflory
|
30c8c253dd
|
Remove util and hash from common
|
7 years ago |
|
Caleb James DeLisle
|
75130150d5
|
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
|
7 years ago |
|
yflory
|
9060464f37
|
Create thumbnails only when the tab is not focused
|
7 years ago |
|
yflory
|
8de9a596f1
|
Fix cursor in thumbnails
|
7 years ago |
|
yflory
|
6f020b67ca
|
Add thumbnails to framework apps
|
7 years ago |
|
yflory
|
f4adbd980e
|
Thumbnails for the code app
|
7 years ago |
|
yflory
|
f43606f71d
|
Present mode to display only the parsed markdown in code
|
7 years ago |
|
Caleb James DeLisle
|
ae87320408
|
Preview pane cannot be resized after it has been hidden and then shown again
|
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 |
|
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
|
f95acda758
|
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
|
7 years ago |
|
yflory
|
cdeac00633
|
Merge branch 'staging' into newdrive
|
7 years ago |
|
yflory
|
b871faffc9
|
Enable tags in code and slide
|
7 years ago |
|
yflory
|
456370b1aa
|
Base for Drive in sandboxed iframe
|
7 years ago |
|
ansuz
|
db4c3e7e2c
|
Merge branch 'master' into staging
|
7 years ago |
|
ansuz
|
b5b84f540e
|
fix preview mode class
|
7 years ago |
|
yflory
|
72f0952835
|
Make sure we can't open a pad using the wrong app
|
7 years ago |
|
yflory
|
483160a96a
|
Fix tab notifications in code and slides
|
7 years ago |
|
yflory
|
1131ef0172
|
Fix language selection in sandboxed iframes
|
7 years ago |
|
yflory
|
0a656ca8d6
|
Fix the splitter in code and add it back
|
7 years ago |
|
Caleb James DeLisle
|
5f0383ae99
|
update version of sframe-boot because it was changed
|
7 years ago |
|
yflory
|
47cfa0cf45
|
Focus the editable content when opening a codemirror pad
|
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 |
|
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
|
671c893e8a
|
Duplicating code like a moron, this should hopefully get fixed later.
|
7 years ago |
|
yflory
|
9271b0c1a8
|
Try to fix half-codemirror bug
|
7 years ago |
|
yflory
|
55fe882f64
|
Fix readonly mode in code
|
7 years ago |
|
yflory
|
bd422178c4
|
Hide the filepicker button in readonly mode
|
7 years ago |
|
yflory
|
f2aaaa9751
|
Move slide to secure iframe
|
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
|
204e45dfae
|
Enable templates in pad
|
7 years ago |
|
yflory
|
d2787e3eff
|
Make code2 the default code app
|
7 years ago |
|
yflory
|
0d008aaa2e
|
Add indent settings to code2
|
7 years ago |
|
ansuz
|
595fa4c2e4
|
Merge branch 'soon'
|
7 years ago |
|
ansuz
|
a99eb9365e
|
correctly set indentation preferences when changing languages
|
7 years ago |
|
Caleb James DeLisle
|
b081603455
|
Update requirejs
|
7 years ago |
|
yflory
|
e7ef1e1c2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
7c49ca6e3f
|
Fix initial text size in code
|
7 years ago |
|
ansuz
|
2a8abc2699
|
comment out splitter code
|
7 years ago |
|
ansuz
|
66cacf08da
|
allow users to write with tabs instead of spaces
|
7 years ago |
|
Pierre Bondoerffer
|
c8d7675ede
|
remove z-index on splitter in code
|
7 years ago |
|
ansuz
|
1c526feffb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
fbb880f277
|
implement customizable indentation widths
|
7 years ago |
|
Pierre Bondoerffer
|
9dce40f3af
|
only add the splitter once
|
7 years ago |
|
Pierre Bondoerffer
|
4026994310
|
make splitter work when scrolling
|
7 years ago |
|
Pierre Bondoerffer
|
d47e26efd5
|
add margin in code
|
7 years ago |
|
Pierre Bondoerffer
|
85e383d5c5
|
add invisible splitter
|
7 years ago |
|
Pierre Bondoerffer
|
d15280c6ce
|
prevent pdfs from being huge
|
7 years ago |
|
Pierre Bondoerffer
|
c427f375dd
|
add bootstrap css to /code for image uploader
|
7 years ago |
|
ansuz
|
66d81429bd
|
integrate file embed into code editor
|
7 years ago |
|
ansuz
|
fe826133b3
|
make some markdown styles reusable
|
7 years ago |
|
yflory
|
c33d2a2db0
|
New tooltips
|
7 years ago |
|
yflory
|
5d5f936682
|
Hide the upload table in code
|
7 years ago |
|
yflory
|
e732284845
|
Lint
|
7 years ago |
|
yflory
|
8f5a244999
|
Replace mediatag markdown syntax by html. Enable file upload in /code.
|
7 years ago |
|
ansuz
|
9f6ecea5d9
|
fix nacl reference error in media tag
|
8 years ago |
|
ansuz
|
ac8da0d52d
|
load codemirror in the correct context. fix selection events
|
8 years ago |
|
ansuz
|
f09ae9b19c
|
jshint compliance
|
8 years ago |
|
yflory
|
5694505719
|
Fix syntax highlighting
|
8 years ago |
|
yflory
|
b9320e6005
|
Toolbar improvements
|
8 years ago |
|
ansuz
|
7a5c5ce0a3
|
load scripts asynchronously
|
8 years ago |
|
ansuz
|
fca1ef4d36
|
hide unstyled content until the loading screen is displayed
|
8 years ago |
|
ansuz
|
7de2683169
|
make all apps use clientside templates
|
8 years ago |
|
ansuz
|
e9bfaa9a60
|
compile less clientside. remove compiled css
|
8 years ago |
|
yflory
|
a11befaa0f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
13288ee18b
|
Update the userlist in code, slide and pad
|
8 years ago |
|
ansuz
|
852c028822
|
don't allow editing if pad type is wrong
|
8 years ago |
|
yflory
|
92b6e60573
|
Small improvements for the new toolbar
|
8 years ago |
|
yflory
|
19cb920a7c
|
Don't redraw a media-tag everytime the content has changed
|
8 years ago |
|
yflory
|
d1f4617419
|
Fix a race condition causing the preview part to be empty
|
8 years ago |
|
yflory
|
5d6a0dcc1b
|
Fix width transition when dragging preview
|
8 years ago |
|
ansuz
|
ec9a4dec5e
|
Merge branch 'soon' into staging
|
8 years ago |
|
ansuz
|
77d4ffba86
|
animate preview mode sidebar
|
8 years ago |
|
ansuz
|
76c530037b
|
enable donate button in all apps
|
8 years ago |
|
ansuz
|
99a44f119f
|
don't send referrer headers on pads which may link outward
|
8 years ago |
|
ansuz
|
1240b864ef
|
fix misconfigured history
|
8 years ago |
|
ansuz
|
cf658c1b3a
|
backport live changes
|
8 years ago |
|
ansuz
|
a04f179d8b
|
hide preview mode on phones
|
8 years ago |
|
ansuz
|
dc2b0ae6b4
|
jshint compliance
|
8 years ago |
|
ansuz
|
b32c329269
|
remember whether you were using preview mode for a pad
|
8 years ago |
|
ansuz
|
a5ffd278a7
|
write styles for code in .less
|
8 years ago |
|
ansuz
|
3803f6a20f
|
only render preview if preview container is visible
|
8 years ago |
|
ansuz
|
617e027f12
|
catch markdown preview errors
|
8 years ago |
|
ansuz
|
c5bb830757
|
don't preview if hightlight mode is not markdown
|
8 years ago |
|
ansuz
|
378bf2aa94
|
yflory's word wrap fix
|
8 years ago |
|
ansuz
|
dc80b6b11f
|
throttle markdown preview
|
8 years ago |
|
ansuz
|
97cc4a6d54
|
add styling for tables in markdown preview
|
8 years ago |
|
ansuz
|
6faca87e73
|
set preview content in read only mode
|
8 years ago |
|
ansuz
|
0a54f0cf2d
|
better alignment of preview and code entry
|
8 years ago |
|
yflory
|
620f4dc512
|
Add translations for the markdown preview button title
|
8 years ago |
|
yflory
|
0bd4caeb7e
|
Add the task list code to the markdown renderer
|
8 years ago |
|
yflory
|
56bcdff890
|
Add a preview of the markdown content in the code editor
|
8 years ago |
|
yflory
|
c00158d23a
|
Move code to common-history
|
8 years ago |
|
yflory
|
50c8a859e6
|
Move the CodeMirror cursor code to common-codemirror
|
8 years ago |
|
yflory
|
c79a6e3b2b
|
Move Metadata, CodeMirror and title functions in separate files
|
8 years ago |
|
yflory
|
63710e1ccc
|
Move the code related to the title in another file
|
8 years ago |
|
yflory
|
5a883d5a57
|
Use the new toolbar and move the userlist code in a separate file
|
8 years ago |
|
yflory
|
6847906ac9
|
Move the userlist code in a separate file
|
8 years ago |
|
ansuz
|
a0c420af8e
|
jshint compliance
|
8 years ago |
|
yflory
|
a190c99426
|
Toolbar refactoring
|
8 years ago |
|
yflory
|
bf7c7c45d0
|
Add the storage limit warning in the toolbar
|
8 years ago |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
8 years ago |
|
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
8 years ago |
|
Caleb James DeLisle
|
c341fa8e94
|
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
|
8 years ago |
|
yflory
|
43c045721c
|
Get the channel history
|
8 years ago |
|
ansuz
|
50277cb0ae
|
don't rely on 'info' in onRemote so we can call it anywhere
|
8 years ago |
|
yflory
|
2ad0a65b71
|
Remove shortcuts that override browser actions
|
8 years ago |
|
ansuz
|
df4a250359
|
use feedback api instead of app=
|
8 years ago |
|
yflory
|
84d8615cf1
|
Save and use templates in pad, code and slides
|
8 years ago |
|
ansuz
|
233bb7a14f
|
reorganize some html tags for smaller diffs
|
8 years ago |
|
yflory
|
71c59d7ae2
|
Remove unnecessary TODOs
|
8 years ago |
|
yflory
|
a8ffac5dcd
|
Remove old code
|
8 years ago |
|
ansuz
|
912215185f
|
add uid to userdata for better notifications
|
8 years ago |
|
yflory
|
15e9af77bb
|
Remove the langauge selector from toolbar and add it in settings
|
8 years ago |
|
yflory
|
a286599f93
|
Fix fast reconnect, and add support for reconnecting ws in polls
|
8 years ago |
|
yflory
|
459b18c97b
|
Add the loading screen in the HTML so that it is displayed before JS is loaded
|
8 years ago |
|
yflory
|
cb88227e2b
|
Autocomplete on key press in some dropdown menus
|
8 years ago |
|
yflory
|
2a1b241592
|
Display a button to open the editing link while in read-only mode if we know it
|
8 years ago |
|
ansuz
|
868161a8a8
|
fix undefined reference in code
|
8 years ago |
|
Caleb James DeLisle
|
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 |
|
ansuz
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
8 years ago |
|
ansuz
|
86adfbf27d
|
update cache-busting directive in all supported apps
|
8 years ago |
|
yflory
|
2ad9debe58
|
Remove the placeholders in /code and /slide
|
8 years ago |
|
yflory
|
e15a6a347f
|
Fix the forget pad button
|
8 years ago |
|
yflory
|
c72bbd4c37
|
Use the file name as initial title
|
8 years ago |
|
yflory
|
47b8fefd9e
|
Load messages.js only once, in cryptpad-common
|
8 years ago |
|
yflory
|
c17f28e5fe
|
Fix race condition #2
|
8 years ago |
|
ansuz
|
8167ed9048
|
implement cache-busting everywhere
|
8 years ago |
|
yflory
|
e4dbe97d71
|
Update display name in realtime across tabs and remember 'anonymous' name
|
8 years ago |
|
yflory
|
2851ceb95a
|
Merge branch 'soon' into staging
|
8 years ago |
|
ansuz
|
a995df25f6
|
disable new OT in pad and code app
|
8 years ago |
|
yflory
|
d54262c8df
|
Use the same disconnecter error translation key for all the apps
|
8 years ago |
|
yflory
|
914c442615
|
Do not redirect to home page when logging out from another tab
|
8 years ago |
|
yflory
|
367a02c031
|
Add mobile support for the code app
|
8 years ago |
|
yflory
|
7e7d1f7a16
|
Display the error when opening a document with the wrong app
|
8 years ago |
|
yflory
|
7d6e15e465
|
Throw an error when trying to open a document with the wrong app
|
8 years ago |
|
yflory
|
fbbf8a2829
|
Replace initialState by a placeholder in slide and code
|
8 years ago |
|
yflory
|
a4286f1c83
|
Merge branch 'soon' into newtoolbar
|
8 years ago |
|
yflory
|
ce1e792419
|
Merge branch 'soon' into newtoolbar
|
8 years ago |
|
yflory
|
f8455875a9
|
Fix the NoScript (iframe not loaded) bug with inner iframes
|
8 years ago |
|
yflory
|
1e1bfd275c
|
Don't show the tab notification when someone has joined the pad
|
8 years ago |
|
yflory
|
efdae19f0c
|
Update the lists in the code and slide toolbars to use the new dropdown
|
8 years ago |
|
yflory
|
88d5b4cc9c
|
Add a 'New pad' button in the toolbar
|
8 years ago |
|
yflory
|
a9063e0459
|
Reload all tabs when the user logs in or out
|
8 years ago |
|
yflory
|
767ba8b549
|
Select what we want to display in the toolbar
|
8 years ago |
|
yflory
|
2afdc11327
|
Replace the username button by a dropdown menu
|
8 years ago |
|
yflory
|
605072cfbf
|
Fix empty title with new documents
|
8 years ago |
|
yflory
|
4963c77b61
|
Fix the title reset bug
|
8 years ago |
|
yflory
|
1e70af0c16
|
Use the same network for the apps and the file store
|
8 years ago |
|
ansuz
|
f020fd5a75
|
remove /customize/pad.js from main apps
|
8 years ago |
|
ansuz
|
e9376a66c2
|
apply 'cp' class for unified styles
|
8 years ago |
|
yflory
|
87abfff66b
|
Fix Flash Of Unstyled Content (fouc)
|
8 years ago |
|
ansuz
|
dd46b9425a
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
8 years ago |
|
yflory
|
5bc7766f44
|
Use a consistent toolbar across all apps
|
8 years ago |
|
ansuz
|
f36d15d0db
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
8 years ago |
|
yflory
|
319ce5d8c8
|
Fix the code app
|
8 years ago |
|
yflory
|
ee56f5608f
|
Fix the infinite spinner bug with the file manager store
|
8 years ago |
|
yflory
|
05fd6c1563
|
Fix the infinite spinner problem
|
8 years ago |
|
ansuz
|
a23b3d3517
|
use new ot in code too
|
8 years ago |
|
ansuz
|
4c5cb79c20
|
Merge pull request #58 from xwiki-labs/replaceState
use replaceState if available
|
8 years ago |
|
ansuz
|
c2770a7a74
|
set correct hash even if browser does not implement replaceState
|
8 years ago |
|
ansuz
|
e77ad4e909
|
better fixes for export
|
8 years ago |
|
ansuz
|
75dd4a5926
|
slightly better test for variable
|
8 years ago |
|
ansuz
|
b7d9998b9b
|
fix reference to undefined variable
|
8 years ago |
|
ansuz
|
303c65f2c3
|
use replaceState if available, instead of setting the hash
|
8 years ago |
|
ansuz
|
5f6ebb5cc1
|
fix incorrect regex for c-like title detection
|
8 years ago |
|
yflory
|
ab1d3958ce
|
Add a pencil icon when hovering the title
|
8 years ago |
|
yflory
|
6d1e06cca3
|
Add notifications when a user joins or leaves the channel
|
8 years ago |
|
yflory
|
54a63267cd
|
Add a share button and merge the viewers and editors buttons
|
8 years ago |
|
yflory
|
87d86384ac
|
Fix broken elements in the new toolbar
|
8 years ago |
|
yflory
|
6351d1856f
|
Remove the top bar and move its content in the applications' toolbars
|
8 years ago |
|
ansuz
|
c858b247c1
|
filter absent users from the userlist
|
8 years ago |
|
Yann Flory
|
1e003b13a8
|
ask anonymous, first-time users to set their name when they first join a pad
|
8 years ago |
|
yflory
|
39bbf8a6c1
|
Fix the new userlist button and make the toolbar responsive
|
8 years ago |
|
yflory
|
24fbe22c9d
|
Improve the toolbar style and the way the userlist is displayed
|
8 years ago |
|
ansuz
|
a28daf2715
|
use websocket url configuration api
|
8 years ago |
|
ansuz
|
dbc8f01b8b
|
fix merge errors and reach full jshint compliance
|
8 years ago |
|
yflory
|
a30e17121d
|
Merge branch 'readonlyButton' into soon
|
8 years ago |
|
yflory
|
e84a54556c
|
Move the toolbar buttons' events handlers in cryptpad-common
|
8 years ago |
|
yflory
|
76fdadee7f
|
Store only the strongest hash in the localstorage
|
8 years ago |
|
yflory
|
17b4f91810
|
Do not share the title in the doc if it is the default title
|
8 years ago |
|
yflory
|
391728ee6d
|
Use CodeMirror in /slide #2
Fix title errors in the slide app caused by the present mode
|
8 years ago |
|
yflory
|
8c33218ceb
|
Move the codemirror themes in /common
|
8 years ago |
|
yflory
|
b5b0eacebc
|
Remove the old (non-bower) codemirror
|
8 years ago |
|
yflory
|
261d2fecbc
|
Get codemirror from bower and use that version in the code app
|
8 years ago |
|
yflory
|
bc73fa2074
|
Merge branch 'fontawesome' into soon
|
8 years ago |
|
yflory
|
f03018f3bc
|
Improve the top bar and use the font awesome icons in /code
|
8 years ago |
|
ansuz
|
a266f0bee1
|
query parameter for messages
|
8 years ago |
|
yflory
|
c16e8d603b
|
Enable reconnecting websocket in code pad
|
8 years ago |
|
yflory
|
79884e2400
|
Use the same username for all pads
|
8 years ago |
|
yflory
|
73d5ea967b
|
Fix an error created by the merge
|
8 years ago |
|
yflory
|
dde519795d
|
Merge branch 'newhash' into newhashNoConflict
|
8 years ago |
|
yflory
|
99004428d5
|
Enable the read-only mode in Cryptpoll
|
8 years ago |
|
yflory
|
47e8be1681
|
Remove the IMPORT button and editor toolbars in read-only mode
|
8 years ago |
|
ansuz
|
f29e3d7b0d
|
don't let notifications interfere with document titles
|
8 years ago |