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
Caleb James DeLisle