0a99478d9f
catch diffdom errors and plow through
7 years ago
0f9e93e1de
make tests pass again
7 years ago
48c49e5a75
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
19e58cec94
prevent typeError
7 years ago
66da349ee4
Sandboxed Poll app with less2
7 years ago
f95acda758
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
7 years ago
6dbc02e81a
Merge branch 'staging' into framework
7 years ago
1c791b5b51
Fix framework by removing some async and also fix media tags
7 years ago
90d00c10b1
Make metadata-manager a bit more robust
7 years ago
9b2251005c
Merge branch 'staging' into newpoll
7 years ago
8de1852ab9
Lint compliance
7 years ago
2c10f9b07b
Merge branch 'staging' into newpoll
7 years ago
e02a779c14
Use secure drive as default drive
7 years ago
b4de31c827
Merge branch 'newdrive' into staging
7 years ago
c1275b5671
Prepare secure poll
7 years ago
4c394e0031
Fix UI issue in poll
7 years ago
342b6012f7
manual merge of staging into framework
7 years ago
cf6030ab8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e62c5e1d07
Add some debugging lines to help synthesize error cases
7 years ago
9571b3c018
persist whiteboard content across sessions
7 years ago
748172585e
update for modified id
7 years ago
4cd7d8eda4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
345bfc1cea
Remove migration for pad attributes
7 years ago
52be5501d6
remove invalid test
7 years ago
69014e5fde
Fix mediatags in pad not cached
7 years ago
b3e066eaca
show loading screen tips during loading screen
7 years ago
77fe6a9bba
small bug fixes
7 years ago
1b01855dd2
Merge branch 'staging' into framework
7 years ago
1fd7a6e2b3
Mistake in mkEvent which makes all events only work once
7 years ago
368a6b2406
manual merge, still wip
7 years ago
cdeac00633
Merge branch 'staging' into newdrive
7 years ago
a8eecee590
Fix access to undefined variable in drive
7 years ago
91e36171eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
138ad17e3e
Fix 'import local pads' in settings creating duplicates
7 years ago
59ad96e491
Make sure the user is redirected to the drive at registration
7 years ago
d2f1d0c0e9
Fix readme pad not added at registration in sframe drive
7 years ago
ae54cbca33
Refactor sframe-cpnf-inner to export chainpad
7 years ago
44018ee7e1
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
7 years ago
b15527565c
Allow passing arguments when firing events
7 years ago
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
7 years ago
d9845d3450
Refactor sframe-cpnf-inner to export chainpad
7 years ago
f418ee9632
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
7 years ago
72f03b2a47
Allow passing arguments when firing events
7 years ago
1afbd4648d
Fix old drive
7 years ago
b871faffc9
Enable tags in code and slide
7 years ago
6aeb366767
Lint
7 years ago
0600ce59ec
Display the 'spinner' when typing in sframe apps
7 years ago
1d7683503f
Fix link origin in sframe upload table
7 years ago
92c808812a
Fix missing style in toolbar/less2
7 years ago
deba699d08
Remove old style for sframe drive
7 years ago
4049931924
Lint
7 years ago
c364377d7c
Use less2 in sframe drive
7 years ago
47fe7b1c53
Drive in sandboxed iframe
7 years ago
dfdeb7b113
Fix style and race condition for history mode
7 years ago
a810d7bd85
Fix style and race condition for history mode
7 years ago
456370b1aa
Base for Drive in sandboxed iframe
7 years ago
95302366d1
lint compliance
7 years ago
68f7d4bc0a
more conformant tagPrompt behaviour
7 years ago
db4c3e7e2c
Merge branch 'master' into staging
7 years ago
b5b84f540e
fix preview mode class
7 years ago
f990200996
drop any notion of crypto from sframe-listmap
7 years ago
a1c124f1be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
95542bcdaf
Lint
7 years ago
c9223cb942
listmap does not care about 'readOnly' mode anymore
7 years ago
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
8a09e39f46
Enable tags in pads
7 years ago
d2b27f3588
resolve merge conflicts
7 years ago
4af01e6e9e
make listmap consume cpNfInner
7 years ago
72f0952835
Make sure we can't open a pad using the wrong app
7 years ago
35a313d6ee
Make palette realtime
7 years ago
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
3023e8c855
Fix templates in whiteboard
7 years ago
732585ea7b
Sandboxed iframe for the whiteboard app
7 years ago
029a8e3023
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
d72146ba7f
use setAttribute for assigning attributes in hyperscript
7 years ago
a78b597ebb
lint errors
7 years ago
8ce364a252
Add a button to empty the trash in the drive
7 years ago
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
7 years ago
f9d27d2783
WIP secure contacts
7 years ago
483160a96a
Fix tab notifications in code and slides
7 years ago
1131ef0172
Fix language selection in sandboxed iframes
7 years ago
0a656ca8d6
Fix the splitter in code and add it back
7 years ago
018f71df04
Add drop handlers for mediatags in ckeditor
7 years ago
c00d295466
Add missing translations
7 years ago
a927f40f02
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
974658453c
Mediatag integration in pads
7 years ago
08e0ae424d
log errors in less compilation
7 years ago
15db6b180c
copy bug fixes from changes
7 years ago
5b45e92250
delete range requests after they have completed
7 years ago
4f6909fce3
set icon to 'faded' styles
7 years ago
086d4bae32
clean up contacts initialization
7 years ago
96d0456f31
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1091e0b375
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
47ce645897
implement slice
7 years ago
a8f7beb20b
remove deprecated apps
7 years ago
6ed4f2fc64
fix a thing
7 years ago
8a564bf350
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
513f8e73d4
refactor cryptpad.ready to use nthen
7 years ago
c50c297490
Fix the size of the loading screen for the filepicker
7 years ago
b643ccc232
typo
7 years ago
652c916690
change the command in the documentation so that it will not change itself
7 years ago
5f0383ae99
update version of sframe-boot because it was changed
7 years ago
845f75f8a7
remove a 100ms dead spot from page load
7 years ago
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
7 years ago
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
4d688289cc
lint-compliance
7 years ago
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
47cfa0cf45
Focus the editable content when opening a codemirror pad
7 years ago
f039fc7ff5
develop a system for avoiding z-index problems
7 years ago
bafa401473
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
fa64adbbe5
Hide visible elements while loading the slide app
7 years ago
fbd4be6135
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ab64bf9e59
Use less2 for the loading screen
7 years ago
710418f42f
Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
7 years ago
a332168926
fix some bugs in prompts, alerts, confirms
7 years ago
0db33d48fc
properly handle variable args in Cryptpad.alert
7 years ago
8a87ec180e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
789a923792
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
7 years ago
d46cc8226d
Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs
7 years ago
dc86579d46
use an 8 character password for tests
7 years ago
e1f090bb9d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
244e3ecba7
support forefront flag in alert config
7 years ago
63cb5dfc1e
Make less loader rewrite urls to use version parameter
7 years ago
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e3c0ec29f7
Hopefully chase out a race in sframe-channel
7 years ago
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
437f50fd4a
Migrate the file to a sandboxed iframe
7 years ago
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
7 years ago
5ac3e97dc8
Merge branch 'master' into staging
7 years ago
7d720c73a9
Merge branch 'soon'
7 years ago
ddbda08c88
Fix an issue when cleaning the template category in the drive
7 years ago
9d229b8868
lint compliance
7 years ago
5b3667fd4e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
63700cb791
Fix an issue when cleaning the template category in the drive
7 years ago
a87ccdc37e
remove redundant lines
7 years ago
da0e31fa54
guard against possible type errors
7 years ago
0f9da69185
Show if a pad has been renamed in the drive
7 years ago
499b5ea2ba
warn that a password is too short before doing anything else
7 years ago
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
7 years ago
a74915ab58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
671c893e8a
Duplicating code like a moron, this should hopefully get fixed later.
7 years ago
5a4836fe6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
79094aa4bb
Fix closing the title input when the title is not modified
7 years ago
58c38dd77b
focus on the current window when you pop an alert
7 years ago
b9545f45f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
306fec2d0e
improve messages for template picker confirm
7 years ago
1943c83f69
clean up api for Cryptpad.confirm
7 years ago
8d3ebdbaf7
I'm stupid
7 years ago
041071e61c
manual merge
7 years ago
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
7 years ago
9271b0c1a8
Try to fix half-codemirror bug
7 years ago
304a8df808
Remove unneeded migration and fix attributes migration
7 years ago
5a1abc8986
let's try using actual js syntax
7 years ago
134c6057c1
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
7 years ago
59d25b4c1a
use camel case, not snek case
7 years ago
520b8967fd
allow people with short passwords to log in
7 years ago
8ef27dca08
Lint
7 years ago
1aef844fc3
Fix title attribute for truncated titles in the drive
7 years ago
55fe882f64
Fix readonly mode in code
7 years ago
bd422178c4
Hide the filepicker button in readonly mode
7 years ago
51f1be9f7a
Improve the input style when renaming a folder in the drive tree
7 years ago
642511dc3b
Disable exiting present mode when in embed mode
7 years ago
403b62f131
Fix ghost icon modal and improve UI on mobile
7 years ago
757d0a2800
Save the state of CKEditor's toolbar (visible or hidden)
7 years ago
5bf966633c
Merge branch 'staging' into slide2
7 years ago
514bff7065
Add slide number in the title in slide2
7 years ago
0ed6846e07
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
b5b9f931c7
don't use common-realtime
7 years ago
32e8c8ef4b
implement alertify without alertify
7 years ago
a302ee5d25
guard against undefined arguments
7 years ago
c3a07e879c
Merge branch 'staging' into slide2
7 years ago
fc069dac48
Ask the user before loading the template picker
7 years ago
05793c220c
Fix secure iframes on Edge
7 years ago
290d668ceb
Fix race condition preventing slide to work on Edge
7 years ago
de5d925154
autoselect user href in settings
7 years ago
e950ce74cb
focus on input when opening filepicker
7 years ago
739903d511
don't check account usage if you aren't logged in
7 years ago
bbf7ed3827
refactor drive to use dialog.selectable()
...
fix class on alertify-like boxes
7 years ago
f2aaaa9751
Move slide to secure iframe
7 years ago
809b56625d
refactor ui elements
7 years ago
bca9ba66cb
enforce a configurable minimum password length when registering
7 years ago
1958bca984
restore hashing screen in login and register
7 years ago
fab6264ce6
use loading screen from pages.js
7 years ago
e8298f165a
only display first letter of name if user has no avatar
7 years ago
85003f7a23
lint compliance
7 years ago
cca3c04d43
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
15e24ebe4f
ui for hashtag picker
7 years ago
1b97996ef8
implement util.once
7 years ago
0423a5f4e2
Clean secure iframe code
7 years ago
04a04aef2b
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
7 years ago
61b228db79
Fix double / when storing a file
7 years ago
8b2733e2da
Fix typo
7 years ago
3ca9f41290
Get embed code for pad and code
7 years ago
0bb6698399
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e85b34f127
Add embed options in the secure pad hashes
7 years ago
47ec959032
make sure contenteditable is not set in read only mode
7 years ago
6a735b441f
use paul's print styles
7 years ago
b3d5e04bb4
lint compliance
7 years ago
3d2a2da74e
add listAllTags api
7 years ago
31a6881dba
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
305feebbbe
Fix scroll position when refreshing the drive tree
7 years ago
0e8a26e8eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1c50bb3f61
clear hung tooltips
7 years ago
53eb9bb541
Remove the logo from the filepicker loading screen
7 years ago
729c013af7
Get mediatag embed code from the file app
7 years ago
904936209a
Remove loading tips in the file picker
7 years ago
98cd69e53e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
204e45dfae
Enable templates in pad
7 years ago
4108520d20
Add contacts in the new menu if the user is logged in
7 years ago
38e1ed93e4
Merge branch 'code2' into staging
7 years ago
acaf45a0e0
drop thumbnails if metadata is too large
7 years ago
78b338c379
Merge branch 'code2' into staging
7 years ago
db86a2dbee
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
7 years ago
d2787e3eff
Make code2 the default code app
7 years ago
4069945bc4
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
7 years ago
d42d988d36
make test more resilient
7 years ago
cd7b00d45b
make pixels 100px
7 years ago
e8ac5ed87f
add a test for thumbnails
7 years ago
b1a1f4ba13
add encrypted thumbnails to metadata for images.
...
correct decryption logic
7 years ago
b8e913c95a
more thumbnail methods
7 years ago
ffbb21dd2c
use cryptpad-september build of media-tag
7 years ago
c0f14dea5e
Store code2 and set the title at the first visit
7 years ago
86e23ac19f
Use less2 in secure iframes
7 years ago
f12f4bb925
Integrate filepicker secure iframe in the code2 app
7 years ago
1072e3e797
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ae60b5845f
implement search-by-tag for filesData
7 years ago
72ef730f23
implement tag-related functions
7 years ago
0302c06d0e
send feedback if client does not support symbols
7 years ago
52019dc763
make get and set pad attribute return only cloned data
7 years ago
89b7b644f3
Enable drag & upload in code2 and prepare filepicker
7 years ago
e2719d9098
Add media-tag-nacl to cryptpad so it will be hosted on the server
7 years ago
885282ddea
Fix undefined friend
7 years ago
a60709ff73
Infinite spinner popup leads to frame attempting to reload and failing
7 years ago
b8971cdc23
Add previewMode settings to code2
7 years ago
0d008aaa2e
Add indent settings to code2
7 years ago
f54dc7505c
Migrate indentation settings to a settings subobject
7 years ago
0893bcc0e5
Merge branch 'staging' into code2
7 years ago
f06683e949
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
0ce32464fd
Fix flickering avatar in firefox
7 years ago
9a23b77b46
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ba0e935add
stub localStorage, and handle errors that might come from touching localStorage
7 years ago
be8ea4102e
keep trying to parse the hash until it works
7 years ago
4db4f66786
Remove an unnecessary fix for Safari
7 years ago
a2ed266048
Move the code app in a secure iframe
7 years ago
1044531806
Fix Safari iframe size issue
7 years ago
a34d1793e0
drop 'loading' text from loading screen
7 years ago
595fa4c2e4
Merge branch 'soon'
7 years ago
181a19a9a0
polyfill for array.fill
7 years ago
51fa6287c1
Enable notifications in secure pads
7 years ago
642dc17910
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
901917983b
Fix an issue preventing pads to be stored in the drive
7 years ago
40f062abda
restore app usage report in new pad
7 years ago
8fb7fef3f5
regular expressions are never falsey
7 years ago
24eac9b4a6
test for flakey tests
7 years ago
7d2a76f4d6
delete dead code. fix off-by-one for messages. turn off history button when history is exhausted
7 years ago
288c03bb41
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
fe03e6ae83
bad code, lint
7 years ago
430a6f7b77
lint compliance
7 years ago
190dff1c9b
Use the bounce app for opening a link with the right click
7 years ago
dec870d2bd
Fix selection in the drive search results
7 years ago
4bceef8952
Fix the upload status table missing in the drive
7 years ago
0b4e044540
Fix the plugin to open a link in a new tab in pad
7 years ago
d9a4a32bf9
Fix avatar for anonymous users in secure pads
7 years ago
00fda0d7d7
Fix avatar in read-only mode (secure pads)
7 years ago
88cb4fd83c
Enable friend requests from secure pads
7 years ago
147d88d845
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e43c68aa48
Fix viewers number in secure iframe
7 years ago
f89015d9ed
Update the tab title to match the pad title in pad2
7 years ago
1280cd1659
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
51c065d13c
Fix link to main in the new toolbar
7 years ago
d9bf2abcd8
Fix old hashes not working anymore in pad
7 years ago
536fe04790
emit notification when alert, confirm, or prompt are called
7 years ago
e4a356d873
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
056285a7b6
Move pad2 to pad and create bounce app
7 years ago
d4589c4699
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6c65e5ff72
Fix the ghost icon in the drive and add missing text
7 years ago
5fbbaee2f5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6314487d98
handle unfriends in ui
7 years ago
5c2b58e703
log error synchronously so we get a trace when pinPads has no callback
7 years ago
841e3af8da
handle unfriends. clean up. better input validation
7 years ago
c66a0c55e0
ensure that function signatures are correct
7 years ago
91f6e3e543
remove a lot of dead code
7 years ago
e62faf7c7b
Edge fix, always use async iframe onLoad rather than invoking it manually
7 years ago
54eefd3d94
replace contacts with contacts2
7 years ago
57d0c6c973
Merge branch 'new-messaging' into staging
7 years ago
9e04d039d7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
22d754d514
handle user renames
7 years ago
0a6f81850f
Handle infinite-spinner errors and properly inform the user
7 years ago
a99eb9365e
correctly set indentation preferences when changing languages
7 years ago
f58d4c941f
clean up a bit
7 years ago
ea5f47f0f9
remove some TODOs and solve some wee bugs
7 years ago
b75a951a98
encode messages with 'author' field instead of 'channel'
7 years ago
7bbea28831
minor anti-xss changes...
7 years ago
013b75ae67
implement history range requests
7 years ago
b71f1860db
make uid function reusable
7 years ago
443d8a8941
remove unnecessary files
7 years ago
75fde58846
Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance)
7 years ago
ansuz