0ef1c14d7f
Fix lint errors
8 years ago
fc760b4820
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a165332c15
Don't store a pad in the drive if the limit has been reached
8 years ago
e51c7f9cf0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e132ccf94a
prepare for upload
8 years ago
bf7c7c45d0
Add the storage limit warning in the toolbar
8 years ago
197b366712
Ability to drag&select in the drive
8 years ago
e2942f959b
add crypto for decrypting a chunked file
8 years ago
aedc46bdaf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a97e7223f1
implement getBlobPathFromHex
8 years ago
520dabe094
Remove the unsorted files category
8 years ago
f50aa5c29b
Move the mediatag viewer into a media app
8 years ago
6a8274518b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
9882a3a923
Add support for the file applicaiton in the drive
8 years ago
12898b3358
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
74bcec8b31
programming is hard okay
8 years ago
2a417ddae8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d985b144cc
Add a new hash version for the file viewer
8 years ago
3309087277
send feedback if isArray is not supported
8 years ago
f196b836db
fix undefined reference
8 years ago
48973bccd6
add tests to assert for hash parsing
8 years ago
5194677443
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c9c7d61ad1
Media tag viewer
8 years ago
729d1460b9
Merge branch 'master' into staging
8 years ago
a840fb9e85
add example hashes and start working on hash v2
8 years ago
d1fa68e30d
build UCF Media Tag
8 years ago
cc33c4abe9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a5ca461a73
update footer for new version
8 years ago
fdd51ec18d
Don't remove a folder moved into unsorted or into itself
8 years ago
4b95a1da48
unbreak assert/translations
8 years ago
4fdc5f897e
only feedback migration if user had legacy store
8 years ago
218f2ff76c
feedback when logging in or registering
8 years ago
4c3e842664
Fix focus issues with the history input in ckeditor
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
18e2e66b06
jshint compliance
8 years ago
92ea03d7d9
View and restore the history of a pad
8 years ago
4c0d7bf8e8
support multiple calls to cryptpad.ready
8 years ago
ec041c88e2
console.log when providing feedback
...
also notify server if a users browser does not support proxies
8 years ago
c51073f211
support batch getFileSize calls
8 years ago
1af621bfe5
Merge remote-tracking branch 'origin/auth' into staging
8 years ago
3afaf029cb
feedback about how often we migrate an old drive
8 years ago
0e8b55edc0
Added an authentication page to allow getting the user pubkey
8 years ago
df9c312b7d
make new text translateable
8 years ago
e8b053e48b
use bootloader in feedback.html
8 years ago
a6dbfcecf3
remove old/unused assertions
8 years ago
b658bda421
use bootloader to fix paths to jquery and json.sortify
8 years ago
347459781c
show the size of your files, if you're logged in
8 years ago
2b8579e8b7
add pretty-printers for byte-counts
8 years ago
2a25afae5f
Merge branch 'soon' into staging
8 years ago
e0ecf651e2
add a note about showing pinned file usage
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
da69c1822c
ask users to sign back if signing keys are missing
8 years ago
7a05462eb3
Some more poll changes <3
8 years ago
107e75b287
remove invalid semicolon
8 years ago
821c1a3ec6
annotate code which we hope to be able to deprecate in the future
8 years ago
43c045721c
Get the channel history
8 years ago
f6d6f81d55
send feedback when a user registers
8 years ago
deeb47c40b
reportAppUsage for settings
8 years ago
05785e96ea
small color change
8 years ago
5a83759ee2
add usage button to settings page
8 years ago
a27cc76fc0
uppercase LOL
8 years ago
402ce2db93
better validation of inputs
8 years ago
c7eae9675b
keep exporting isArray for backwards compatibility
...
but prevent internal use
8 years ago
fbebbf0dca
minor clean up
8 years ago
525d35c9ec
redefine alert
8 years ago
20c252e5c6
fix placeholder styling in safari
8 years ago
f694a81a5c
move more interface code out of cryptpad-common
8 years ago
a4157b9908
remove more unused functions
8 years ago
e10901edb2
begin to move interface code out of cryptpad-common
8 years ago
95789d3cbe
expose rpc for pinned usage
8 years ago
8f4dbcf4c6
remove getPadTitle
8 years ago
f42da4ecd8
move hashChannelList into common-hash.js
8 years ago
63960bd38c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
520ae822fc
correct undefined reference
8 years ago
50277cb0ae
don't rely on 'info' in onRemote so we can call it anywhere
8 years ago
bf047fcf65
Merge pull request #110 from pbondoer/newpoll
...
Fix flash of autocomplete in poll
8 years ago
96ff487271
fix flash of content
8 years ago
5a7eea08c8
Merge pull request #108 from pbondoer/newpoll
...
Poll fixes
8 years ago
248f88034b
important fixes
8 years ago
633d60ccd0
Remove a TODO
8 years ago
6b57bb2bbb
poll: press enter to validate input
8 years ago
d483e10e77
poll fixes
8 years ago
81d83897ec
Rename hash.js
8 years ago
2ad0a65b71
Remove shortcuts that override browser actions
8 years ago
ea5301be13
poll improved(tm)
8 years ago
7434dbcb0f
what i have
8 years ago
07705cd5c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
eb2a3c1bbf
Fix lint errors
8 years ago
607d9652f5
jshint compliance
8 years ago
3ba90332bb
Merge branch 'refactor' into staging
8 years ago
f11cf8e6ac
move poll styles to separate file
8 years ago
daabb0b3ad
Integrate and fix the new fileObject (userObject)
8 years ago
df4a250359
use feedback api instead of app=
8 years ago
86c37bfa37
fix find+replace error
8 years ago
e618483395
extract all code for encoding and decoding hashes
8 years ago
fdd2716ad5
move constants to the top of cryptpad-common.js
8 years ago
c1e0316d43
Refactor fileObject
8 years ago
5212539a16
move standalone functions from common into their own file
8 years ago
7437d6b902
remove unused function
8 years ago
4e590a9dd1
remove even more dead code
8 years ago
85fcaa9bbc
remove more dead code
8 years ago
401936a91e
move singly-used css file out of /common/
8 years ago
9a46b58c85
deprecate this 90 days after f-release
8 years ago
7a59183bb1
pinpad.create should always be async
8 years ago
8de3610532
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
9aa0548b1f
remove dead cursor code
8 years ago
4e61b79f9a
Clean fileObject
8 years ago
cde724399c
Pin the pads
8 years ago
74ea2fce5a
Fix lint error...
8 years ago
aa49c97d6e
Fix lint error
8 years ago
2c8d1b8183
jshint compliance
8 years ago
f0836f745e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
528deb11da
Add missing file for whiteboard
8 years ago
cde9ea9887
update footer version
8 years ago
05a50b1f4c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a14bb1480a
progress for implicit pinning
8 years ago
f82278a25c
handle return of undefined hash
8 years ago
d5e69653c0
Select opacity in draw mode in the canvas app
8 years ago
1d933be5a6
make reset return the hash, not an array with containing it
8 years ago
f34492be94
Remove duplicates uid in the user list
8 years ago
cfc5d634f4
Merge branch 'templates' into staging
8 years ago
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
8 years ago
63a130c678
Add a button to delete the selection in canvas
8 years ago
33e19d5918
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
126498585e
Add a context menu on the ROOT folder in the drive
8 years ago
be1db2a1ec
Ability to remove an object when draw mode is off
8 years ago
108ab7e9de
comment out a style assignment that doesn't seem necessary
8 years ago
8c629185e1
cleaner less file
8 years ago
0db141e48d
rename style files 'whiteboard' instead of main
8 years ago
395d8625a8
draw the palette on pad creation
8 years ago
3b99c42e22
no more inline styles
8 years ago
ef821c3e7e
integrate @lukevers improvements and clean up js a bit
8 years ago
84d8615cf1
Save and use templates in pad, code and slides
8 years ago
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
8 years ago
a70388284d
disable unnecessary messages
8 years ago
abd87e1322
jshint compliance
8 years ago
e4b15bc616
implement 'getCanonicalChannelList'
8 years ago
09f8e139fe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a2f692b9a3
clean up serverside and clientside pinning logic
8 years ago
a13261abaa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
dedf2b3c69
Display selected color and button to turn off draw mode in canvas
8 years ago
fdede0d1fd
remove some dead code
8 years ago
e87992c7ec
implement atomic pin reset rpc
8 years ago
166e70f628
test new rpc apis
8 years ago
2a566671f2
remove outdated rpc example
8 years ago
3380cf0348
implement getTotalSize rpc
8 years ago
6e1ffcc18d
define better color palette
8 years ago
84029ac2d7
Fix the color picker in Chromium 53 and improve the cursor
8 years ago
5c292fb1fa
jshint compliance
8 years ago
b14d89360d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8e29e30a35
Realtime palette + cursor corresponding to the brush
8 years ago
8bbbf8e252
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
64089c5f6b
implement pad pinning
8 years ago
d07acc5364
Don't redraw the drive if filesData changes while in unsorted
8 years ago
13514dff63
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
46a5eee597
Display the spinner in the toolbar for local changes
8 years ago
6c7cdc90a9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
212baeb3a6
better cookie schema. expire old sessions
8 years ago
54d271c4e7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a9777ce560
Fix input losing focus in polls with Chrome 57
8 years ago
3484515283
enable more tests
8 years ago
3e47b8a38d
remove dead code
8 years ago
31b178a306
use pinpad api
8 years ago
182dbfc874
implement pinning logic in pinpad.js
8 years ago
a5e5ddae08
rpc all the things
8 years ago
4f7e25eeb9
show labels for brush width
8 years ago
2a6de5163b
jshint compliance
8 years ago
04069cc7f4
fix font size
8 years ago
1e51f89096
wipe the userdoc when the canvas is cleared
8 years ago
e2981c0223
try to make the color picker show the current color
8 years ago
96dac80bd5
better color picker in whiteboard
8 years ago
bd07b3a80f
less cramped styling on text inputs on /settings/
8 years ago
6e9968f989
add 'lol' code theme
8 years ago
b85324a29e
jshint compliance
8 years ago
73d4fd1700
handle reconnection attempts
8 years ago
b07248ad42
prompt with setName if name is unset
8 years ago
9b4b642d4a
protect against subtly corrupted user objects
8 years ago
18469edf18
extend list item rendering to support gfm task lists
8 years ago
055bc03092
strip carriage return
8 years ago
bca13ad5a5
add notifications to whiteboard
8 years ago
233bb7a14f
reorganize some html tags for smaller diffs
8 years ago
76471f7b90
add forget button to whiteboard and handle disconnection better
8 years ago
d4ce3dc6b9
don't rewrite css rules. FOUC is too long
8 years ago
3cfd0a4326
commit some garbage
8 years ago
364dae2882
update templated html
8 years ago
ed89a13fe6
progress on adding version string to some css
8 years ago
4d5baa717d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
76990ac1b2
version toolbar.css for cache-busting
8 years ago
9d3f859657
add a contextMenu entry for the whiteboard app
8 years ago
7ede430db3
Fix 'search.oldLocation is undefined' error
8 years ago
df7363f416
regenerate templated files for new footer
8 years ago
72fecb9549
Fix lint errors
8 years ago
af68e41fb6
Always set the focus to the search bar in the drive
8 years ago
67f4096396
Fix cursor in the drive search bar
8 years ago
12cc49b575
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
72c60ec676
Add background to the whiteboard app
8 years ago
2732b7aa82
Fix module.onLocal not defined
8 years ago
a0c17d7c9b
latest rpc code
8 years ago
4ddf9b4e04
Improve whiteboard UI
8 years ago
89877baa69
Fix read-only mode in canvas app
8 years ago
c2cb24c072
Add toolbar to the whiteboard app
8 years ago
973aeba0da
remove bundled fabric.js
8 years ago
6eab52c33d
use secure fabric.js
8 years ago
59a80d5fde
remove silly TODO
8 years ago
ce5dbaeafd
use alertify instead of browser prompt
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
5322eff607
Use the current values for the checkboxes in the print options dialog
8 years ago
53c60a31f6
Set the properties and backup inputs to read-only in the drive
8 years ago
0c5a930cb9
Fix an issue with the 'Properties' entry not always displayed in context menu
8 years ago
3e9eb03e5a
display a user's public signing key in settings if it exists
8 years ago
912215185f
add uid to userdata for better notifications
8 years ago
fa9249ef29
don't notify for userlist changes if a user joins twice
8 years ago
40f5e1706f
add a unique id to user objects, define a getter
8 years ago
e2ee80d4e7
set icon for whiteboard app
8 years ago
dbca94437e
rename canvas app to 'whiteboard'
8 years ago
994d640f8b
Fix an issue causing the lag icon to lose its color
8 years ago
819c7e3bae
Fix style issue with drag&drop in the active folder
8 years ago
6fbd1f0028
Store the dates as number and not strings to avoid ot issues
8 years ago
8556ce9d17
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8ce8401107
Fix issues with middle click in context menus
8 years ago
5f4990cc80
Display or hide the context menu in a more intuitive way with multiselect
8 years ago
51033ab70a
Remove useless links in the context menu and properties for readonly pads in the drive
8 years ago
2b2e581779
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
2e8484ad4c
notes about what to improve. transform json on OT instead of just validating
8 years ago
7afde2309d
Add properties to the files not in the trash
8 years ago
61d33f2dd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into prop
8 years ago
66a80ea50c
Add properties for pads in the drive
8 years ago
b542245086
fix lint error
8 years ago
cc43bb8362
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
98027dad27
jshint compliance
8 years ago
eeecb1baab
Make Canvas Work Again
8 years ago
4a173e30dc
set user's cursor to either the beginning or end of the document
8 years ago
29174b2922
Update the lag icon
8 years ago
26edb77cf0
Fix style and usability issues in slides
8 years ago
85105a1382
Active folder in drive is not underlined anymore
8 years ago
cd77f50717
Fix transitions in slides, add swipe event handlers, and fix print in firefox
8 years ago
e139295d7e
Add transitions in present mode
8 years ago
45ac3e40a2
Copy print options to present mode
8 years ago
a5f11d0d0d
Uniform the slides rendering in present and print mode
8 years ago
d422c7e165
support old hashes in getUserChannelList
8 years ago
7d5ff27900
better rpc tests, sum up your channel usage
8 years ago
5ed6223313
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
7f2f1f7191
correctly initialize RPC object
8 years ago
c9c9dd0999
use userChannelList if a list is not supplied to pinpad
8 years ago
e8c3cf6aa5
implement rpc message signing
8 years ago
d85a42c776
include User_hash in user channel list
8 years ago
f98c825dc3
Fix keyboard shortcuts not working in CryptDrive
8 years ago
7b27f1dc2c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
7761aaa89f
Add search UI
8 years ago
b578803136
clean up registration code a little bit
8 years ago
c3c866fa2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d19bbcb001
Add support for search in the drive
8 years ago
5eb32b33ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
298725b3c2
don't show usage tips on error screens
8 years ago
0a6373852e
add signing keys to user object at login and register time
8 years ago
9a32fb1999
Fix sub-folders changing position in the tree when renaming them
8 years ago
931f7619c0
Keep the scroll position on redraw in drive
8 years ago
0607c3bbf3
Add a title to the 'new' button in drive
8 years ago
b9c64a526a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
8 years ago
8129b8cdc1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
15a67afc75
jshint compliance
8 years ago
13d7b3cadc
Merge branch 'd' into staging
8 years ago
a286599f93
Fix fast reconnect, and add support for reconnecting ws in polls
8 years ago
bd9efd7c04
provide examples of valid and invalid rpc calls
8 years ago
7187d3c550
implement getUserChannelList
8 years ago
306f6ce806
resolve merge-conflict with accounting branch
8 years ago
fe5e33a0ee
Fix loss of presentation position when updating slides
8 years ago
805e26bc07
add a version footer to main pages
8 years ago
f10149db1c
Make sure the tip is always visible when the loading screen is removed
8 years ago
71db08eac2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
09afba80db
add support for logging in from register page
8 years ago
16e5788011
Call the callback if we can't parse the local Drive to import it
8 years ago
413d9a6f0b
add a style-callback to confirm
8 years ago
5d88c3a436
newer registration code
8 years ago
10bb11bff6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
803e57c958
add more parameters to confirm dialogs
8 years ago
ceaf757680
Allow right click on the CryptPad logo/link in the top left corner
8 years ago
f2aa531f27
apply styles to confirm buttons if provided
8 years ago
df6298eeb6
apply styles to confirm buttons if provided
8 years ago
84c16c00ad
Fix click events not working on inputs in the drive tree
8 years ago
07a2d8e189
apply translations on feedback page
8 years ago
ca9faa0056
Fix wrong translation keys
8 years ago
b7986ff6b1
Replace the spinner code with a font awesome spinner
8 years ago
6e733b1329
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d9996cc874
current work for pinning
8 years ago
a7d61aa562
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
8 years ago
b3cc8da315
implement basic clientside RPC infrastructure
...
and provide a basic example for testing it
8 years ago
f94db93897
Improve the slides layout in print mode
8 years ago
81027b4200
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
8 years ago
2392167996
Export slides as PDF
8 years ago
4bac8ea0c7
Draw all the slides at once to allow reference links ( fix #77 )
8 years ago
459b18c97b
Add the loading screen in the HTML so that it is displayed before JS is loaded
8 years ago
404fa378e6
Move the store to the 'common' folder, it is not customizable anymore
8 years ago
a8d200ef2e
Don't redirect until realtime is synced when logging in
8 years ago
0c1efd361b
Make sure the href is updated everywhere when importing a stronger link
8 years ago
b701e3cc85
Fix lint errors
8 years ago
4206382865
Fix the settings app to allow backup for unregistered users
8 years ago
f62267f8a1
Ability to import local pads in the user object
8 years ago
e2418a6be2
sketch of how pinning rpc will look
8 years ago
dc567fa7f3
signing keys are stored in hex so encode and decode them
8 years ago
ce6cd1211e
Fix lint errors
8 years ago
aa762e7d63
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8a48612de2
add some notes for later
8 years ago
9ad33574e9
Fix the function returning the pads list in the drive
8 years ago
14938089ac
Keep the focus on the iframe window after canceling a deletion
8 years ago
3f7dea8f7e
Context menu support for multi-select options in drive
8 years ago
e1c02fd8a4
Drive rename: save pads and folders name on click, cancel with Esc.
8 years ago
d93a270336
Ability to display tips in the loading screen
8 years ago
77d09f64e1
Display anonymous users in the user list
8 years ago
cb88227e2b
Autocomplete on key press in some dropdown menus
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
27241488a5
Merge pull request #96 from pbondoer/css
...
(CSS) Some improvements to drive
8 years ago
6c9da646e0
(CSS) Some improvements to drive
8 years ago
08c862b271
add FIXME notes to poll
8 years ago
ed9bcca96f
Close the websocket network when CryptGet/CryptPut is done
8 years ago
a68acac13b
Only ask for a display name once in /poll
8 years ago
a978b51656
If display name is empty, use anonymous in the drive
8 years ago
153386a6e0
CSS improvements in the drive tree
8 years ago
6098f28260
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a852112808
Fix open folder from the tree context menu
8 years ago
2c9deed381
Merge pull request #94 from pbondoer/staging
...
Some CSS fixes
8 years ago
868161a8a8
fix undefined reference in code
8 years ago
0bb10a8a0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
8 years ago
e1303a16da
add support for title attributes on dropdowns
8 years ago
52793385ea
Fix lint errors
8 years ago
e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
8 years ago
01c4d7d4a7
Merge branch 'maybe' into staging
8 years ago
c884782d57
here are some changes
8 years ago
2b6e44189d
When trying to reset the drive, tell the user if the input text is invalid
8 years ago
9a7c2dd5e2
Add a 'settings' link to the user menu in static pages
8 years ago
370ae81106
Use the display name in the backup file name if not logged in
8 years ago
e0d972674f
Fix context menu in drive and rename textbox styling
8 years ago
c5f983ecd7
Convert read-only link to editing link in the drive
8 years ago
d26d8f53d9
(CSS) Fixed textarea being too large
8 years ago
a9afa24428
return empty string instead of blowing up when fixing HTML
8 years ago
6b8d0c8bc7
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
8 years ago
b32d698291
Fix issue with present mode in slide (readonly)
8 years ago
8bdc8415ab
Find a pad in the drive
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
53f4f8826e
Merge branch 'staging' into staging
8 years ago
55210f17eb
Clean the code to be less dependant on 'li'
8 years ago
3e9c4d0901
Add hover to file manager tree
8 years ago
cbdfae09a6
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
8 years ago
c6c3e1bbb5
Don't select subfolders in the tree when drag&drop
8 years ago
d605fc757b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
8 years ago
a26b9d3240
Don't select subfolders in the tree when right-click on drag&drop
8 years ago
cb5e01815c
validate all alertify strings by default. require 'force' argument to bypass
8 years ago
b0323f6fd9
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
8 years ago
a2b5200381
Add a container for the folders in the tree in the drive
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
2c5c6da0d9
Fix XSS in alertify logs
8 years ago
5797aab3f2
Fix XSS with display names in the user list
8 years ago
26e3971482
Fix XSS in the user dropdown menu
8 years ago
639376f1cb
don't use hyperjson.toString
8 years ago
eb9a39eb68
Add hover on elements in drive and make grid slightly prettier
8 years ago
f130fd0598
Fix horizontal scrollbar in edge
8 years ago
345d2faab2
Fix horizontal scrollbar in Edge #3
8 years ago
d683dc499a
Fix horizontal scrollbar in Edge #2
8 years ago
7a0a87bf6c
Fix horizontal scrollbar in Edge
8 years ago
f06196c261
Remove the context menu buttons when removing selection
8 years ago
c0278ba77f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
efb7380a12
Fix default pad not created after registration
8 years ago
5d39125004
Make onSettle Async Again
8 years ago
4f4075ed6e
Make the settings app available to anonymous users
8 years ago
0224d6489b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
12aec60a12
hack around onSettle not doing its job
8 years ago
0ae7f94184
Remove the pointer and text underline on icon:hover in drive
8 years ago
69b6f80e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
86adfbf27d
update cache-busting directive in all supported apps
8 years ago
cfc9f2e622
remove code for 'user' app, now that we have login and register
8 years ago
ec7761eeb8
Make sure we don't use a wrong title for a new pad
8 years ago
8e7e1d336e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
96f6b5755d
Add the blog link in the header and footer
8 years ago
d49a7d7ec4
fix undefined reference
8 years ago
9a2ed5741a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a4913f2f4b
provide UI for disabling the user feedback api
8 years ago
1a259bb3aa
check if user has disallowed feedback api
8 years ago
4f7a05ead2
Fix issue with the path for the trash in the drive's topbar
8 years ago
8741b50f5b
Set the file name as default title if a pad is created from the drive
8 years ago
e8c73f35ce
In the tree, display the rename input only once
8 years ago
e38df7ce47
Fix creation of new pads in /pad
8 years ago
20518a3e88
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f8d653406a
Add the new content for the default pad and add french translation
8 years ago
d15a08830e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
06f0891d21
add allowUserFeedback toggle to settigs page
8 years ago
498f4065cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
95853debf9
Update the default pad #1
8 years ago
d4bf7cf9aa
Send the initial state only if it is a new pad in /pad
8 years ago
66dc166936
Make sure the realtime is synced with onSettle when using cryptget
8 years ago
fadddb297c
Readonly mode in /pad had contenteditable set to true
8 years ago
de5a21fe57
add a simple feedback api and text explaining what it is
8 years ago
2ad9debe58
Remove the placeholders in /code and /slide
8 years ago
38893fb8e5
Remove the 'Bootstart tooltips require Tether' error
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
42b6cca18d
Fix new pad not working
8 years ago
3fd5669647
Hide the trash icon for read-only pads if we have the edit link in drive
8 years ago
02cc9c8344
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e040c00557
Fix blocker issue when creating an account without migrating
8 years ago
e15a6a347f
Fix the forget pad button
8 years ago
89bee8cf6b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ba3e24b595
media tag experiments
8 years ago
54b0a86c2e
Make sure we redirect to the drive if we access the login page from the homepage
8 years ago
55fb0f03ae
Fix the path in the drive overriding the content area
8 years ago
d7d7165dc4
Login page was using a wrong translation key
8 years ago
ba0b314f5e
Fix the 'new' button in drive which was broken in non root categories
8 years ago
d8cc2903cc
Display context menu actions in the toolbar when an element is selected
8 years ago
a0340f1419
Open link in a new tab in /pad
8 years ago
2d30393243
Add support for updated translation key
8 years ago
cc174f3bee
Fix typo
8 years ago
bdc00a2413
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
8 years ago
e73b4a1131
Don't display 'All files' in the menu
8 years ago
89f3577058
remove old poll
8 years ago
7e77c6828a
more correct pluralization
8 years ago
3d0e7cb9a7
pull ckeditor config out of main.js
8 years ago
328e5c6f03
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c72bbd4c37
Use the file name as initial title
8 years ago
4cbb3b2ed2
Ensure we use English for reference
8 years ago
ffe17a6bc9
Use JSON.stringify instead and fix linter
8 years ago
a84f8e2808
Assert translation now outputs JavaScript which is easier to edit for translators
8 years ago
47b8fefd9e
Load messages.js only once, in cryptpad-common
8 years ago
11d9c9e813
Merge branch 'master' into staging
8 years ago
2103f0afa8
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
0bdf59c1dd
Fix broken link in the 'New' button on cryptpad.fr
8 years ago
454d1c2052
Do not load all the translations anymore, only the needed one
8 years ago
434c3a220c
Remove old translation keys #2
8 years ago
d81d17b86c
Remove old translations keys no longer used
8 years ago
9702305abc
Use better translation keys in settings
8 years ago
a6497f7a52
Add a way to show the drive tips again
8 years ago
c17f28e5fe
Fix race condition #2
8 years ago
239e2bcc1f
Fix issue with null entries in Cryptpad_RECENTPADS
8 years ago
1540ae3f6f
Fix issue with null entries in Cryptpad_RECENTPADS
8 years ago
dd014f6ef2
Fix race conditon
8 years ago
94417d9a8b
jshint compliance
8 years ago
8167ed9048
implement cache-busting everywhere
8 years ago
34b6507fa3
implement cache-busting everywhere
8 years ago
c9b8889380
add cache-busting to chainpad-crypto
8 years ago
09fade6127
add cache-busting to chainpad-crypto
8 years ago
2daa9f8658
Link to main page was opened in the inner iframe
8 years ago
deda40375a
Use the new onSettle from chainpad to determine if the realtime is synced
8 years ago
550c65aae0
Add a default pad in CryptDrive after signing up
8 years ago
92d50ded64
Merge branch 'soon' into staging
8 years ago
97762f9f9a
Make sure all the elements in RECENTPADS are non-null objects
8 years ago
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
8 years ago
7762ffcbff
Ability to use Ctrl+click on the cryptpad logo in apps
8 years ago
7497e0d1c5
Add a dropdown user menu to the top bar in static pages
8 years ago
0e76b18278
Hide the links in the html topbar on small screens
8 years ago
7758d056fa
Ability to import/export a user realtime object
8 years ago
0a43570990
Add the new files for the settings app
8 years ago
cd9cea8fa4
Create a settings app to manage user objects
8 years ago
71b84afdb2
Redirect to the pad when logging in or signing up from a pad
8 years ago
92050eb04f
Fix the trash button in toolbar not always working
8 years ago
aae3fba284
Fix the storage when the hash is invalid
8 years ago
25dd103f6f
Reduce font-size for register explanations
8 years ago
7d0c29513c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
7d21206cae
add registration introductory text
8 years ago
2851ceb95a
Merge branch 'soon' into staging
8 years ago
2807ad9dc3
Add spinner and translate the register page
8 years ago
562e5b8c70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
5d4d530c89
switch registration text to an explanation of how login works
8 years ago
bff9d05210
Make sure the login_name is in the object
8 years ago
b1b294aade
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
20083264b2
load fontawesome icons on register page
8 years ago
3aa03225c9
Add a spinner when hashing the password and translate homepage
8 years ago
fbcf4ccec4
force usernames to be lowercase
8 years ago
5614bea271
redirect users to login and register from toolbar
8 years ago
f723585758
add api to check whether the realtime has synced with the server
8 years ago
3b1bd2f720
use additional translation keys for registration
8 years ago
b5b2454f0b
use bootstrap for login and register pages
8 years ago
c556f78562
log in directly from home page, sign up at /register/
8 years ago
d0edf75c89
signup link directs users to register page, not user
8 years ago
1232aa8a79
jshint compliance
8 years ago
8eec7ec7c8
Fix typo
8 years ago
88af104ce8
basic registration page to replace user page
8 years ago
a995df25f6
disable new OT in pad and code app
8 years ago
f92ba193c3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e100110741
implement log in as an api
8 years ago
d54262c8df
Use the same disconnecter error translation key for all the apps
8 years ago
f8366e0cfc
Remove support for legacy store and add a way to import legacy pads
8 years ago
342cb44cf7
Ability to migrate a anon drive directly from the drive
8 years ago
c642bce984
restore disabled listener
8 years ago
67d881b2cf
Remove the drive entry from the user menu if already in drive
8 years ago
e865b89f43
Add the contextmenu button in the drive dynamically
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
702798f65a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1e2cc6bea4
Fix race condition with the iframe store
8 years ago
dae17588c6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
32a5c5ff62
better integration between /user/ and home
8 years ago
fe7ba98338
remove dead code from /user/
8 years ago
9b047bfb53
don't autocorrect usernames. add trailing slash to /drive
8 years ago
6e97082ff9
remove dead code from login function
8 years ago
b3e73b0f0b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
367a02c031
Add mobile support for the code app
8 years ago
628148d001
Display the contextmenu button only if contextmenu exists
8 years ago
8a1acc3c37
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6f07a3b7b4
erase lingering sessionStorage values when logging out
8 years ago
ac79fbb5a2
Improve mobile support for the toolbar and the drive
8 years ago
9f1789b2d2
Fix creation of pads from non-root category in the drive
8 years ago
7e7d1f7a16
Display the error when opening a document with the wrong app
8 years ago
6f0d33dc1d
Fix missing placeholder in the Slide app
8 years ago
7d6e15e465
Throw an error when trying to open a document with the wrong app
8 years ago
ad82a275bc
Replace the Apps button by a New button again
8 years ago
fd33ffd56f
Fix issue creating a patch everytime the user clicked in an app
8 years ago
fbbf8a2829
Replace initialState by a placeholder in slide and code
8 years ago
87abfac5e0
Fix lint error
8 years ago
02439e0f61
Improve the homepage with new images and translations
8 years ago
f57c8c0e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
2c6b4b9c6a
Hide disabled applications from the context menu in drive
8 years ago
85b49d5ec8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
91299f5f30
Ability to access the drive from any pad
8 years ago
b0fb56fa63
Allow logge din users to access the home page
8 years ago
72c4175b6f
remove slide/oldmain.js
8 years ago
e607ba5dad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
9cea8d82c2
Fix left-click disabled in Edge after renaming a file
8 years ago
2dfe182d8d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0ca1775657
add page for listing missing translations
8 years ago
6a5769405b
Fix a race condition issue introduced with reconnecting patch
8 years ago
8881334ca8
Fix renaming folders from the tree
8 years ago
65054119cf
Fix a bug preventing reconnection in drive
8 years ago
89da142204
Fix pad creation from the context menu
8 years ago
757ae7a3ad
Fix a cross origin frame issue with dropdowns
8 years ago
3321d01040
add background image
8 years ago
8427b6ae8e
Fix 'sort by type' in drive
8 years ago
39c85ca3f7
Fix race condition causing missing translations in homepage
8 years ago
dc39c4e179
Fix a race condition causing the drive toolbar to be missing
8 years ago
2e247d44c7
Hide the backup icon when logged in
8 years ago
8ed593bfff
Keep the anon drive when signing up
8 years ago
5e69b78334
Remove the domain from the href in store
8 years ago
a9c9d19212
Hide the template from the list in the drive until it's done
8 years ago
487650df78
Remove the remember me checkbox
8 years ago
58d8a30b5b
Redirect to the main page when logging out
8 years ago
29578a7400
Merge branch 'hpbs' into newtoolbar
8 years ago
2d79649949
Fix the 'NoScript' bug with the drive
8 years ago
5ef074370b
Name a place before creating it in the drive
8 years ago
02906b3945
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
8 years ago
a4286f1c83
Merge branch 'soon' into newtoolbar
8 years ago
0e9e0e545f
Load the new pad when the hash is changed
8 years ago
e41cbb92d8
Use default FILES_DATA name if not provided
8 years ago
fa1582f307
Replace 'filename' by 'title' in drive when there is no filename
8 years ago
c44f3a1044
Delete multiple elements could also remove unselected ones
8 years ago
b79e1e48c7
Update colors in drive
8 years ago
fb48484d2a
Fix the rename feature in drive not working with tables
8 years ago
3f44444f41
Display the 'New' button in the trash
8 years ago
00efc96919
Move the toolbar and add a breadcrumb
8 years ago
6f5ff07c2b
Display the elements as a table instead of a list
8 years ago
95056315cf
Move the folder icon style to the less file
8 years ago
8c7305bf1b
Use less to write the drive stylesheet
8 years ago
11f0a9ae5f
Revert the changes adding anonymous pads
8 years ago
f42665ba49
Remove the unowned pads category
8 years ago
cb85ad3fdf
Merge branch 'newtoolbar' into ownedpads
8 years ago
75f1eed712
Merge branch 'newtoolbar' into hpbs
8 years ago
373b07ed28
Fix lint errors
8 years ago
097f78d777
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
8 years ago
015e6fc262
Make sure we have the same hash in all the tabs when disconnecting
8 years ago
88021f2264
Anonymous pads fo anonymous users
8 years ago
8ccd845d52
Merge branch 'newtoolbar' into hpbs
8 years ago
ce1e792419
Merge branch 'soon' into newtoolbar
8 years ago
9d275daebb
Backport changes for the login page from hpbs branch
8 years ago
a5c03c1540
Make sure data is migrated before leaving registration page
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
c77abfa7f4
Remove a second scrollbar in polls
8 years ago
5e36d9ea29
Fix polls table not updated with local events
8 years ago
39ca2e6dd6
Fix bootstrap conflict with context menus
8 years ago
d1bed5ae4b
Fix polls table not updated with local events
8 years ago
26bea774cb
Merge branch 'newtoolbar' into hpbs
8 years ago
99b8898e54
Apply new title when clicking on the page without pressing enter
8 years ago
ea8667302c
Display only a placeholder when the poll title is default
8 years ago
7d66d391fc
Merge branch 'newtoolbar' into hpbs
8 years ago
1e1bfd275c
Don't show the tab notification when someone has joined the pad
8 years ago
5d5d03163e
Add favicon and notifications in polls
8 years ago
3338000018
Add Esc and Arrow icons in the slide's present mode
8 years ago
efdae19f0c
Update the lists in the code and slide toolbars to use the new dropdown
8 years ago
36c8ade26c
Update the lists in the code and slide toolbars to use the new dropdown
8 years ago
fa8a0d5880
Merge branch 'newtoolbar' into hpbs
8 years ago
69bee7d79a
Add data into the homepage
8 years ago
88d5b4cc9c
Add a 'New pad' button in the toolbar
8 years ago
73d424b506
Improve the login UI (css and translations)
8 years ago
e006ed7076
Ability to log in from the main page
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
70b73206b7
Merge branch 'brandones-master' into soon
8 years ago
efffd4974f
Add createDropdown and createLanguageSelector in cryptpad-common
8 years ago
29c8f0bbef
Use a FontAwesome spinner to replace the old unaligned one
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
6352656737
Remove the default context menu in the entire drive
8 years ago
ed79b8870c
Merge branch 'master' into soon
8 years ago
605072cfbf
Fix empty title with new documents
8 years ago
4963c77b61
Fix the title reset bug
8 years ago
35a853ffff
Stop failing tests over missing translations because otherwise they'll almost never be passing.
8 years ago
3f1e287811
Fix an issue causing a user object to be turned into a pad
8 years ago
994f6991c8
Merge branch 'master' into soon
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
33b8de888e
clean up unused files
8 years ago
26dd4ea11f
Fix lint errors
8 years ago
4278ac7637
Merge branch 'soon' into fileManager
8 years ago
2be5db9540
Ability to open files in readonly mode
...
Fix CSS issues
8 years ago
63b9d4e9fd
remove path for backwards compatibility
8 years ago
f74d0a46a4
Remove the alert when pressing del in 'all files'
8 years ago
b39067d2a1
jshint compliance
8 years ago
74a12f50ac
only migrate keys which don't already exist
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
0373556475
support old hashes in /poll
8 years ago
d5561910d4
Move the file manager into /drive and add a toolbar
8 years ago
1e70af0c16
Use the same network for the apps and the file store
8 years ago
bf764d26e7
Merge branch 'staging' into workgroups
8 years ago
3836b20b08
enable the file store
8 years ago
b0d4dad417
Fix creation of a new file manager object
8 years ago
5a8f0df19e
Add support for reconnecting websocket
8 years ago
b33661d9d5
don't toggle maximization state after setting
8 years ago
e56cc49f79
catch errors that popped up because of a cross-origin iframe
8 years ago
5080751a90
hide unnecessary scrollbar
8 years ago
95617a11c8
fix broken paths in old poll
8 years ago
7a0442afe0
Drag and drop files into a workgroup
8 years ago
05a956879a
prepare new poll app for release
...
move old poll into poll/old
8 years ago
5cd714b18a
configure filestore usage via customize/application_config.js
8 years ago
2b5085625c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
69b1764c9d
Missing entries in the context menu with users
8 years ago
c6499d6789
make panel styles reusable
8 years ago
34967ac354
encapsulate rendering functions so we can pass in cryptpad-common
8 years ago
66b8c93205
remember time of first visit
8 years ago
ba4df1a22c
create examples directory with old prototypes
8 years ago
0abf45bdc5
better fsStore debugging
8 years ago
e3f79f914a
fix user hash
8 years ago
d232a5a83e
Revert "simplify key generation and remember user's additional keys"
...
This reverts commit 75786ff9ff
8 years ago
91a806ab86
focus on OK button when we pop an alert
8 years ago
850bd42149
don't try to display things that don't exist
8 years ago
75786ff9ff
simplify key generation and remember user's additional keys
8 years ago
621476424d
make strings translatable and refocus on correct input
8 years ago
a97696c712
show user's display name and account name
8 years ago
3560f0580f
commit prototype upload script
8 years ago
2f9f3d921a
trim excess whitespace from usernames
8 years ago
89e5830409
make alertify display time configurable
8 years ago
49d80d91d9
don't load customize/pad.js anymore
8 years ago
f020fd5a75
remove /customize/pad.js from main apps
8 years ago
aae443c8e9
replace old poll app with new
8 years ago
387f4ebf5d
add this important js file I forgot
8 years ago
8f0de589dc
add missing cp class to more html
8 years ago
e9376a66c2
apply 'cp' class for unified styles
8 years ago
8b034a9554
better flow and animations for login page
8 years ago
db12b5e896
move text for login page into translation file
8 years ago
5e1d8292c5
guard against trying to parse special fragments
8 years ago
51067430f9
more restructuring of user app
8 years ago
a4ed2388e2
use 'box' class
8 years ago
eb620bee77
restructure user application
8 years ago
a10eac2773
Fix lint errors
8 years ago
52a593c2c2
fix jshint complaints
8 years ago
53a4d4738a
really make sure you're logged out
8 years ago
63cd5c16ac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
8 years ago
81259fc25f
Refresh unsorted and templates when files data changes
8 years ago
5534da8abf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
8 years ago
9b6c9e3891
Add support for templates in the file manager
8 years ago
acfc27f5c5
fix merge conflicts
8 years ago
3197b62fbb
latest work
8 years ago
29d406b7a9
implement cryptput
8 years ago
84d5e4b35d
better tools for playing with template code
8 years ago
1772cc93c8
Fix the taildoc bug
8 years ago
87abfff66b
Fix Flash Of Unstyled Content (fouc)
8 years ago
86cda4357b
handle more possible cases
8 years ago
1682d23c1c
remove old user prototype
8 years ago
046220f239
Add info boxes for the different categories
8 years ago
403ba53980
Fix typo error
8 years ago
e9418af88b
Add an info box in the file manager
8 years ago
c359c27997
Use user object as default store in file manager
8 years ago
4aed585574
Fix style issues in the toolbar
8 years ago
f9db7e588e
Fix unused backup in localStorage
8 years ago
c7e63f63fd
Use the user object in file manager if it exists
8 years ago
6778a7062d
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
8 years ago
bd6992da0a
create a random hash
8 years ago
2cd50498c2
add log(in|out) functions to common
8 years ago
dfea802c77
better crypto hygeine, start thinking more about ui
8 years ago
e3f484d876
File manager in the home page, lint
8 years ago
7df460c766
implement createChannelId api
8 years ago
3698fe8b0e
Merge branch 'soon' into login
8 years ago
5a14db9f07
Merge branch 'test-filemanager' into login
8 years ago
dd46b9425a
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
4646d5c866
Add suport for read-only mode in the file manager
8 years ago
2a624a0b60
add example usage for cryptget.js
8 years ago
303953a431
Merge branch 'soon' into login
8 years ago
6b9529b121
implement ajax-like functionality for zk docs
8 years ago
5bc7766f44
Use a consistent toolbar across all apps
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
67baf30d65
basic outline of logins
8 years ago
2968488278
convert uint8 arrays to hex
8 years ago
d95a3ac92e
Fix an issue when deleting a key from the proxy
8 years ago
82f3d5f852
Open the file manager of someone else
8 years ago
c0d96fb10d
Merge branch 'login' into test-filemanager
8 years ago
c3e3aa69c3
Merge branch 'fileManager' into fmIndex
8 years ago
5d335ba796
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
8e6830d080
Fix file manager with a chosen hash
8 years ago
2b077a8e95
add the file manager in the main page
8 years ago
f36d15d0db
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
b7f2ef97c7
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into fileManager
8 years ago
fdb5c2ddb5
Fix UI issues with rename and delete actions
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
43ccd11adc
Merge branch 'infiniteSpinner' into fileManagerMerge
8 years ago
05fd6c1563
Fix the infinite spinner problem
8 years ago
5cd7d8ec84
Fix undefined userid in new poll
8 years ago
cb43eb9ca1
Merge branch 'newpoll' into fileManagerMerge
8 years ago
9b3719e0ae
Merge branch 'soon' into fileManagerMerge
8 years ago
b7b4a034a3
Merge branch 'soon' into newpoll
8 years ago
ddc99cecb1
Fix lint errors
8 years ago
f26cdb1a21
Fix UI issues, unclickable user column, add confirm dialog
8 years ago
6feb8548b3
Prevent the proxy handlers from being called on the parents
8 years ago
740b6e955e
Improve UI, fix issues with the table
8 years ago
94fbc2dca4
prototype cryptographic login
8 years ago
a23b3d3517
use new ot in code too
8 years ago
de0863e232
use new ot
8 years ago
4cd9bd5534
strip listeners
8 years ago
b79618c94a
don't allow listeners in /slide/
8 years ago
ebff304602
turn off some unwanted behaviour
8 years ago
6dff82ede2
Improve UI, scrollbar in the table, publish/admin buttons
8 years ago
90804ed9e0
Add usernames/userlist in the toolbar and fix publish button
8 years ago
3632834500
Lock inputs when the user is not editing them
8 years ago
eaeaf4df40
Improve UI, add title input and forget button
8 years ago
bca746bbb5
Fix uncommitted column, add toolbar
8 years ago
ffedcb63f7
Display own column at the beginning, add uncommitted column
8 years ago
4a4d4a0474
most recent work
8 years ago
e5ff7020fb
move buttons out of form
8 years ago
c88fa34558
Improve UI, fix issues with new file manager channels
8 years ago
5a5451d94c
Sort elements in the trash, add properties in the context menu, fix issue with Edge
8 years ago
19e4a2d044
Create new files, sort displayed elements
8 years ago
a957b72598
Create a new pad from the file manager
8 years ago
4fcdece4af
Test create new pad from the file manager
8 years ago
d6e1215166
Refresh the directory if needed when the object has changed
8 years ago
118829617f
Use the FS store as default store
8 years ago
aa14ea7ac4
Use the old store format
8 years ago
da19608269
Translate the context menus, Shift+Del shortcut and realtime object
8 years ago
7a035fa4a0
Fix drag and drop with multiple elements selected
8 years ago
d77970975c
Add translations, ability to select multiple elements, clean the code
8 years ago
eb50177201
do a bit of work to preserve cursors
8 years ago
ac43f4cb1f
new prototype poll
8 years ago
f05efbb113
Clean the code
8 years ago
851d3df656
Ability to see, move and delete unsorted files
8 years ago
43d93938c3
Fix the list, find the unsorted files, ability to add a folder
8 years ago
cfe3d38197
Add expend/collapse to the tree, fix CSS, add list/grid view modes
8 years ago
c9cd06514c
Add "restore" from trash, improve drag and drop and update css
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
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
8e1bff706b
Add drag and drop, rename and delete actions
8 years ago
67bf41627d
comment out dead code so CI doesn't complain
8 years ago
002e22ee9a
turn off unwanted behaviour until we can do it correctly
8 years ago
5fc44a6e4b
Merge branch 'soon' into fixpolls
8 years ago
ce9eb47351
Initial state of the file manager app
8 years ago
2d5448458b
export messages
8 years ago
b1370c05b7
add translation completeness test to assertion page
8 years ago
5f6ebb5cc1
fix incorrect regex for c-like title detection
8 years ago
d512b113cd
address failure to parse url when hash is not present
8 years ago
6ae851ffdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging-soon
8 years ago
636b0fcadc
do our best to keep the console quiet
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
0a9d34a6c9
hide appended color pickers
8 years ago
c858b247c1
filter absent users from the userlist
8 years ago
ac3ddbab70
expose userList for later usage
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
5d9b81ab2f
Merge pull request #53 from xwiki-labs/update
...
minor fixes to html and userlist
8 years ago
46c5f64369
remove absent users from the userlist
8 years ago
51a79c5218
Remove unused dependency
8 years ago
9a733bb360
Fix dropdown menus with Edge
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
d2389a5729
Change the userlist in the toolbar
8 years ago
e739c49e7f
Remove the 'about' button in ckeditor
8 years ago
b23fe783e3
Fix the color picker in Chrome and hide the buttons when not supported
8 years ago
91b4446c0b
Merge branch 'fix-chrome-style-bug' into soon
8 years ago
53fe002d3b
Merge branch 'slide' into soon
8 years ago
6c04b7967d
Remove unused library
8 years ago
d63c912af0
Use the HTML5 color picker to change the colors in slides
8 years ago
bb2317d8e6
fix chrome style bug by forcing reload of style sheet
8 years ago
765498e88e
Remove the support for old.cryptpad.fr
8 years ago
d7e170c797
Test colorpicker
8 years ago
81fce1237f
Colorpicker to choose the background color in present mode
8 years ago
5300bc363c
Fix a race condition in the slide application
8 years ago
c322aa440e
Fix the username icon hcih was not working anymore
8 years ago
8575f3f79f
Fix the "rename" feature which was not working anymore in some cases
8 years ago
a989b51d74
Fix race conditions with Alertify
8 years ago
74df38f94f
Fix race conditions that could prevent applications from being loaded
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
2ac1b02572
Merge branch 'config-sockets' into soon
8 years ago
11f63c861c
Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title
8 years ago
5e76194262
use new config api
8 years ago
3dfa19b786
more flexible websocket configuration (WIP)
8 years ago
76fdadee7f
Store only the strongest hash in the localstorage
8 years ago
1c808b3da8
Add comment for the 'important' css rule
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
2609af2105
Use the CodeMirror editor in the slide application
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
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
c16e8d603b
Enable reconnecting websocket in code pad
8 years ago
d6525087c7
jshint compliancy
8 years ago
ed9acf1c00
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
8 years ago
a4843cb5d7
Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict
8 years ago
a82b7aaf8b
allow empty names
8 years ago
2267ec8c43
Slides in read-only were not updated with the latest content
8 years ago
eac0cdd6dd
Enable read-only mode in slides
8 years ago
d46bd1af5c
Improve the toolbar UI with the username displayed
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
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
723df4880e
Merge branch 'slides' into merge-slides
8 years ago
b96f050555
Merge branch 'board' into merge-boards
8 years ago
fa8199bc75
don't try to use experimental user code
8 years ago
2d42cadb23
push /code/ state once ready to avoid OT collision
8 years ago
bf5dac58dd
Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc
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
42f14873cd
Merge branch 'translations' into newhashmerge
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
5c63585952
Complete the French translation
8 years ago
0d9f63b977
Merge branch 'translations' - part one
8 years ago
f086492e50
Improve the localization system
...
Improve and enable the French translation
8 years ago
cc4bca8004
execute callbacks on presentation events
8 years ago
8bf79ef915
serialize slide pads as a sorted object
8 years ago
997b46a3f7
limit the size of rendered images
8 years ago
25c8d16bf5
Use a new version-prefixed hash parser
8 years ago
c35c7cda20
hide wizard after computing results
8 years ago
0dae949c4f
fix scrolljank bug
8 years ago
c736caceba
Use a better default pad title
8 years ago
97415d8158
Merge branch 'users'
8 years ago
122a9fe068
realtime kanban board
8 years ago
4561ddcdf3
add missing semicolon
8 years ago
8031770f90
rename "module" to "APP" in /slide/ for jshint
8 years ago
8e86be81b2
Merge branch 'better-slides'
8 years ago
fb21b4e46b
fix up /render/
8 years ago
4941c1493e
better user integration. a few more common utils
8 years ago
2f2aeef0e5
add missing semicolon
8 years ago
8a659cf887
maintain aspect ratio for slides
...
display index and slide count in title
8 years ago
30ea1b59b7
integrate users into common utilities
8 years ago
6d775f61c6
add missing functions
8 years ago
168338b898
add missing functions
8 years ago
7c5ee53e81
resolve conflict and merge
8 years ago
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
f40b798d88
Merge pull request #30 from xwiki-labs/reconnect
...
Ability to reconnect after a connection failure
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
aa91ebd24e
don't initialize until the store is ready
8 years ago
93f5a3d3e9
use more bits from the users' seed and parse into various subkeys
8 years ago
1bec02239c
coerce dates into strings
8 years ago
0add01a940
remove dead code
8 years ago
dcebb9597f
prototype of password based key derivation
8 years ago
848f16e8f5
unused function which computes values for the table
8 years ago
18ea61dc9a
use diffdom for sanitation and better redraws
8 years ago
c62d064ee9
add a 'share' button which copies the url to the clipboard
8 years ago
b229a18ccf
notify users of changes if the visibility api is supported
8 years ago
d64e06c12e
don't make empty options
8 years ago
a3f6fe8843
lock options by default
...
add edit button for modifying options
fix bug where committing didn't clear the active column
minor style fixes
8 years ago
8c914dfe1f
better filenames
8 years ago
f1619f4a0f
get /slide/ up to par with other prototypes
...
* use messages.js for some translatable elements
* style alerts
* infer document name from content
* present, forget, rename, import, and export buttons
8 years ago
269eba3c47
remove commit button if a user is removed
8 years ago
f8f66800d1
display a 'commit' button which locks your column
8 years ago
85540bad12
leave all columns locked unless you've visited before
8 years ago
d679cac666
fewer log statements for the console
8 years ago
55b1a17b0d
off by one error
8 years ago
235c0482f9
increase clickable area around editable columns' checkboxes
8 years ago
c76aaac542
don't make columns with empty names
8 years ago
d85684ef74
usability improvements
...
only one column is editable at a time
editable columns have a different appearance from locked columns
any column can be edited by anyone via an edit button
columns and rows require confirmation before deletion
8 years ago
76bfb6ab35
detect whether you are new to a page
...
prompt for your name and create a column for your username
prompt before deleting columns as well
style a few elements differently
8 years ago
e2b162bf6d
snapshot some dead code
8 years ago
55666e9f70
remember presentations, and label them correctly on the home page
8 years ago
5a3da11c40
very simple presentation with markdown
8 years ago
7eaa4ce733
recognize pads with the same type and hash as identical no matter their domain
8 years ago
da6e5d73d0
fix undefined reference
8 years ago
043041523f
on import, fall back to setting language from file extension
8 years ago
deb63d2447
share syntax highlighting selection with peers
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
975bff5794
show a spinner until the document has loaded
8 years ago
a58f58535b
better regex for pulling titles out of c-like comments
8 years ago
5131f47cca
jshint compliance
8 years ago
306d524416
fix broken removal call
8 years ago
dd3a5d47be
migrate localStorage so people go to cryptpad.fr
8 years ago
a094e3c02e
use correct store api calls in frame.js
...
also don't log unnecessarily
8 years ago
dcc9810a42
avoid extra call to store if there are no keys to remove
8 years ago
9a5294016d
fix incorrect usage of store api
8 years ago
4e5f381325
add spinner to API. update bower deps
8 years ago
01d9923e15
export Cryptpad at window level
8 years ago
fa654a7646
slightly better regex
8 years ago
254d800a3b
add a /p/ route so that we don't break old urls
8 years ago
cd18075ac7
add some redirection logic to support old hash types
8 years ago
600f3151e9
don't use the store until it's ready to be used
8 years ago
fffa9acf15
remove unused files from fs and jshintignore
8 years ago
551d38c930
let the abstraction take care of stringification
8 years ago
9b16d529ca
add one more missing script that caused handlebar highlighting to break
8 years ago
0ada6a3d0a
jshint compliance. gotta keep those tests green
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
7f02c899ea
add snippet for copying text to the clipboard
8 years ago
93142b364f
tests for pretty printed html
8 years ago
4833cf0d7b
add a fontpicker
8 years ago
6cb2f72aa6
pretty print html during export if possible
8 years ago
c09166efe2
scroll down when adding a new option to the table
8 years ago
42eafe9e29
don't create duplicate stylesheets in the document head
8 years ago
fe3f02f5e0
enable text foreground and background colors
8 years ago
68f8d0101d
fix flash of unstyled content
8 years ago
8ea6c03094
notify user on disconnect
...
also disable inputs
8 years ago
efd190beca
export file with correct file extension, if possible
8 years ago
5e71a5473c
add another missing script
8 years ago
992bc4f449
add missing script
8 years ago
2351d8a23e
make tests green again
8 years ago
068a3f5944
remove rows from the poll
8 years ago
c6bdb7506d
forget everything about a pad when you forget it
8 years ago
b8a3a4d188
persist usernames across sessions via localStorage
8 years ago
846d1135b9
set mode in the editor, not just the dropdown
8 years ago
446266a79b
remember the last language used on a particular pad
8 years ago
e84fbf0bc3
more helpers in common
8 years ago
70f8837681
maintain scroll position on remote changes
8 years ago
c267dd6a88
ensure that 'text' is a string
8 years ago
2f2ab4392c
clear the table on user clicks
8 years ago
64f030c344
add a clear table button
8 years ago
d2c5cfe646
add col/row ids to arrays
8 years ago
1a63faf188
infer names from the first comment on code pad
8 years ago
f77e2cec34
set text values of new options
8 years ago
52ab5147c9
add a missing semicolon so tests don't fail
8 years ago
e3f4df7e0a
push my latest changes because I'm agile
8 years ago
cde239c97a
implement row/column removal
8 years ago
9860b7427a
addition signs are slightly informative
8 years ago
ac50bf7286
height and width of the table are unreliable because of multiple users. remove them
8 years ago
a3254a2619
consistent ordering of columns and rows
8 years ago
d30eddf2f2
ui hint for 'adduser' and 'addoption'
8 years ago
a995f2306d
fix undefined variable reference
8 years ago
44fe95c76b
add titles to buttons on pad and code
8 years ago
ebf5c27453
add rename and forget buttons to poll app
8 years ago
f7a1332317
add a 'back' button
8 years ago
7dd1624206
commit polls to localStorage
8 years ago
0cf5f3cc87
realtime polls!
8 years ago
ff74a67a09
translate alertify button messages
8 years ago
d39ab5c250
point to the actual translation file
8 years ago
dea8e225db
fix double scrollbar issue
8 years ago
6f598682f8
templates for custom themes
8 years ago
02cd2fbee0
style fixes for the ansuz theme
8 years ago
c9edf69ed1
one less prototype using messages.js while we figure out internationalization
8 years ago
3eccec7054
better effort for translation
8 years ago
3bdfee71e1
move padrtc to .git
9 years ago
18ce69b756
use constants from toolbar.js, address linter warnings
9 years ago
2a7a84b774
use constants exported from toolbar for selections
...
make things a little less brittle
address linter warnings
9 years ago
cbeaa8d609
major refactoring for toolbar. CAN HAZ LESS
9 years ago
7504f79e05
add log and warn methods to cryptpad common
9 years ago
750731d3db
workaround for favicon magic
9 years ago
3ad5d71ab1
make sure the regular favicon is set
9 years ago
fd3cd73d0b
try to fix favicon bug
9 years ago
589b0087a1
listen for keyup events while alertify prompts are active
9 years ago
a2a8570453
use alertify UI in /pad/
9 years ago
e32c0aaac8
use alertify UI in /code/
9 years ago
deae7ac78f
don't hide the notification until it has been seen
9 years ago
3d3c6e4800
add wrappers for alertifyjs
9 years ago
yflory