yflory
74e59a513a
Add the markdown toolbar to the slide and poll apps
7 years ago
ansuz
22c5ff757b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
650d26afea
use unified listmap in profile app
7 years ago
yflory
68d602f74a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
644f6e9985
Use the bounce app to open links from inner
7 years ago
ansuz
5eacc158d9
make tests pass again
7 years ago
ansuz
812df7de6f
Merge branch 'merge-staging' into staging
7 years ago
ansuz
be5c5831dd
lint compliance
7 years ago
yflory
444ba91287
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
7 years ago
ansuz
77c81f2426
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging
7 years ago
ansuz
4ff4ccd1d3
use faster and more correct 'find' implementation
7 years ago
ansuz
e3f04ef076
Merge branch 'soon' into staging
7 years ago
ansuz
71cf3a4ddf
fix creation of personal todo list
7 years ago
ansuz
701af29192
fix broken register/login process
7 years ago
ansuz
a3c093838c
merge latest staging and resolve conflicts
7 years ago
ansuz
56102d3689
use unified listmap
7 years ago
ansuz
661db129b2
lint compliance
7 years ago
ansuz
80978377f2
return transformed cursor value
7 years ago
ansuz
2e00214783
drop unreachable code
7 years ago
ansuz
ee6c2097f5
resolve merge conflicts
7 years ago
yflory
9795ac32cb
Ability to burn an anonymous drive from the browser
7 years ago
yflory
4b5abdecbe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
280a7c2765
Clean cryptpad-common
7 years ago
ansuz
98c2b0c802
Merge branch 'soon' into staging
7 years ago
ansuz
3ff0eb116b
don't let search interfere with renaming
7 years ago
yflory
eba1c9dfac
Add chainpad log to the debug app
7 years ago
yflory
a660c03f97
Fix scrollbar in the debug app
7 years ago
yflory
30cea8888d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
06011065d2
Add a debug app
7 years ago
ansuz
60c4973d62
resolve merge conflicts
7 years ago
ansuz
585f9d2e4e
repair broken 'clear channel' button
7 years ago
yflory
000f3edd1d
Constants file
7 years ago
yflory
477f14bb8b
Put constants in a separate file
7 years ago
ansuz
9d662bd337
fix right-click pad creation in drive
7 years ago
ansuz
d726c95f0b
fix namespace collision
7 years ago
ansuz
c8a9afb6c8
remove duplicate loading screen
7 years ago
yflory
7f88d1d43a
Improve drive loading speed
7 years ago
yflory
06ede6b294
Fix export in apps using framework
7 years ago
yflory
c35e3d644e
Make sure dates are stored as numbers in the drive
7 years ago
yflory
655dfe971d
Add translation for the edit username button in the userlist
7 years ago
yflory
eb88efd83f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
80803ad076
Fix empty codemirror after thumbnail creation
7 years ago
ansuz
a8d5a68eb5
open links correctly in contacts app
7 years ago
ansuz
7441a68fb9
update test after merging api changes
7 years ago
ansuz
d1beb6493b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
b96ea47f1f
strip tracking parameters when parsing urls
7 years ago
yflory
e2cf46d725
Add new keyboard shortcuts for the drive search
7 years ago
yflory
cf26c4c286
Improve the toolbar UI for smaller screens
7 years ago
yflory
fc02f97d78
Use less2 classes in the user menu
7 years ago
yflory
41a082c46d
Fix video thumbnails
7 years ago
yflory
fd258fc277
Fix preview button tooltip in code
7 years ago
yflory
fe9261f6a2
Fix modules order in TODO
7 years ago
yflory
af8aa25228
Add an option to never rename a file during the session
7 years ago
yflory
31b31654ec
Lint compliance
7 years ago
yflory
25d3d321da
Ability to rename a file before uploading it to the server
7 years ago
yflory
2813b7219e
Fix the public key using the wrong domain in settings
7 years ago
yflory
a96e49d55a
Fix filepicker creating a new netflux network when initialized
7 years ago
yflory
630ac45948
Fix laggy and blinking tooltips
7 years ago
yflory
1f53304ad3
Display a dropdown menu inside another one
7 years ago
yflory
014e12b5b5
Ability to update the username from the userlist
7 years ago
yflory
bdd24ed14f
lint
7 years ago
yflory
7cfe64fc5b
Remove cryptpad-common dependency for some inner apps
7 years ago
yflory
1514ad5df3
Move the 'logged out' screen inside the sframe
7 years ago
yflory
5a2afb5c95
Remove Realtime and Messaging from common
7 years ago
yflory
30c8c253dd
Remove util and hash from common
7 years ago
yflory
c9e1de042c
Remove common-interface dependency from cryptpad-common
7 years ago
yflory
dc207393fd
Separate UI elements from cryptpad-common
7 years ago
Caleb James DeLisle
50da6b3b2e
Needs to be handled in chainpad-listmap
...
Revert "Do content checks on the drive so if it gets corrupted, the patch will be rejected"
This reverts commit eaa7b6e8e5
.
7 years ago
Caleb James DeLisle
eaa7b6e8e5
Do content checks on the drive so if it gets corrupted, the patch will be rejected
7 years ago
yflory
354c63bd64
Clean old code
7 years ago
Caleb James DeLisle
ac66511f0a
Merge branch 'staging' into new-diff
7 years ago
yflory
be848c1bec
Fix broken readonly link in drive
7 years ago
yflory
f931574dac
lint compliance
7 years ago
Caleb James DeLisle
7b62a8042e
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
7 years ago
Caleb James DeLisle
840cd91bcb
manual merge
7 years ago
Caleb James DeLisle
75130150d5
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
7 years ago
yflory
cf5ccf04f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
101482b8cc
Migrate settings to use a sandboxed iframe
7 years ago
ansuz
7f8147b18b
Merge branch 'soon'
7 years ago
yflory
c1ba08cfc6
Make sure thumbnails are .png
7 years ago
yflory
0956905ca8
Wipe localForage on log out
7 years ago
yflory
6b9ffe8dd1
Make thumbnails more secure
7 years ago
ansuz
454fc8498c
remove old* apps
7 years ago
ansuz
e07bb0f7b3
roll back to old transform function, except in pad
7 years ago
yflory
a592317e35
lint compliance
7 years ago
yflory
fef97ed60e
Fix an creating duplicates mediatags in markdown preview
7 years ago
yflory
9060464f37
Create thumbnails only when the tab is not focused
7 years ago
yflory
a37e6c7979
lint compliance
7 years ago
yflory
2a3a5c4342
Ability to disable thumbnails
7 years ago
yflory
5dff9a32b6
Fix comments order in polls
7 years ago
yflory
1871749b6f
Fix -1 viewer in the userlist when disconnected
7 years ago
yflory
cf3024ef5b
Ability to display an error in the toolbar state
7 years ago
yflory
8de9a596f1
Fix cursor in thumbnails
7 years ago
yflory
fd7bb3aadb
Make sure the infinite spinner modal is not displayed multiple times
7 years ago
yflory
3ebb5ca493
Fix issue in diffMarked creating text nodes for each character
7 years ago
yflory
5438970ab4
typo
7 years ago
yflory
e0f7df80b3
Fix avatar upload and use less2 everywhere in profile
7 years ago
yflory
7f9b21405b
Add missing files for profile
7 years ago
yflory
e99836bae2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
4250688856
Migrate profile to use sframe
7 years ago
ansuz
744809101c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
867df1db56
fix '+New' button in drive toolbar
7 years ago
yflory
907e2cb517
lint compliance
7 years ago
yflory
abc511a56e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
68accaf653
Todo in sframe with less2
7 years ago
ansuz
11b8b380fd
Merge branch 'staging' into evilham
7 years ago
ansuz
04f26ff886
Merge branch 'staging' of github.com:evilham/cryptpad into evilham
7 years ago
ansuz
0a14c715ad
add test for support of invite urls
7 years ago
Evilham
5dcfbd07ab
Merge branch 'theming-improvement' into staging
7 years ago
Evilham
4933aafbc8
Added default values to avoid breaking existing themes.
7 years ago
ansuz
4c0049ad55
don't log presence of other users as 'joins' when you have first joined
7 years ago
ansuz
325f685f3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
1cbf1aec92
prevent undefined access in non-sframe apps
7 years ago
yflory
ac1b67ad67
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
1245b4d244
Enable thumbnails in poll and whiteboard
7 years ago
ansuz
d644054e3f
lint compliance
7 years ago
ansuz
ed253e6c75
Merge branch 'staging' into evilham
7 years ago
ansuz
df1a700cb2
disable thumbnail test. add test for flat dom
7 years ago
ansuz
02cd7e5b58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
69890ebd8f
prototype alternate datastructure for trees in listmap
7 years ago
ansuz
23c305f71f
implement removeItem so localForage doesn't complain
7 years ago
Evilham
735f0a7e30
Merge branch 'theming-improvement' into staging
7 years ago
Evilham
83da9cf752
Moved colours to colortheme.less to enable theming
7 years ago
yflory
8251247da2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
6f020b67ca
Add thumbnails to framework apps
7 years ago
ansuz
98c66ef8f6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
bf817f20ee
Fix file upload in code and slide
7 years ago
ansuz
f031af4e9d
fix broken media-tags in contacts
7 years ago
yflory
24572a40d2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
f4adbd980e
Thumbnails for the code app
7 years ago
ansuz
ba97aa7ad2
allow file upload handler to create thumbnails for whiteboard
7 years ago
ansuz
6157c57a4b
disable color palette when interface is not editable
7 years ago
ansuz
8359902f6a
fix typo in poll
7 years ago
ansuz
69f9a7ebf3
make userlist change notifications configurable
7 years ago
Caleb James DeLisle
027b9fa383
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
aa37997aa3
Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
7 years ago
ansuz
bac608adfe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
dc90811090
only call onReady once in sframe-listmap
7 years ago
yflory
bac10472f3
lint compliance
7 years ago
yflory
39b4cb9226
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
18b5b20d27
Add thumbnails for PDFs
7 years ago
ansuz
aee51f1317
lint compliance
7 years ago
ansuz
447b0a74ee
handle errors for videos when uploading
7 years ago
yflory
30a69fae13
Add thumbnails for videos
7 years ago
yflory
21f8ae7570
Keep the correct ratio for image thumbnails
7 years ago
yflory
2dd3c42fd5
Fix handlers registered again on reconnect in drive and poll
7 years ago
yflory
a0bcb901d3
Add titles in poll when options or usernames are overflowing
7 years ago
yflory
74985fd0f2
Use text for the addUser button in polls
7 years ago
ansuz
6db5a34323
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
c17fc2efe7
improve option order in poll
7 years ago
yflory
2be22867c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
13718d0263
Fix recent pads in chrome
7 years ago
ansuz
2e5fdf709a
Merge branch 'soon' into staging
7 years ago
ansuz
de8339fea7
hide alertify when you are in presentation mode
7 years ago
Caleb James DeLisle
9b02b36724
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
d7e9498143
Fix and then disable the new OT
7 years ago
ansuz
288e141c1f
add missing sframe method
7 years ago
yflory
c1d05a00ba
Improve media-tag export in pad to work with existing CSP
7 years ago
yflory
3e4faf1be1
Add new state messages in the toolbar
7 years ago
yflory
6d080bcb45
Ability to export mediatag images in pad
7 years ago
yflory
a0dd867f33
Fix pending state not removed after friend invite rejected
7 years ago
yflory
c25be21138
Fix the upgrade button in the drive
7 years ago
Caleb James DeLisle
cc6b2192e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
a3c7aa67d8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
094856a511
Fix renaming pad with multiple dots in the name in drive
7 years ago
ansuz
bf832ba784
fix comment overflow
7 years ago
yflory
7bc2f81852
Fix pinned column not always stored in polls
7 years ago
yflory
88e7f9a218
Add last access and creation times in the properties window in drive
7 years ago
yflory
22e3baed4b
Fix sort issues in drive
7 years ago
yflory
f43606f71d
Present mode to display only the parsed markdown in code
7 years ago
yflory
515214aed1
Use present mode in embed code
7 years ago
yflory
201c974df6
Merge branch 'thumbnails' into staging
7 years ago
yflory
7b8490ad20
Use less2 in contacts
7 years ago
yflory
dd63cd13d7
Fix profile page title
7 years ago
Caleb James DeLisle
81d0b3272d
Fix multiple infinite-spinner errors piling up on top of eachother
7 years ago
Caleb James DeLisle
9e4c48f537
lint errors
7 years ago
Caleb James DeLisle
a149152f11
Merge branch 'staging' into framework
7 years ago
yflory
4197b7b968
Fix missing icon in list mode for files with thumbnail
7 years ago
yflory
d941b1098a
Remove selection in whiteboard when uploading to the drive
7 years ago
yflory
4116d08dd1
Display thumbnails in the drive and then file picker
7 years ago
yflory
6920129126
Embed images from the drive in whiteboard
7 years ago
MacLemon
867b971c33
Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections.
7 years ago
yflory
2fd120100a
Merge branch 'wb' into staging
7 years ago
Caleb James DeLisle
15337603bb
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
a6b34491fc
freeze the editor when reconnecting
7 years ago
Caleb James DeLisle
854c1e94a4
make infinite spinner error message go away if ChainPad settles after it has been popped
7 years ago
yflory
a859ab081a
Fix fouc in drive
7 years ago
yflory
7b6432f134
Lint
7 years ago
yflory
6926d42292
Autoload template picker to make it faster to appear when used
7 years ago
yflory
1c8e1a36e8
Add file type in the pad attributes for existing files
7 years ago
yflory
b86f8e3f26
Fix uloaded files not moved to the correct folder in drive
7 years ago
yflory
88d0a2b8a6
Merge branch 'master' into staging
7 years ago
yflory
5ed60a0ad7
Fix image ratio in slides
7 years ago
Caleb James DeLisle
753e2d797e
Merge branch 'staging' into framework
7 years ago
yflory
62bc72847f
Add an error message when trying to tag a deleted pad
7 years ago
Caleb James DeLisle
c773b5d076
Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed
7 years ago
yflory
69dd3a60ab
Hide template and fileupload buttons for anonymous users
7 years ago
yflory
8e1f15e88d
Get title suggestion based on poll's description
7 years ago
ansuz
e317265594
Merge branch 'master' of github.com:xwiki-labs/cryptpad
7 years ago
ansuz
0d912402e5
patch for bug in Firefox ESR
7 years ago
yflory
91381ca77d
Fix lint errors
7 years ago
yflory
50090a3af6
Add placeholders for the comment form in poll
7 years ago
yflory
95ad25973e
Ability to delete a stronger pad from readonly mode
7 years ago
yflory
b28c1537e8
Fix history in readonly mode
7 years ago
yflory
620ba4ed5d
Fix fouc in drive
7 years ago
yflory
b31bbebf7b
Buttons are missing in whiteboard when zoomed in
7 years ago
yflory
a5a08176fb
Merge branch 'master' into staging
7 years ago
yflory
54b5a2d654
Fix style issues in poll (Chrome)
7 years ago
yflory
86767184da
Fix style issues in poll for Edge
7 years ago
yflory
00e8d32d60
Fix column position in poll for Chrome
7 years ago
yflory
b110e1b8da
Fix style issues in poll for Edge
7 years ago
yflory
ecb537ac7f
Move code to render.js in poll
7 years ago
yflory
75b3ff9c60
CSS issue in polls
7 years ago
yflory
c46280d032
Fix style issues for Edge
7 years ago
ansuz
128c9c2f4e
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
7 years ago
ansuz
f0bdc3b26f
second try
7 years ago
ansuz
d50a692986
add note about tags to prompt
7 years ago
Caleb James DeLisle
c8928a0811
Switch the transform function and also stop calling textPatcher without the metadata
7 years ago
yflory
035150614d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
484e216054
Fix hashtag button in the toolbar
7 years ago
yflory
4c19375f4d
Avoid missing characters in poll's inputs
7 years ago
ansuz
a12239405b
fix toolbar 'home link' to visit home page from drive
7 years ago
yflory
dd141b5c9f
Disable comments when a poll is not published
7 years ago
Caleb James DeLisle
36aee2d174
lets try normalizing the dom before applying a patch
7 years ago
Caleb James DeLisle
828a685ba8
Fix broken browser fight logging
7 years ago
yflory
aa744567ed
Fix thumbnails in sframe apps
7 years ago
yflory
5e7bf0cfb8
Embed an image in whiteboard
7 years ago
Caleb James DeLisle
f0eb58ee95
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
9509d538e0
Cursor not being updated at the right times before applying a patch.
7 years ago
yflory
888028c542
Lint
7 years ago
yflory
e5a54b5978
Fix folder highlighting with drag&drop in the drive
7 years ago
yflory
1c7c37c121
Add the file class to pads in 'template' and 'recent' categories in the drive
7 years ago
yflory
ab3648a30a
Merge branch 'newpoll' into staging
7 years ago
yflory
1c4f1c785d
Improve stability and UI in poll and its comments
7 years ago
ansuz
7559bc062e
lint compliance
7 years ago
ansuz
503111d26a
use recompiled media-tag
7 years ago
ansuz
427afc3954
override modified file name in pdfjs
7 years ago
ansuz
d85db64939
add tags from drive
7 years ago
Caleb James DeLisle
0aecfad854
Occasionally the language selector only says "Mode" rather than the language
7 years ago
Caleb James DeLisle
ae87320408
Preview pane cannot be resized after it has been hidden and then shown again
7 years ago
ansuz
1f35798194
stop event propagation from tag prompt
7 years ago
ansuz
c936e5ae73
make context menu open correct app on correct port
7 years ago
Caleb James DeLisle
d9e97b86e6
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
383c2f54cb
1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.
7 years ago
ansuz
deed04108b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
a90c078e84
correct reference to undefined
7 years ago
yflory
26dfc65c25
Comments in polls
7 years ago
yflory
5304dc319f
Enable redirection to the previous page after registration
7 years ago
yflory
ceb8ff18bd
Fix ghost icon in drive
7 years ago
yflory
846b1a9fb3
Improve description UI in poll. Enable tags and mediatag
7 years ago
yflory
68bda92291
Use codemirror for description in poll
7 years ago
ansuz
b8ce149db6
add hint about tag usage
7 years ago
ansuz
f15ec4efe9
add tagging to whiteboard and file apps
7 years ago
ansuz
f90742603e
style fixes
7 years ago
Caleb James DeLisle
d6570ad9f2
Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click.
7 years ago
yflory
707d3b3e94
Ability to export polls as csv
7 years ago
yflory
5cf86bf74a
Update UI in poll and remove old code
7 years ago
ansuz
09c0a473e2
fix function signatures
7 years ago
yflory
3337689630
Wrong translation key in toolbar
7 years ago
Caleb James DeLisle
94d2f4472b
Stop using presentSuccess because it is hidden behind the modal in slide
7 years ago
yflory
126742a1c3
Fix bugs in sframe poll and update UI
7 years ago
ansuz
351b95d6a9
resolve merge conflicts
7 years ago
ansuz
6c7b135f91
lint compliance
7 years ago
ansuz
94c392b79f
secure messaging
7 years ago
Caleb James DeLisle
53f65f6a87
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
fa6938baa8
1. Migrated /slide/ to use framework
...
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
7 years ago
Caleb James DeLisle
1e5bc5da14
onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer
7 years ago
Caleb James DeLisle
7230c780a1
Get rid of last usages of cryptpad-common in pad/inner
7 years ago
Caleb James DeLisle
12e82e80ec
When changing the title of a presentation, the title in the bottom of the slide should also change
7 years ago
ansuz
0a99478d9f
catch diffdom errors and plow through
7 years ago
ansuz
0f9e93e1de
make tests pass again
7 years ago
ansuz
48c49e5a75
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
19e58cec94
prevent typeError
7 years ago
yflory
66da349ee4
Sandboxed Poll app with less2
7 years ago
Caleb James DeLisle
f95acda758
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
7 years ago
Caleb James DeLisle
6dbc02e81a
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
1c791b5b51
Fix framework by removing some async and also fix media tags
7 years ago
Caleb James DeLisle
90d00c10b1
Make metadata-manager a bit more robust
7 years ago
yflory
9b2251005c
Merge branch 'staging' into newpoll
7 years ago
yflory
8de1852ab9
Lint compliance
7 years ago
yflory
2c10f9b07b
Merge branch 'staging' into newpoll
7 years ago
yflory
e02a779c14
Use secure drive as default drive
7 years ago
yflory
b4de31c827
Merge branch 'newdrive' into staging
7 years ago
yflory
c1275b5671
Prepare secure poll
7 years ago
yflory
4c394e0031
Fix UI issue in poll
7 years ago
Caleb James DeLisle
342b6012f7
manual merge of staging into framework
7 years ago
Caleb James DeLisle
cf6030ab8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
e62c5e1d07
Add some debugging lines to help synthesize error cases
7 years ago
ansuz
9571b3c018
persist whiteboard content across sessions
7 years ago
ansuz
748172585e
update for modified id
7 years ago
ansuz
4cd7d8eda4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
345bfc1cea
Remove migration for pad attributes
7 years ago
ansuz
52be5501d6
remove invalid test
7 years ago
yflory
69014e5fde
Fix mediatags in pad not cached
7 years ago
ansuz
b3e066eaca
show loading screen tips during loading screen
7 years ago
Caleb James DeLisle
77fe6a9bba
small bug fixes
7 years ago
Caleb James DeLisle
1b01855dd2
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
1fd7a6e2b3
Mistake in mkEvent which makes all events only work once
7 years ago
Caleb James DeLisle
368a6b2406
manual merge, still wip
7 years ago
yflory
cdeac00633
Merge branch 'staging' into newdrive
7 years ago
yflory
a8eecee590
Fix access to undefined variable in drive
7 years ago
yflory
91e36171eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
138ad17e3e
Fix 'import local pads' in settings creating duplicates
7 years ago
yflory
59ad96e491
Make sure the user is redirected to the drive at registration
7 years ago
yflory
d2f1d0c0e9
Fix readme pad not added at registration in sframe drive
7 years ago
Caleb James DeLisle
ae54cbca33
Refactor sframe-cpnf-inner to export chainpad
7 years ago
Caleb James DeLisle
44018ee7e1
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
7 years ago
Caleb James DeLisle
b15527565c
Allow passing arguments when firing events
7 years ago
Caleb James DeLisle
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
7 years ago
Caleb James DeLisle
d9845d3450
Refactor sframe-cpnf-inner to export chainpad
7 years ago
Caleb James DeLisle
f418ee9632
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
7 years ago
Caleb James DeLisle
72f03b2a47
Allow passing arguments when firing events
7 years ago
yflory
1afbd4648d
Fix old drive
7 years ago
yflory
b871faffc9
Enable tags in code and slide
7 years ago
yflory
6aeb366767
Lint
7 years ago
yflory
0600ce59ec
Display the 'spinner' when typing in sframe apps
7 years ago
yflory
1d7683503f
Fix link origin in sframe upload table
7 years ago
yflory
92c808812a
Fix missing style in toolbar/less2
7 years ago
yflory
deba699d08
Remove old style for sframe drive
7 years ago
yflory
4049931924
Lint
7 years ago
yflory
c364377d7c
Use less2 in sframe drive
7 years ago
yflory
47fe7b1c53
Drive in sandboxed iframe
7 years ago
yflory
dfdeb7b113
Fix style and race condition for history mode
7 years ago
yflory
a810d7bd85
Fix style and race condition for history mode
7 years ago
yflory
456370b1aa
Base for Drive in sandboxed iframe
7 years ago
ansuz
95302366d1
lint compliance
7 years ago
ansuz
68f7d4bc0a
more conformant tagPrompt behaviour
7 years ago
ansuz
db4c3e7e2c
Merge branch 'master' into staging
7 years ago
ansuz
b5b84f540e
fix preview mode class
7 years ago
ansuz
f990200996
drop any notion of crypto from sframe-listmap
7 years ago
ansuz
a1c124f1be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
95542bcdaf
Lint
7 years ago
ansuz
c9223cb942
listmap does not care about 'readOnly' mode anymore
7 years ago
yflory
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
8a09e39f46
Enable tags in pads
7 years ago
ansuz
d2b27f3588
resolve merge conflicts
7 years ago
ansuz
4af01e6e9e
make listmap consume cpNfInner
7 years ago
yflory
72f0952835
Make sure we can't open a pad using the wrong app
7 years ago
yflory
35a313d6ee
Make palette realtime
7 years ago
yflory
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
3023e8c855
Fix templates in whiteboard
7 years ago
yflory
732585ea7b
Sandboxed iframe for the whiteboard app
7 years ago
ansuz
029a8e3023
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
d72146ba7f
use setAttribute for assigning attributes in hyperscript
7 years ago
yflory
a78b597ebb
lint errors
7 years ago
yflory
8ce364a252
Add a button to empty the trash in the drive
7 years ago
yflory
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
7 years ago
ansuz
f9d27d2783
WIP secure contacts
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
yflory
018f71df04
Add drop handlers for mediatags in ckeditor
7 years ago
yflory
c00d295466
Add missing translations
7 years ago
yflory
a927f40f02
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
974658453c
Mediatag integration in pads
7 years ago
ansuz
08e0ae424d
log errors in less compilation
7 years ago
ansuz
15db6b180c
copy bug fixes from changes
7 years ago
ansuz
5b45e92250
delete range requests after they have completed
7 years ago
ansuz
4f6909fce3
set icon to 'faded' styles
7 years ago
ansuz
086d4bae32
clean up contacts initialization
7 years ago
yflory
96d0456f31
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
1091e0b375
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
47ce645897
implement slice
7 years ago
ansuz
a8f7beb20b
remove deprecated apps
7 years ago
ansuz
6ed4f2fc64
fix a thing
7 years ago
ansuz
8a564bf350
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
513f8e73d4
refactor cryptpad.ready to use nthen
7 years ago
yflory
c50c297490
Fix the size of the loading screen for the filepicker
7 years ago
Caleb James DeLisle
b643ccc232
typo
7 years ago
Caleb James DeLisle
652c916690
change the command in the documentation so that it will not change itself
7 years ago
Caleb James DeLisle
5f0383ae99
update version of sframe-boot because it was changed
7 years ago
Caleb James DeLisle
845f75f8a7
remove a 100ms dead spot from page load
7 years ago
Caleb James DeLisle
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
7 years ago
Caleb James DeLisle
8a32b72ffc
1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released
...
2. change loading.js to use packaged css in order to get the loading screen up as quick as possible.
3. change LessLoader to cache less in cryptpadCache
7 years ago
ansuz
4d688289cc
lint-compliance
7 years ago
ansuz
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
47cfa0cf45
Focus the editable content when opening a codemirror pad
7 years ago
ansuz
f039fc7ff5
develop a system for avoiding z-index problems
7 years ago
yflory
bafa401473
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
fa64adbbe5
Hide visible elements while loading the slide app
7 years ago
ansuz
fbd4be6135
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
ab64bf9e59
Use less2 for the loading screen
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
ansuz
a332168926
fix some bugs in prompts, alerts, confirms
7 years ago
ansuz
0db33d48fc
properly handle variable args in Cryptpad.alert
7 years ago
ansuz
8a87ec180e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
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
d46cc8226d
Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs
7 years ago
ansuz
dc86579d46
use an 8 character password for tests
7 years ago
ansuz
e1f090bb9d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
244e3ecba7
support forefront flag in alert config
7 years ago
Caleb James DeLisle
63cb5dfc1e
Make less loader rewrite urls to use version parameter
7 years ago
Caleb James DeLisle
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
e3c0ec29f7
Hopefully chase out a race in sframe-channel
7 years ago
yflory
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
437f50fd4a
Migrate the file to a sandboxed iframe
7 years ago
Caleb James DeLisle
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
7 years ago
yflory
5ac3e97dc8
Merge branch 'master' into staging
7 years ago
yflory
7d720c73a9
Merge branch 'soon'
7 years ago
yflory
ddbda08c88
Fix an issue when cleaning the template category in the drive
7 years ago
ansuz
9d229b8868
lint compliance
7 years ago
yflory
5b3667fd4e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
63700cb791
Fix an issue when cleaning the template category in the drive
7 years ago
ansuz
a87ccdc37e
remove redundant lines
7 years ago
ansuz
da0e31fa54
guard against possible type errors
7 years ago
yflory
0f9da69185
Show if a pad has been renamed in the drive
7 years ago
ansuz
499b5ea2ba
warn that a password is too short before doing anything else
7 years ago
ansuz
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
7 years ago
Caleb James DeLisle
a74915ab58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
671c893e8a
Duplicating code like a moron, this should hopefully get fixed later.
7 years ago
yflory
5a4836fe6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
79094aa4bb
Fix closing the title input when the title is not modified
7 years ago
ansuz
58c38dd77b
focus on the current window when you pop an alert
7 years ago
ansuz
b9545f45f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
306fec2d0e
improve messages for template picker confirm
7 years ago
ansuz
1943c83f69
clean up api for Cryptpad.confirm
7 years ago
Caleb James DeLisle
8d3ebdbaf7
I'm stupid
7 years ago
Caleb James DeLisle
041071e61c
manual merge
7 years ago
Caleb James DeLisle
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
7 years ago
yflory
9271b0c1a8
Try to fix half-codemirror bug
7 years ago
yflory
304a8df808
Remove unneeded migration and fix attributes migration
7 years ago
ansuz
5a1abc8986
let's try using actual js syntax
7 years ago
ansuz
134c6057c1
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
7 years ago
ansuz
59d25b4c1a
use camel case, not snek case
7 years ago
ansuz
520b8967fd
allow people with short passwords to log in
7 years ago
yflory
8ef27dca08
Lint
7 years ago
yflory
1aef844fc3
Fix title attribute for truncated titles in the drive
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
51f1be9f7a
Improve the input style when renaming a folder in the drive tree
7 years ago
yflory
642511dc3b
Disable exiting present mode when in embed mode
7 years ago
yflory
403b62f131
Fix ghost icon modal and improve UI on mobile
7 years ago
yflory
757d0a2800
Save the state of CKEditor's toolbar (visible or hidden)
7 years ago
yflory
5bf966633c
Merge branch 'staging' into slide2
7 years ago
yflory
514bff7065
Add slide number in the title in slide2
7 years ago
ansuz
0ed6846e07
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
b5b9f931c7
don't use common-realtime
7 years ago
ansuz
32e8c8ef4b
implement alertify without alertify
7 years ago
ansuz
a302ee5d25
guard against undefined arguments
7 years ago
yflory
c3a07e879c
Merge branch 'staging' into slide2
7 years ago
yflory
fc069dac48
Ask the user before loading the template picker
7 years ago
yflory
05793c220c
Fix secure iframes on Edge
7 years ago
yflory
290d668ceb
Fix race condition preventing slide to work on Edge
7 years ago
ansuz
de5d925154
autoselect user href in settings
7 years ago
ansuz
e950ce74cb
focus on input when opening filepicker
7 years ago
ansuz
739903d511
don't check account usage if you aren't logged in
7 years ago
ansuz
bbf7ed3827
refactor drive to use dialog.selectable()
...
fix class on alertify-like boxes
7 years ago
Paul Libbrecht
1ae7076790
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
7 years ago
yflory
f2aaaa9751
Move slide to secure iframe
7 years ago
ansuz
809b56625d
refactor ui elements
7 years ago
ansuz
bca9ba66cb
enforce a configurable minimum password length when registering
7 years ago
ansuz
1958bca984
restore hashing screen in login and register
7 years ago
ansuz
fab6264ce6
use loading screen from pages.js
7 years ago
ansuz
e8298f165a
only display first letter of name if user has no avatar
7 years ago
ansuz
85003f7a23
lint compliance
7 years ago
ansuz
cca3c04d43
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
15e24ebe4f
ui for hashtag picker
7 years ago
ansuz
1b97996ef8
implement util.once
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
61b228db79
Fix double / when storing a file
7 years ago
yflory
8b2733e2da
Fix typo
7 years ago
yflory
c713b44a4a
Merge branch 'soon'
7 years ago
yflory
d98bbf7df9
Fix the pad app when cryptpad is in an iframe
7 years ago
yflory
3ca9f41290
Get embed code for pad and code
7 years ago
yflory
0bb6698399
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
e85b34f127
Add embed options in the secure pad hashes
7 years ago
ansuz
47ec959032
make sure contenteditable is not set in read only mode
7 years ago
ansuz
6a735b441f
use paul's print styles
7 years ago
Paul Libbrecht
e7de9229a8
Do not print toolbar and collaboration ( #178 ).
...
paul
7 years ago
ansuz
b3d5e04bb4
lint compliance
7 years ago
ansuz
3d2a2da74e
add listAllTags api
7 years ago
yflory
31a6881dba
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
305feebbbe
Fix scroll position when refreshing the drive tree
7 years ago
ansuz
0e8a26e8eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
1c50bb3f61
clear hung tooltips
7 years ago
yflory
53eb9bb541
Remove the logo from the filepicker loading screen
7 years ago
yflory
729c013af7
Get mediatag embed code from the file app
7 years ago
yflory
904936209a
Remove loading tips in the file picker
7 years ago
yflory
98cd69e53e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
204e45dfae
Enable templates in pad
7 years ago
yflory
4108520d20
Add contacts in the new menu if the user is logged in
7 years ago
ansuz
38e1ed93e4
Merge branch 'code2' into staging
7 years ago
ansuz
acaf45a0e0
drop thumbnails if metadata is too large
7 years ago
yflory
78b338c379
Merge branch 'code2' into staging
7 years ago
yflory
db86a2dbee
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
7 years ago
yflory
d2787e3eff
Make code2 the default code app
7 years ago
ansuz
4069945bc4
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
7 years ago
ansuz
d42d988d36
make test more resilient
7 years ago
ansuz
cd7b00d45b
make pixels 100px
7 years ago
ansuz
e8ac5ed87f
add a test for thumbnails
7 years ago
ansuz
b1a1f4ba13
add encrypted thumbnails to metadata for images.
...
correct decryption logic
7 years ago
ansuz
b8e913c95a
more thumbnail methods
7 years ago
ansuz
ffbb21dd2c
use cryptpad-september build of media-tag
7 years ago
yflory
c0f14dea5e
Store code2 and set the title at the first visit
7 years ago
yflory
86e23ac19f
Use less2 in secure iframes
7 years ago
yflory
f12f4bb925
Integrate filepicker secure iframe in the code2 app
7 years ago
Caleb James DeLisle
a164115e8c
Add media-tag-nacl to cryptpad so it will be hosted on the server
7 years ago
ansuz
1072e3e797
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
ae60b5845f
implement search-by-tag for filesData
7 years ago
ansuz
72ef730f23
implement tag-related functions
7 years ago
ansuz
0302c06d0e
send feedback if client does not support symbols
7 years ago
ansuz
52019dc763
make get and set pad attribute return only cloned data
7 years ago
yflory
89b7b644f3
Enable drag & upload in code2 and prepare filepicker
7 years ago
Caleb James DeLisle
e2719d9098
Add media-tag-nacl to cryptpad so it will be hosted on the server
7 years ago
yflory
885282ddea
Fix undefined friend
7 years ago
Caleb James DeLisle
a60709ff73
Infinite spinner popup leads to frame attempting to reload and failing
7 years ago
yflory
b8971cdc23
Add previewMode settings to code2
7 years ago
yflory
0d008aaa2e
Add indent settings to code2
7 years ago
yflory
f54dc7505c
Migrate indentation settings to a settings subobject
7 years ago
yflory
0893bcc0e5
Merge branch 'staging' into code2
7 years ago
yflory
f06683e949
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
0ce32464fd
Fix flickering avatar in firefox
7 years ago
ansuz
9a23b77b46
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
ba0e935add
stub localStorage, and handle errors that might come from touching localStorage
7 years ago
ansuz
be8ea4102e
keep trying to parse the hash until it works
7 years ago
yflory
4db4f66786
Remove an unnecessary fix for Safari
7 years ago
yflory
a2ed266048
Move the code app in a secure iframe
7 years ago
Caleb James DeLisle
1044531806
Fix Safari iframe size issue
7 years ago
ansuz
a34d1793e0
drop 'loading' text from loading screen
7 years ago
ansuz
595fa4c2e4
Merge branch 'soon'
7 years ago
ansuz
181a19a9a0
polyfill for array.fill
7 years ago
yflory
51fa6287c1
Enable notifications in secure pads
7 years ago
yflory
642dc17910
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
901917983b
Fix an issue preventing pads to be stored in the drive
7 years ago
ansuz
40f062abda
restore app usage report in new pad
7 years ago
ansuz
8fb7fef3f5
regular expressions are never falsey
7 years ago
ansuz
24eac9b4a6
test for flakey tests
7 years ago
ansuz
7d2a76f4d6
delete dead code. fix off-by-one for messages. turn off history button when history is exhausted
7 years ago
ansuz
288c03bb41
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
fe03e6ae83
bad code, lint
7 years ago
ansuz
430a6f7b77
lint compliance
7 years ago
Caleb James DeLisle
190dff1c9b
Use the bounce app for opening a link with the right click
7 years ago
yflory
dec870d2bd
Fix selection in the drive search results
7 years ago
yflory
4bceef8952
Fix the upload status table missing in the drive
7 years ago
yflory
0b4e044540
Fix the plugin to open a link in a new tab in pad
7 years ago
yflory
d9a4a32bf9
Fix avatar for anonymous users in secure pads
7 years ago
yflory
00fda0d7d7
Fix avatar in read-only mode (secure pads)
7 years ago
yflory
88cb4fd83c
Enable friend requests from secure pads
7 years ago
yflory
147d88d845
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
e43c68aa48
Fix viewers number in secure iframe
7 years ago
yflory
f89015d9ed
Update the tab title to match the pad title in pad2
7 years ago
ansuz
1280cd1659
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
51c065d13c
Fix link to main in the new toolbar
7 years ago
yflory
d9bf2abcd8
Fix old hashes not working anymore in pad
7 years ago
ansuz
536fe04790
emit notification when alert, confirm, or prompt are called
7 years ago
Caleb James DeLisle
e4a356d873
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
056285a7b6
Move pad2 to pad and create bounce app
7 years ago
yflory
d4589c4699
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
6c65e5ff72
Fix the ghost icon in the drive and add missing text
7 years ago
ansuz
5fbbaee2f5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
6314487d98
handle unfriends in ui
7 years ago
ansuz
5c2b58e703
log error synchronously so we get a trace when pinPads has no callback
7 years ago
ansuz
841e3af8da
handle unfriends. clean up. better input validation
7 years ago
ansuz
c66a0c55e0
ensure that function signatures are correct
7 years ago
ansuz
91f6e3e543
remove a lot of dead code
7 years ago
Caleb James DeLisle
e62faf7c7b
Edge fix, always use async iframe onLoad rather than invoking it manually
7 years ago
ansuz
54eefd3d94
replace contacts with contacts2
7 years ago
ansuz
57d0c6c973
Merge branch 'new-messaging' into staging
7 years ago
ansuz
9e04d039d7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
22d754d514
handle user renames
7 years ago
Caleb James DeLisle
0a6f81850f
Handle infinite-spinner errors and properly inform the user
7 years ago
ansuz
a99eb9365e
correctly set indentation preferences when changing languages
7 years ago
ansuz
f58d4c941f
clean up a bit
7 years ago
ansuz
ea5f47f0f9
remove some TODOs and solve some wee bugs
7 years ago
ansuz
b75a951a98
encode messages with 'author' field instead of 'channel'
7 years ago
Caleb James DeLisle
7bbea28831
minor anti-xss changes...
7 years ago
ansuz
013b75ae67
implement history range requests
7 years ago
ansuz
b71f1860db
make uid function reusable
7 years ago
ansuz
443d8a8941
remove unnecessary files
7 years ago
Caleb James DeLisle
75fde58846
Well that was stupid... (fix bug introduced in acfaaa7d56
when trying to make jshint compliance)
7 years ago
Caleb James DeLisle
dc283c2d74
Load 1, load 2... not load 1, load 3.
7 years ago
Caleb James DeLisle
5d9599c9b7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
cbac5e417c
Make loading screen come much earlier on pad2
7 years ago
yflory
b6881349be
Fix an issue with the notifications in secure pads
7 years ago
yflory
ec64ac485d
Fix 'not a function' error
7 years ago
Caleb James DeLisle
acfaaa7d56
jshint compliance
7 years ago
Caleb James DeLisle
2ad9fcee17
Manual merge of notify.js
7 years ago
Caleb James DeLisle
8a9755611a
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
Caleb James DeLisle
2dacd57e76
fix caching on favicon
7 years ago
yflory
33025a9df9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
c33b128bf4
Enable feedback in pad2
7 years ago
yflory
e81bb3fe08
Fix profile link in the userlist
7 years ago
yflory
d6c33fdf4f
Ghost icon to add a pad
7 years ago
ansuz
89a13d4b21
work on contacts2 until feature parity is reached
7 years ago
ansuz
002eed0d6f
make most of the messenger api async
7 years ago
Caleb James DeLisle
d9f5e3638e
Big caching improvements :D
7 years ago
yflory
98daf10ed1
Ability to collapse the root directory in the drive
7 years ago
yflory
b4864b96ac
Add a recent pads category in the drive
7 years ago
Caleb James DeLisle
4f3b4a30ee
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
Caleb James DeLisle
4b70fc9f49
Use resources from the original origin in pad2
7 years ago
yflory
20a68ad71c
Hide the template button if the pad2 is a template
7 years ago
yflory
aa9e0d3cd3
Enable AppConfig in pad2
7 years ago
yflory
4089803785
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
f40d2c0b20
Add templates to pad2
7 years ago
yflory
8d020833af
Add missing file
7 years ago
Caleb James DeLisle
bffa4d01a8
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
Caleb James DeLisle
b081603455
Update requirejs
7 years ago
yflory
8d837d22ea
Add history to pad2
7 years ago
yflory
b2e6df1f9d
Add import & export in pad2
7 years ago
yflory
1da11a1883
Disable edition in readonly mode in pad2
7 years ago
yflory
e2d39de143
Forget button in pad2
7 years ago
yflory
e4020ba8d4
Fix pad creation in pad2
7 years ago
yflory
140c6f3776
Add limit warning in pad2
7 years ago
yflory
30aef71603
Enable avatars in pad2
7 years ago
yflory
f88a6f63fe
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
fb4808e1e1
Fix queries callback arguments
7 years ago
Caleb James DeLisle
6dd1643738
Manual merge work done on loading page to pad2
7 years ago
Caleb James DeLisle
8b702e0150
wip
7 years ago
yflory
e65b2f4e9f
Add shareButton to pad2
7 years ago
yflory
beb45740d0
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
90f892de9c
Useradmin menu, notifications and share button in pad2
7 years ago
ansuz
253ab68d8d
Merge branch 'staging' into new-messaging
7 years ago
Caleb James DeLisle
498c8229e9
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
7 years ago
ansuz
0693a98890
create a thumbnail when uploading images from whiteboard
7 years ago
ansuz
b17044ad98
add support for thumbnails in metadata
7 years ago
yflory
dd9b38066e
Change display name in useradmin menu
7 years ago
yflory
a96d447e8b
Add notifications in pad2
7 years ago
Pierre Bondoerffer
5e22e1dc59
use CryptPad instead of Cryptpad in titles
7 years ago
Caleb James DeLisle
cf6d8c83b2
Fix title setter logic and separate it from UI
7 years ago
Caleb James DeLisle
ec87f3f897
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
Caleb James DeLisle
415399ef64
Changes to support title change in metadata
7 years ago
yflory
d1affebd14
Title in pad2
7 years ago
yflory
604415b32c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
fab3d67b75
Enable title in pad2
7 years ago
Caleb James DeLisle
909bda4302
This should fix laxy metadata
7 years ago
ansuz
a4dbf39c4a
fix pdf display problems in chrome
7 years ago
Caleb James DeLisle
2490ee253f
Added setDisplayName RPC
7 years ago
yflory
887a26b1a6
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
Caleb James DeLisle
0b34ceb0eb
Added RPC setPadTitleInDrive()
7 years ago
ansuz
bed7d95bf3
use latest compiled cryptpad media-tag
7 years ago
ansuz
4e62f79594
stop referring to deleted file as background image
7 years ago
ansuz
3a5526e247
infer pdfjs document title from iframe url
7 years ago
yflory
25466aa2f9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
1d237735ef
Useradmin menu in pad2
7 years ago
Caleb James DeLisle
3b5af3ea74
sframe common changes
7 years ago
yflory
d1157c4d72
Add missing file
7 years ago
yflory
d237c76f6c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
f5855a2870
Add account name in metadata manager
7 years ago
Caleb James DeLisle
3c0197cbf4
Firefox fails to boot the iframe if there is no number on setInterval
7 years ago
yflory
d88704fb50
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
Caleb James DeLisle
a4850a7fcc
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
fc5bdd3bed
Add lazy metadata to fix parse errors in pad2
7 years ago
Caleb James DeLisle
ad9f2ff223
Made pad2 server more generic and easy to implement
7 years ago
ansuz
a125253cde
lint compliance
7 years ago
ansuz
290763d6c5
don't complain about bad realtime state just because you disconnected
7 years ago
yflory
226ef1fd00
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory
fb512c8923
Toolbar in pad2
7 years ago
ansuz
3b20dcd435
add optional cache-busting to favicon
7 years ago
ansuz
52d344c3d1
Merge branch 'soon'
7 years ago
ansuz
ee874878dd
clear tooltips when the userlist is redrawn
7 years ago
ansuz
f207edfd28
handle errors when deriving keys. fix incorrect reference
7 years ago
Caleb James DeLisle
e04c0b89a1
manual merge of staging
7 years ago
ansuz
5b7d1cccd7
fix display and logic for tab setting checkbox
7 years ago
Caleb James DeLisle
3315449114
Lets try this...
7 years ago
Caleb James DeLisle
4c949a61e7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
6b174934c8
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
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
2874ccb5dc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
2a8abc2699
comment out splitter code
7 years ago
Caleb James DeLisle
725e19925c
Yeah, that was silly...
7 years ago
Caleb James DeLisle
b0b1ed037c
Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
7 years ago
ansuz
130b330ede
refactor messaging
7 years ago
Caleb James DeLisle
638a94785f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
7ca60e55a7
Lock the pad's inner-iframe down with CSP
7 years ago
ansuz
5e6e76dfc1
make regex case insensitive
7 years ago
ansuz
736288a85b
lint compliance
7 years ago
ansuz
5037f444e9
update markdown sanitization strategy
7 years ago
Caleb James DeLisle
878a565f89
tiny little performance improvement in something that really doesn't need it
7 years ago
Caleb James DeLisle
007db0b080
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
7a698d092e
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
7 years ago
ansuz
66cacf08da
allow users to write with tabs instead of spaces
7 years ago
ansuz
64849507b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Pierre Bondoerffer
a5f9b49bfb
make poll box bigger so it show text in smaller windows
7 years ago
Pierre Bondoerffer
82fadde249
restyle info-box in drive
7 years ago
ansuz
958294f109
put code settings in their own tab
7 years ago
Pierre Bondoerffer
c8d7675ede
remove z-index on splitter in code
7 years ago
Pierre Bondoerffer
17b986a6ca
fix toolbar drive link (oops)
7 years ago
ansuz
ae0b2ca1a8
add label for code indentation
7 years ago
ansuz
284124a32d
WIP
7 years ago
Caleb James DeLisle
4acd9957a9
Set the url if there is none
7 years ago
Caleb James DeLisle
33e73dd5e5
fixed one last fight
7 years ago
Caleb James DeLisle
9c0b0cc6a8
Merge branch 'staging' into pad2
7 years ago
Caleb James DeLisle
1e56fa31c0
yay, they talk and they don't fight
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
Caleb James DeLisle
b3d349bf80
Merge branch 'staging' into pad2
7 years ago
Caleb James DeLisle
8efac4e661
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
Caleb James DeLisle
0dde1d7507
wip
7 years ago
Pierre Bondoerffer
baf64114a6
point to homepage in drive
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
Caleb James DeLisle
c304071492
wip
7 years ago
Caleb James DeLisle
e49a42db18
Merge branch 'staging' into pad2
7 years ago
Caleb James DeLisle
1f9bd866c3
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
Pierre Bondoerffer
edad5deeac
fix logo not showing sometimes in chrome
7 years ago
Pierre Bondoerffer
c036bb26be
use proper bootstrap class
7 years ago
Caleb James DeLisle
52565076b9
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
Caleb James DeLisle
4b25ab80d6
wip
7 years ago
Pierre Bondoerffer
b34e252eda
improve whiteboard styles
7 years ago
ansuz
844967a880
continued refactoring
7 years ago
Pierre Bondoerffer
8b2cb37c2f
improve poll looks
7 years ago
Pierre Bondoerffer
5821d3e72f
remove useless title
7 years ago
Pierre Bondoerffer
a4aeada585
make the file dialog placeholder visible, center file list
7 years ago
Pierre Bondoerffer
d47e26efd5
add margin in code
7 years ago
Pierre Bondoerffer
e08ed72653
generate the tooltip after the button
7 years ago
Pierre Bondoerffer
665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended
7 years ago
Pierre Bondoerffer
34ba673cd3
improve file upload UI
7 years ago
ansuz
34a5a32c44
lint compliance
7 years ago
ansuz
cdf3cee9c8
split out message rendering into ui
7 years ago
ansuz
fcdfa52aa9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
58b3b32cc3
big messaging refactor. split UI from logic
7 years ago
Pierre Bondoerffer
6ca6755d02
more missing titles in toolbar
7 years ago
Pierre Bondoerffer
2cc6c636db
Add some missing titles
7 years ago
Pierre Bondoerffer
d3f2398865
bump tippy to 1.2.0, add dynamicTitle option
7 years ago
ansuz
8301bd44be
Merge pull request #164 from pbondoer/staging
...
UI improvements
7 years ago
Pierre Bondoerffer
85e383d5c5
add invisible splitter
7 years ago
Pierre Bondoerffer
90075cd48e
media-tag to less file
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
Pierre Bondoerffer
f585ddccdf
fix image sizes in /slide/
7 years ago
ansuz
fc95f1b6a8
lint compliance
7 years ago
ansuz
ba9696ba33
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
a612f02be2
Merge branch 'staging' into pad2
7 years ago
ansuz
c63807fd2b
implement channel.send
7 years ago
Caleb James DeLisle
35a55a15ed
wip
7 years ago
ansuz
d835005905
simplify in-memory message format
7 years ago
Pierre Bondoerffer
8f285eba9f
make file picker ui even prettier
7 years ago
ansuz
797cc2b105
handle messages which fail to decrypt
7 years ago
Caleb James DeLisle
65dfd99171
major wip
7 years ago
Pierre Bondoerffer
c53e738054
improve file picker ui
7 years ago
Pierre Bondoerffer
798a3dc520
automatically fill in display name in poll
7 years ago
Pierre Bondoerffer
0588564bc9
overflow on poll div
7 years ago
Pierre Bondoerffer
be29236af1
fix pdfjs styles
7 years ago
ansuz
bad5160885
fix bad reference
7 years ago
ansuz
05aa5ed347
hide new feature until it is finished
7 years ago
ansuz
395f6e1b27
reset confirm text for alertify
7 years ago
ansuz
dd6a057962
add 'msg' class for pierre
7 years ago
ansuz
9865359bb0
don't tell users about new versions
7 years ago
ansuz
c8c44d3bfc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
0d1f19f5d4
Big manual merge
7 years ago
Pierre Bondoerffer
f6d45d05f6
use logo in toolbar
7 years ago
ansuz
11c72499a0
don't add duplicate messages to the history
7 years ago
ansuz
fb13e656b7
get new messages when reconnecting
7 years ago
ansuz
52854c5a8e
ignore history range responses
7 years ago
ansuz
e786117110
get new messages when reconnecting and WIP get more history
7 years ago
ansuz
2ce341fed6
disable input field when disconnected
7 years ago
ansuz
aba4e34e7f
reuse inline styles as a mixin
7 years ago
ansuz
195cb01d72
better styles for messaging input
7 years ago
ansuz
1fac0b9bc4
make todo text bold
7 years ago
ansuz
66d81429bd
integrate file embed into code editor
7 years ago
ansuz
dc7db074e8
open pad links when clicking in readOnly mode
7 years ago
ansuz
71d88b156d
make empty profiles for users on first visit
7 years ago
ansuz
8b0831ac5d
save images drawn with whiteboard to your CryptDrive
7 years ago
ansuz
fe826133b3
make some markdown styles reusable
7 years ago
ansuz
35cf23ce2c
clear tooltips when redrawing the userlist
7 years ago
ansuz
4c6f8d71e1
don't invoke spinner if it does not exist
7 years ago
ansuz
311f709dc4
lint compliance
7 years ago
ansuz
c147d342a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
542d0cd17f
drop support for legacy pad list
7 years ago
Pierre Bondoerffer
93e007b52a
reduce png sizes
7 years ago
ansuz
1c238100c8
don't throw alerts in the middle of someone's presentation
7 years ago
ansuz
7cd42d5ff1
use provided clearTooltips function
7 years ago
ansuz
3fa010027c
implement clearTooltips
7 years ago
ansuz
a68a225d79
fix read-only synchronization bug
7 years ago
ansuz
9734a4db80
append new items to the top of the todo
8 years ago
ansuz
69eaccbdef
don't create empty todo entries
8 years ago
ansuz
e84edb2c2b
disable problematic tooltips
8 years ago
ansuz
9c07793d0d
remove tips on checkbox state change
8 years ago
ansuz
ba9cab762c
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
8 years ago
yflory
8e83501c72
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
8 years ago
yflory
459e0b3b16
CSS and bug fixes for todo
8 years ago
ansuz
d4ffa7903f
better popup logic
8 years ago
ansuz
0b81781f35
make the input bold
8 years ago
ansuz
2af96d74fc
automatically focus on the create todo form
8 years ago
yflory
77d6da841f
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
8 years ago
yflory
3da76e3ae8
Update style for the todo app
8 years ago
ansuz
85366f2368
use new translations
8 years ago
ansuz
d99d071716
WIP checkbox titles
8 years ago
ansuz
e6031c2209
slightly better styles
8 years ago
ansuz
8cfd8d3270
add translations for todo
8 years ago
ansuz
c390bdd518
resolve merge conflicts
8 years ago
yflory
0612a50ab4
Add fadein/fadeout when adding or removing a task
8 years ago
ansuz
082632048b
fix styles for very wide todos
8 years ago
ansuz
a15ff9ba2a
hide dates in todo
8 years ago
ansuz
f0581f2cf4
also style the whole box
8 years ago
ansuz
d7d7f212bb
add classes to style fake checkboxes based on checkstate
8 years ago
ansuz
304d37a334
use styled checkboxes
8 years ago
ansuz
b5603c89f0
add checkboxes to todos
8 years ago
CatalinScr
796bf89491
Update of the front-page
8 years ago
ansuz
4f63921fc9
better width styling on list. lint compliance
8 years ago
yflory
35635c3e2f
CSS fix for the todo app
8 years ago
ansuz
3efb9d21f5
pull in bootstrap. submit form on enter
8 years ago
ansuz
83f79a3883
slightly better styles
8 years ago
Nicolas Lemoine
180e643af9
Style of Todo App
8 years ago
Nicolas Lemoine
5083299e8a
Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo
8 years ago
Nicolas Lemoine
f67fb32bf1
Add, delete, display a task in Todo
8 years ago
ansuz
56514d7e17
add val api
8 years ago
Nicolas Lemoine
ac718b6dfa
Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo
8 years ago
Nicolas Lemoine
a61faebb2b
App Todo - Init and HTML
8 years ago
ansuz
522476a2a6
initialize data model and provide basic methods
8 years ago
yflory
4345fc0662
Todo app
8 years ago
Nicolas Lemoine
e3b9c03fc0
TodoApp - Init
8 years ago
Nicolas Lemoine
658b00814b
TodoApp - Style and translations
8 years ago
ansuz
a9a65e4ca9
remove unused code
8 years ago
ansuz
4b53e02f6c
oups
8 years ago
ansuz
2e3be27278
resolve merge
8 years ago
ansuz
dcf5719eaf
handle most of the boilerplate stuff
8 years ago
ansuz
0d43a84c2b
move example into another folder
8 years ago
Nicolas Lemoine
5c07eac4de
Change title and footer
8 years ago
ansuz
f5454f232a
pull in todomvc vanillajs example
8 years ago
ansuz
ae693ff5a7
lint compliance
8 years ago
ansuz
6622735db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
55cb0734e2
make bad state timeout configurable
8 years ago
yflory
469f49fc0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
a80b00a765
Move the file picker in common
8 years ago
ansuz
d44f0696af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
2d0635a409
use custom version of tippy
8 years ago
yflory
09793e0d7d
jshint
8 years ago
yflory
683769f30a
Fix tooltips
8 years ago
yflory
9633025afe
CSS for the removeHistory button in contacts
8 years ago
yflory
97f1bbedc5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
b9bba76b4e
Make the delay for tooltips configurable
8 years ago
ansuz
dd98e2222a
WIP erase chat history button
8 years ago
ansuz
128d5b2c6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
b22127f10c
add history removal
8 years ago
yflory
a5a73ce326
Fix print button in slide
8 years ago
yflory
3bd5f01e53
Fix slide ratio in preview mode
8 years ago
yflory
140964478e
Enter + shift key to add a new line in chat
8 years ago
yflory
331b4dddea
Clean debugging code
8 years ago
yflory
e26e041a5b
fix jshint errors
8 years ago
yflory
c33d2a2db0
New tooltips
8 years ago
yflory
88813aee02
Show that only html can be imported in pads
8 years ago
yflory
b56a782f01
Store the userlist state when it is closed using the icon
8 years ago
yflory
82c87144cb
Remove the friend request button when the request is sent
8 years ago
yflory
5ce49af57b
Make CryptDrive fast again
8 years ago
yflory
1dc98dcff1
CSS for the contacts input field
8 years ago
yflory
e2d031c76a
Add support for markdown syntax in contacts
8 years ago
yflory
cba113a2b0
Lint
8 years ago
yflory
91ebbdfdb4
View contact status
8 years ago
yflory
221a3b4fed
Fix duplicate leftside entries when disconnected in profile
8 years ago
yflory
22a28a8fd9
Fix undefined description in profile
8 years ago
ansuz
39fd0d0f5f
notify if you're focused on a conversation in a bacgkrounded tab
8 years ago
yflory
7540f12040
Fix profile creation button not centered
8 years ago
yflory
f719b34e09
Add tab notification in contacts
8 years ago
yflory
baf439648e
Add the contacts app in the dropdown menu
8 years ago
yflory
36d792874a
Fix initial text not removed in /contacts
8 years ago
yflory
3545a66320
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
743b87b70f
Add initial text in /contacts
8 years ago
ansuz
df0442c2bf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
eb4b5ca77c
stub history removal. coming soon
8 years ago
yflory
aa8181ab2b
Contacts app translations
8 years ago
yflory
73e32f273e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
009d01abde
Fix friend removal and update user data
8 years ago
ansuz
0cd94e2ba8
add title to contacts app
8 years ago
ansuz
f2320190b8
change friends url to /contacts/
8 years ago
ansuz
756b561bbc
lint compliance
8 years ago
ansuz
6306de5265
set avatar border-radius to 4px
8 years ago
ansuz
c452f25414
stub invite app
8 years ago
ansuz
1aecdeb075
fresh media tag build
8 years ago
ansuz
7114bfaa52
lint compliance
8 years ago
ansuz
9ef45fe9f1
add background-color to names in chat
8 years ago
ansuz
e2c17dbeb4
resolve conflicts
8 years ago
ansuz
0340b45f2c
migrate profile to include edKey. don't propose connecting to users with whom you are already friends
8 years ago
yflory
557f13f796
Unfriend and update username - beta
8 years ago
ansuz
7be1e249e1
add fa-share-alt to pad initialText
8 years ago
ansuz
96d2ff67e1
user-plus as icon for add-friend
8 years ago
ansuz
c3ba7cd792
fix race condition
8 years ago
ansuz
d0d38aa2a3
feedback on first visit
8 years ago
ansuz
9527a5def7
avoid a CSP error. silence pdfjs warnings
8 years ago
ansuz
9707433944
comment out debugging info
8 years ago
ansuz
7a225af11e
fix some minor slide navigation bugs
8 years ago
ansuz
575d4612f9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
eda9908c3b
prevent accessing attributes of null
8 years ago
ansuz
eeb2ee2d17
add clear channel rpc
8 years ago
yflory
8fb5762eea
Lint errors
8 years ago
ansuz
89af8e4472
fix funny off-by-one thing
8 years ago
yflory
ac684a8dc7
Use the APP toolbar in profile
8 years ago
yflory
2d509e3e25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
b3e225cb3b
Replace spinner by text and fix mobile UI
8 years ago
ansuz
f450a28d11
improve logic for guessing titles within code documents
8 years ago
ansuz
0483d15b8f
lint compliance
8 years ago
ansuz
c0cb5c4263
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
f4bca0f9c0
Modifications for latest media-tag
...
* use latest built media-tag
* include pdfjs and configure its path for media-tag
* check whether decryption events affect an avatar. crop it if so
8 years ago
ansuz
5b3cca58bd
modifications to handle latest media-tag
8 years ago
yflory
7f5c301734
Add display name in the settings useradmin menu
8 years ago
yflory
fb21a650ce
Lint errors
8 years ago
yflory
d09f5b70c7
Fix slides CSS
8 years ago
yflory
159ccc2866
Fix mediatag flickering
8 years ago
yflory
ce50dbf3ca
Hide the 'templates' list header if the category is empty
8 years ago
yflory
42075e4b5f
Make everything 16px and 32px
8 years ago
yflory
16d0527e92
Add a page title in drive, settings and file
8 years ago
yflory
5d5f936682
Hide the upload table in code
8 years ago
yflory
a0b14faf89
Fix the font in settings and drive
8 years ago
yflory
e732284845
Lint
8 years ago
yflory
112c4c85e5
Left menu in drive
8 years ago
yflory
8f5a244999
Replace mediatag markdown syntax by html. Enable file upload in /code.
8 years ago
yflory
9f9e593e0f
Lint
8 years ago
yflory
560671ae7d
Make avatars circle
8 years ago
yflory
125018c8c3
New settings page
8 years ago
yflory
c02fa39524
Make drive search bar blue
8 years ago
yflory
438e7e6cf9
Fix display name in useradmin (friends app)
8 years ago
yflory
e6188bfb63
Fix useradmin dropdown position
8 years ago
yflory
97d8d86395
Fix avatar in static pages
8 years ago
yflory
e8f3df5a46
Clean less
8 years ago
yflory
159d72f33b
Merge branch 'msg' into staging
8 years ago
yflory
8e2e8b1653
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
ff10c282d4
Avatar in the user admin button
8 years ago
yflory
be6ee672d3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
f0523a0153
Avatar in the user admin menu
8 years ago
ansuz
e10de1219b
feedback on view hash usage
8 years ago
ansuz
52eb8e307c
feedback for language used
8 years ago
ansuz
086e5909dd
Merge branch 'soon' into staging
8 years ago
ansuz
781974ec7c
center 'Create a profile' button
8 years ago
yflory
1c531ccd47
Pin the chat channels
8 years ago
ansuz
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
8 years ago
ansuz
29c6ed6e9b
hide slide arrows when there are no more slides in that direction
8 years ago
ansuz
c096872467
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
ansuz
eff27ff6c5
focus username button
8 years ago
ansuz
c60a71e210
add connect button and view profile button
8 years ago
ansuz
94f8e4b8a3
use validateKeys when instantiating object
8 years ago
ansuz
22fbc7e5d8
implement getter for public keys
8 years ago
ansuz
ecef970250
float connect button right because flex styles messed up the pencil icon
8 years ago
yflory
df103c4074
Messaging app
8 years ago
ansuz
f9a43d6570
select everything before file extensions in drive when renaming
8 years ago
ansuz
1c462d5c4a
use random token for feedback instead of date
8 years ago
yflory
21f1527c71
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
yflory
5c7441f82c
Display the friend list in the friend app
8 years ago
ansuz
fac715dd09
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
ansuz
4b23ef74d7
add support for curve message signing and curve validateKeys
8 years ago
yflory
a5e8f6ae81
Add friend app and fix avatar size
8 years ago
yflory
af31771e3a
Share a channel id, not a hash
8 years ago
yflory
852b2eaf1d
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
yflory
26a83003b5
Create an owned channel
8 years ago
yflory
5b5a7ab286
Hide the friend button when the resquest is accepted
8 years ago
ansuz
f02285d103
fix lowercased p
8 years ago
ansuz
5d96c68ad7
fix profile app display on chrome
8 years ago
yflory
de420de021
Fix the folder's path in the search results page
8 years ago
ansuz
d3bbdc27c0
lint compliance
8 years ago
ansuz
bce0b03ba4
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
ansuz
909e00bbc3
create a listmap object using public key crypto
8 years ago
yflory
96fde4e5ed
Add missing file
8 years ago
ansuz
df53166b37
implement and use prototype curve encryptors
8 years ago
ansuz
d293ba4d44
add support for invite hashes
8 years ago
yflory
37d5b0afb9
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
yflory
95e2efab89
Add to friend list
8 years ago
ansuz
e353627204
log users out if they do not have curve keys. add curve keys to object on registration and login.
8 years ago
ansuz
4016a95540
prototype invite app
8 years ago
yflory
465ef74f2b
Fix rpc
8 years ago
yflory
bf17ad3f1e
Friend button in the userlist
8 years ago
yflory
8dc8aa27ab
Lint
8 years ago
yflory
35e8c1a63b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
43ac71603c
Move pad attributes in pad data
8 years ago
ansuz
9f6ecea5d9
fix nacl reference error in media tag
8 years ago
yflory
3e802c2443
Fix overflowing content in profile
8 years ago
ansuz
dfad622b76
Merge branch 'soon' into staging
8 years ago
yflory
69f4ce2abd
Fix middle click on the drive button
8 years ago
ansuz
cbd9fc4076
Merge branch 'staging'
8 years ago
ansuz
3fe0baa956
disable pin limit caching
8 years ago
ansuz
9c1eaf9c1a
lint compliance
8 years ago
ansuz
fa06f9d413
fix minor bugs in poll
8 years ago
ansuz
90bcadd87b
Merge branch 'soon' into staging
8 years ago
ansuz
be7e7fec43
don't bypass warnings when registering
8 years ago
yflory
cab595f959
Fix duplicate folders in the drive
8 years ago
ansuz
42375190e6
style buttons for long titles
8 years ago
ansuz
c27c140130
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
ac8da0d52d
load codemirror in the correct context. fix selection events
8 years ago
yflory
789274fd4f
Fix font-size in slides
8 years ago
ansuz
7377d39b39
hide print button
8 years ago
ansuz
43b877ad27
fix styling on media tag download button
8 years ago
ansuz
1fd0ba488a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
04a28433ae
replace inner content of media tag download buttons
8 years ago
ansuz
f85af7ef4c
hide useless messages
8 years ago
ansuz
a59853f9c2
use new media tag
8 years ago
yflory
8cf694bea6
Lint
8 years ago
yflory
47c6c64b8a
Allow emojis in default avatars
8 years ago
yflory
ffd184d50e
Fix overflowing names in the new userlist
8 years ago
ansuz
92d88d1644
don't change allowed media types until we have media-tag scoping
8 years ago
ansuz
678986dac4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
fa2d857d70
Fix css issues with Safari
8 years ago
ansuz
efedfe0667
show preview pane by default in /slide/
8 years ago
yflory
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
1df5e6e855
Fix toolbar buttons for Safari
8 years ago
ansuz
8b0210baf1
hide useless error
8 years ago
yflory
991cb896bd
Fix avatar in /pad
8 years ago
yflory
70c9f3df75
Fix avatar size
8 years ago
ansuz
f09ae9b19c
jshint compliance
8 years ago
ansuz
4a9a564913
don't try to handle error thta never happens anymore
8 years ago
ansuz
b15aa3360a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
6ac056e314
make explicit file size RPCs unauthenticated
8 years ago
yflory
9b131dc49c
Fix CSS in the slide app
8 years ago
yflory
5694505719
Fix syntax highlighting
8 years ago
yflory
335898a4c7
Hack the drawer to close it when clicking outside
8 years ago
yflory
472a62730b
Fix profile creation and add a link to the profile app
8 years ago
yflory
f357ec32c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
b153dda6ff
Add avatars in the user list
8 years ago
ansuz
c2e153e8ed
more fouc fixes
8 years ago
yflory
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
568ce70afd
Add a spinner for the history and update history buttons
8 years ago
Caleb James DeLisle
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
Caleb James DeLisle
c25f2df721
Added caching versions to some of the images which are loaded by js
8 years ago
yflory
4ab82710ab
Remove the background color from the text-color button in the slide app
8 years ago
yflory
7e69d051c4
Lint errors
8 years ago
yflory
26193aeaa7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
b9320e6005
Toolbar improvements
8 years ago
ansuz
9e91739044
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
ecff05425f
feedback for slide printing
8 years ago
ansuz
75c2a1fd73
jshint compliance
8 years ago
ansuz
b8934c0b97
smarter redraws of drive/settings usage bar
8 years ago
yflory
5a3e9c785c
Fix ckeditor toolbar
8 years ago
yflory
cc5b7615ad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
ed0121d172
Lint errors
8 years ago
yflory
8abc94d37b
Replace folder images in the drive
8 years ago
ansuz
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
8 years ago
ansuz
b037cfbfdb
set usage tips relative to bottom of screen, not top
8 years ago
ansuz
1763cf72d1
tell anonymous users they can't upload
8 years ago
yflory
7a87775372
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
45f180955b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
56a25e1036
Small fixes for the new toolbar
8 years ago
ansuz
1179992a90
update feedback key name
8 years ago
ansuz
4a5f5de78c
restore missing stylesheet for poll
8 years ago
ansuz
bbf9916a91
fixes for file app
8 years ago
ansuz
39149a052b
add new feedback keys
8 years ago
ansuz
7a5c5ce0a3
load scripts asynchronously
8 years ago
ansuz
9b8866ed72
handle RPC_NOT_READY error for logged out users
8 years ago
ansuz
a9f8f42e3c
use minified less compiler
8 years ago
ansuz
fca1ef4d36
hide unstyled content until the loading screen is displayed
8 years ago
yflory
877c5a8d0e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
19ff8a345d
Avatar upload in the profile app
8 years ago
ansuz
5e56ad912e
remove the last bit of compiled css
8 years ago
ansuz
7a7307d560
fix logging when resetting
8 years ago
yflory
6c94605b9b
File upload in the profile
8 years ago
ansuz
7439bbaba2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
ed45814020
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
cfc5907237
remove unnecessary style rules
8 years ago
yflory
85d8eda847
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
176e47f394
Add the profile app
8 years ago
ansuz
1c1869a22c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
7de2683169
make all apps use clientside templates
8 years ago
ansuz
f232675cc9
create a favicon if it does not already exist
8 years ago
ansuz
3be6433fdf
send feedback on name changes
8 years ago
ansuz
bdca6b10c2
use templates in poll.js
8 years ago
ansuz
bb74935b08
allow pin limit caching to occur at api level
8 years ago
yflory
00a554ca0d
Fix the donate button style with the new toolbar
8 years ago
ansuz
e9bfaa9a60
compile less clientside. remove compiled css
8 years ago
ansuz
67a096a8a4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
7b37146034
don't let spacebar keyups propagate outside of the title
8 years ago
ansuz
9195c0cd12
is isOverPinLimit in toolbar
8 years ago
ansuz
fce0a37f50
cache pin data once retrieved from the server
8 years ago
yflory
8f2db44793
Remove getTitle from the file app
8 years ago
yflory
33ea8cb183
Make sure we don't call both the yes and no handlers in prompts
8 years ago
yflory
3076ade23a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
36ef4178dc
Remove the editable title from the file app
8 years ago
ansuz
51e06e68a7
don't change slides when navigating through history
8 years ago
ansuz
ffcbde4325
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
48ece55ed5
style fixes, and dynamic less compilation
8 years ago
yflory
38f568635d
Fix duplicate media-tag in slides when adding or removing a slide
8 years ago
yflory
ce44a8d351
Fix the backup button in anonymous drive
8 years ago
yflory
06a0590f73
New folder icons
8 years ago
yflory
cc341ca6d4
Lint error
8 years ago
yflory
0d4d104e08
Mobile support for the new toolbar
8 years ago
ansuz
b4b851959f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
61a891267f
more feedback
8 years ago
yflory
c1d2fa6b52
Unhack validateKey for the history mode
8 years ago
yflory
90cc3e6a5e
New userlist in the whiteboard app
8 years ago
yflory
2710279904
Use the new share button in the file app
8 years ago
yflory
5a48cba999
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
684269fdda
Userlist in polls
8 years ago
ansuz
35bfa1dce4
test client-side templates in whiteboard app
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
ansuz
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
115813c191
Merge branch 'new-templates' into staging
8 years ago
ansuz
3657e978fd
give main2.js a more sensible name
8 years ago
ansuz
118b83c420
make register and login user clientside templates
8 years ago
ansuz
ab54dcf84d
make libs pass jshint
8 years ago
yflory
8d956c3de6
New toolbar
8 years ago
ansuz
48f9745619
clientside templating
8 years ago
yflory
503e9de07c
Lint errors
8 years ago
yflory
b7a0547b77
New toolbar colors
8 years ago
yflory
3052ec8abb
Merge branch 'newCk' into staging
8 years ago
yflory
c3f636851a
Fix path size width in drive
8 years ago
yflory
c22f610d5c
Fix the drive integrity check
8 years ago
yflory
fb388f2610
Fix an issue with invalid drive before migration
8 years ago
yflory
59fb5bd8be
One toolbar color per app
8 years ago
yflory
5a248db267
Merge branch 'staging' into newCk
8 years ago
yflory
728272d936
Fix undefined function
8 years ago
yflory
f13d23241c
Upgrade CkEditor to version 4.7
8 years ago
ansuz
d822dfe37a
add forget button to file app
8 years ago
ansuz
7fd36a72f3
re-add download button for file app
8 years ago
ansuz
f02a381e32
avoid horizontal scrollbars
8 years ago
ansuz
cc5d5d4f1d
make pdfs in file app big
8 years ago
yflory
dbfad9d227
Lint
8 years ago
yflory
91d46cdee4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
d3b9ac2511
Update the preview and present content on Ready in slides
8 years ago
ansuz
5fd4870b8b
Merge pull request #138 from pbondoer/staging
...
Fix poll auto-focus inputs
8 years ago
Pierre Bondoerffer
626e54d7b5
Fix poll auto-focus inputs
8 years ago
yflory
54adb680e7
Hide the slide number in the title outside of present mode
8 years ago
ansuz
17838f1d70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
1b66383bac
don't create color-picker if readonly
8 years ago
yflory
a38819f5b9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
1ad1b78c64
Fix the history mode with readOnly and old URLs
8 years ago
ansuz
b2a70f86d3
disallow concurrent logins
8 years ago
ansuz
35e0de463b
disallow concurrent scrypt cycles
8 years ago
ansuz
06ca70d11e
lint compliance
8 years ago
ansuz
f29f430e7c
better handling of non-rpc messages
8 years ago
yflory
f1aef66fc9
Fix the drive history
8 years ago
yflory
008c417111
Context menu was not hidden after a click in the drive
8 years ago
yflory
377a90961b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
e40f43bd20
Migrated pads were not displayed instantly in the drive
8 years ago
ansuz
44b8bc7b7d
make context menus unselectable
8 years ago
yflory
928dadcf77
Fix toolbar dropdown menus not visible in slide
8 years ago
yflory
1df11f2813
Update the font-size when entering/leaving present mode
8 years ago
yflory
66d8c0ed11
Add a preview mode to the slide app
8 years ago
yflory
a5924cb803
Make sure the initial title is set in the userDoc when creating a new pad
8 years ago
yflory
8b5f4dbd47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
3a36040ba7
lint
8 years ago
ansuz
0e9ebddf11
fix the things
8 years ago
ansuz
c0e2c1060e
don't reload when slide hash changes
8 years ago
yflory
24c14ffbf3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
5bfd8470cb
Display the file size before downloading it
8 years ago
ansuz
3f85471ab3
update footer and package.json for upcoming version
8 years ago
yflory
594405de73
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
cbe21959b4
Update UI for the file/media app
8 years ago
ansuz
06eceed8b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
17146d7af9
send feedback for uploads
8 years ago
yflory
c2c04bd5d8
Lint
8 years ago
yflory
2068a8b85b
Embed the mediatag library in the file app
8 years ago
yflory
cd5705b3f3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
1e9bc89855
Fix drive icons when the name contains a long word
8 years ago
ansuz
5ce453afa0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
e73e32ab3a
fix too-tall download button
8 years ago
yflory
927f6404b8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
66b076111e
Add an upload button to the slide's file picker
8 years ago
ansuz
c2e5ef7048
better sizing for videos
8 years ago
ansuz
c717d01714
fix pdf height
8 years ago
ansuz
b480346f5b
more efficient media-tag
8 years ago
ansuz
0d47e68d3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
0eb50b8b6c
drop pdf.js dependency
8 years ago
yflory
f3f1cf9e6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
a237eec41e
Add a file picker in the slide app
8 years ago
ansuz
20874c76f1
prevent code blocks from overflowing slides
8 years ago
yflory
a4f45caebb
Lint
8 years ago
yflory
0a4e876139
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
8738b42861
Update the drive UI to show that Upload and New are linked to a folder
8 years ago
ansuz
d25a0893cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
3184e5d235
don't reload page on hash mode change
8 years ago
yflory
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
a98353af6c
Add a button to upload a file in the drive
8 years ago
ansuz
295f9c00a6
send feedback on buttons
8 years ago
ansuz
d5c7eb49a4
send feedback on toolbar hide and CKE buttons
8 years ago
yflory
7e0a2abc2c
Fix the file name when restoring an element from the trash
8 years ago
yflory
5b523be171
Fix drag&drop for pads in the drive
8 years ago
yflory
e51f678bb9
Don't display the popup whne moving a file to the trash
8 years ago
yflory
497ddeee6d
Upload files with drag&drop in the drive
8 years ago
ansuz
687b4d8307
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
69c3bd392f
update built media tag to latest XWiki version
8 years ago
yflory
494b44e2b1
fix lint errors
8 years ago
yflory
d8ebe566d8
Don't call mediatag for non-image files
8 years ago
yflory
37d3d04f0e
Clean mediatag integration code
8 years ago
ansuz
802146e2af
don't put download buttons in a div
8 years ago
yflory
19cb920a7c
Don't redraw a media-tag everytime the content has changed
8 years ago
yflory
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
f9c26645cf
Upload images using the slide app
8 years ago
ansuz
17e4e9be27
download anything that isn't an image in media-tag
8 years ago
ansuz
8a599eb9b1
Merge pull request #136 from blumeva/staging
...
change minimum opacity
8 years ago
XWiki SAS
fc9ecb0f7c
change minimum opacity
8 years ago
ansuz
ea79294494
Merge pull request #134 from pbondoer/newpoll
...
More poll improvements
8 years ago
ansuz
88c2c0afde
Merge pull request #135 from blumeva/staging
...
Staging
8 years ago
XWiki SAS
74c9b663dd
changing whiteboard
8 years ago
XWiki SAS
40cf7ea107
change whiteboard
8 years ago
ansuz
1b574da053
fix typo
8 years ago
ansuz
7ad89bd9af
don't interrupt boot because of localStorage failure
8 years ago
ansuz
3337e2133a
more thorough tests for localStorage presence
8 years ago
yflory
a57f8679c5
Fix a race condition in the file app
8 years ago
yflory
4eeea93265
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
11e2226f1a
Fix lint errors
8 years ago
ansuz
c779e328e8
warn users if their browser does not support localStorage
8 years ago
yflory
d7292e69c6
Fix undefined variable
8 years ago
ansuz
d367f71760
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
c70eb73d52
Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
803bad1421
Move the file upload code in a separate file
8 years ago
Pierre Bondoerffer
d344f03778
proper button text
8 years ago
Pierre Bondoerffer
2b5339193c
bring admin back
8 years ago
Pierre Bondoerffer
b2eef94232
use numbers, not strings
8 years ago
Pierre Bondoerffer
848010842f
dont sanity check silently
8 years ago
Pierre Bondoerffer
56f2c46c75
document a line
8 years ago
Pierre Bondoerffer
cd1c957929
NaN safety
8 years ago
Pierre Bondoerffer
0118fdbd00
use a local variable
8 years ago
XWiki SAS
49370764c1
change whiteboard translation
8 years ago
Pierre Bondoerffer
b8e394db67
poll: Implement multiple choices
8 years ago
yflory
a58162a617
Make the drive tests work when not logged in
8 years ago
XWiki SAS
c702313489
change label texte
8 years ago
yflory
2fb5e3ae35
Merge branch 'staging' into newToolbar
8 years ago
yflory
969cec5d60
Make sure everything is synced before migrating the drive
8 years ago
yflory
7dd9ed543a
Merge branch 'newDrive' into staging
8 years ago
yflory
376b60c21c
New toolbar temp
8 years ago
yflory
9c5bade83e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
d1f4617419
Fix a race condition causing the preview part to be empty
8 years ago
ansuz
c9725af508
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
db9b9547d9
don't complain about missing callbacks for messages which are not our responsibility
8 years ago
Pierre Bondoerffer
685b352db8
poll: Add show help button
8 years ago
yflory
30bdb9881c
Fix undefined element in select dropdown menus
8 years ago
yflory
298e34a9de
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
8471dab6b1
Provide hints in theme and language dropdowns
8 years ago
Pierre Bondoerffer
5d565660a9
tiny fixes
8 years ago
Pierre Bondoerffer
6bc191725f
poll: support disconnect and fix trash button
8 years ago
ansuz
b3221c0fb4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
0c957989d2
add link to upload table when complete
8 years ago
yflory
5d6a0dcc1b
Fix width transition when dragging preview
8 years ago
Pierre Bondoerffer
6dd80c26b1
Make editing more visible
8 years ago
yflory
3ff3eac283
Fix a race condition causing the drive to be empty
8 years ago
yflory
a5cb5f2ceb
Merge branch 'staging' into newDrive
8 years ago
yflory
1b671edce9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
9a4a6e9b40
Always display the upgrade button in the drive
8 years ago
yflory
9cc25d4c9f
Merge branch 'staging' into newDrive
8 years ago
yflory
7134b00544
Add a button to display the context menu for the trash on mobiles
8 years ago
yflory
d24458e4b0
Fix the tests to work with the async migration
8 years ago
yflory
a57f7c6ce7
Fix lint errors
8 years ago
ansuz
4bcad3e154
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
47857ec382
use cached pinned usage data
8 years ago
yflory
75c3c10b20
Merge branch 'soon' into staging
8 years ago
yflory
c1402fbb0a
Lint error
8 years ago
yflory
b36484931d
Lint
8 years ago
yflory
1fb638f519
clean the code
8 years ago
yflory
9d758a040b
Fix an issue with the search field not displayed properly
8 years ago
ansuz
08902c0910
drop extraneous argument
8 years ago
ansuz
23318357a6
make fewer RPC calls for usageBar
8 years ago
ansuz
df586a223c
update limits, usage, plan, and note whenever they are checked
8 years ago
ansuz
8bad0c556e
change log to error
8 years ago
ansuz
b0e00d337e
more careful validation
8 years ago
yflory
fd88162624
Merge branch 'staging' into newDrive
8 years ago
yflory
7c9e86e351
Merge branch 'soon' into staging
8 years ago
yflory
9694272083
Fix html code not parsed
8 years ago
yflory
9ca10ba524
Merge branch 'staging' into newDrive
8 years ago
yflory
7f120c8fc1
Merge branch 'soon' into staging
8 years ago
yflory
78e6118153
Merge branch 'staging' into newDrive
8 years ago
yflory
444c41974e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
8 years ago
yflory
6a96aa6819
Disconnect the network when migrating the drive in another tab
8 years ago
yflory
2a94bdaf05
test
8 years ago
yflory
ca95b5c42b
Remove unused console.log
8 years ago