840cd91bcb
manual merge
7 years ago
75130150d5
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
7 years ago
cf5ccf04f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
101482b8cc
Migrate settings to use a sandboxed iframe
7 years ago
7f8147b18b
Merge branch 'soon'
7 years ago
c1ba08cfc6
Make sure thumbnails are .png
7 years ago
0956905ca8
Wipe localForage on log out
7 years ago
6b9ffe8dd1
Make thumbnails more secure
7 years ago
454fc8498c
remove old* apps
7 years ago
e07bb0f7b3
roll back to old transform function, except in pad
7 years ago
a592317e35
lint compliance
7 years ago
fef97ed60e
Fix an creating duplicates mediatags in markdown preview
7 years ago
9060464f37
Create thumbnails only when the tab is not focused
7 years ago
a37e6c7979
lint compliance
7 years ago
2a3a5c4342
Ability to disable thumbnails
7 years ago
5dff9a32b6
Fix comments order in polls
7 years ago
1871749b6f
Fix -1 viewer in the userlist when disconnected
7 years ago
cf3024ef5b
Ability to display an error in the toolbar state
7 years ago
8de9a596f1
Fix cursor in thumbnails
7 years ago
fd7bb3aadb
Make sure the infinite spinner modal is not displayed multiple times
7 years ago
3ebb5ca493
Fix issue in diffMarked creating text nodes for each character
7 years ago
5438970ab4
typo
7 years ago
e0f7df80b3
Fix avatar upload and use less2 everywhere in profile
7 years ago
7f9b21405b
Add missing files for profile
7 years ago
e99836bae2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
4250688856
Migrate profile to use sframe
7 years ago
744809101c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
867df1db56
fix '+New' button in drive toolbar
7 years ago
907e2cb517
lint compliance
7 years ago
abc511a56e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
68accaf653
Todo in sframe with less2
7 years ago
11b8b380fd
Merge branch 'staging' into evilham
7 years ago
04f26ff886
Merge branch 'staging' of github.com:evilham/cryptpad into evilham
7 years ago
0a14c715ad
add test for support of invite urls
7 years ago
5dcfbd07ab
Merge branch 'theming-improvement' into staging
7 years ago
4933aafbc8
Added default values to avoid breaking existing themes.
7 years ago
4c0049ad55
don't log presence of other users as 'joins' when you have first joined
7 years ago
325f685f3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1cbf1aec92
prevent undefined access in non-sframe apps
7 years ago
ac1b67ad67
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1245b4d244
Enable thumbnails in poll and whiteboard
7 years ago
d644054e3f
lint compliance
7 years ago
ed253e6c75
Merge branch 'staging' into evilham
7 years ago
df1a700cb2
disable thumbnail test. add test for flat dom
7 years ago
02cd7e5b58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
69890ebd8f
prototype alternate datastructure for trees in listmap
7 years ago
23c305f71f
implement removeItem so localForage doesn't complain
7 years ago
735f0a7e30
Merge branch 'theming-improvement' into staging
7 years ago
83da9cf752
Moved colours to colortheme.less to enable theming
7 years ago
8251247da2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6f020b67ca
Add thumbnails to framework apps
7 years ago
98c66ef8f6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
bf817f20ee
Fix file upload in code and slide
7 years ago
f031af4e9d
fix broken media-tags in contacts
7 years ago
24572a40d2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
f4adbd980e
Thumbnails for the code app
7 years ago
ba97aa7ad2
allow file upload handler to create thumbnails for whiteboard
7 years ago
6157c57a4b
disable color palette when interface is not editable
7 years ago
8359902f6a
fix typo in poll
7 years ago
69f9a7ebf3
make userlist change notifications configurable
7 years ago
027b9fa383
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
aa37997aa3
Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
7 years ago
bac608adfe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
dc90811090
only call onReady once in sframe-listmap
7 years ago
bac10472f3
lint compliance
7 years ago
39b4cb9226
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
18b5b20d27
Add thumbnails for PDFs
7 years ago
aee51f1317
lint compliance
7 years ago
447b0a74ee
handle errors for videos when uploading
7 years ago
30a69fae13
Add thumbnails for videos
7 years ago
21f8ae7570
Keep the correct ratio for image thumbnails
7 years ago
2dd3c42fd5
Fix handlers registered again on reconnect in drive and poll
7 years ago
a0bcb901d3
Add titles in poll when options or usernames are overflowing
7 years ago
74985fd0f2
Use text for the addUser button in polls
7 years ago
6db5a34323
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
c17fc2efe7
improve option order in poll
7 years ago
2be22867c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
13718d0263
Fix recent pads in chrome
7 years ago
2e5fdf709a
Merge branch 'soon' into staging
7 years ago
de8339fea7
hide alertify when you are in presentation mode
7 years ago
9b02b36724
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
d7e9498143
Fix and then disable the new OT
7 years ago
288e141c1f
add missing sframe method
7 years ago
c1d05a00ba
Improve media-tag export in pad to work with existing CSP
7 years ago
3e4faf1be1
Add new state messages in the toolbar
7 years ago
6d080bcb45
Ability to export mediatag images in pad
7 years ago
a0dd867f33
Fix pending state not removed after friend invite rejected
7 years ago
c25be21138
Fix the upgrade button in the drive
7 years ago
cc6b2192e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
a3c7aa67d8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
094856a511
Fix renaming pad with multiple dots in the name in drive
7 years ago
bf832ba784
fix comment overflow
7 years ago
7bc2f81852
Fix pinned column not always stored in polls
7 years ago
88e7f9a218
Add last access and creation times in the properties window in drive
7 years ago
22e3baed4b
Fix sort issues in drive
7 years ago
f43606f71d
Present mode to display only the parsed markdown in code
7 years ago
515214aed1
Use present mode in embed code
7 years ago
201c974df6
Merge branch 'thumbnails' into staging
7 years ago
7b8490ad20
Use less2 in contacts
7 years ago
dd63cd13d7
Fix profile page title
7 years ago
81d0b3272d
Fix multiple infinite-spinner errors piling up on top of eachother
7 years ago
9e4c48f537
lint errors
7 years ago
a149152f11
Merge branch 'staging' into framework
7 years ago
4197b7b968
Fix missing icon in list mode for files with thumbnail
7 years ago
d941b1098a
Remove selection in whiteboard when uploading to the drive
7 years ago
4116d08dd1
Display thumbnails in the drive and then file picker
7 years ago
6920129126
Embed images from the drive in whiteboard
7 years ago
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
2fd120100a
Merge branch 'wb' into staging
7 years ago
15337603bb
Merge branch 'staging' into framework
7 years ago
a6b34491fc
freeze the editor when reconnecting
7 years ago
854c1e94a4
make infinite spinner error message go away if ChainPad settles after it has been popped
7 years ago
a859ab081a
Fix fouc in drive
7 years ago
7b6432f134
Lint
7 years ago
6926d42292
Autoload template picker to make it faster to appear when used
7 years ago
1c8e1a36e8
Add file type in the pad attributes for existing files
7 years ago
b86f8e3f26
Fix uloaded files not moved to the correct folder in drive
7 years ago
88d0a2b8a6
Merge branch 'master' into staging
7 years ago
5ed60a0ad7
Fix image ratio in slides
7 years ago
753e2d797e
Merge branch 'staging' into framework
7 years ago
62bc72847f
Add an error message when trying to tag a deleted pad
7 years ago
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
69dd3a60ab
Hide template and fileupload buttons for anonymous users
7 years ago
8e1f15e88d
Get title suggestion based on poll's description
7 years ago
e317265594
Merge branch 'master' of github.com:xwiki-labs/cryptpad
7 years ago
0d912402e5
patch for bug in Firefox ESR
7 years ago
91381ca77d
Fix lint errors
7 years ago
50090a3af6
Add placeholders for the comment form in poll
7 years ago
95ad25973e
Ability to delete a stronger pad from readonly mode
7 years ago
b28c1537e8
Fix history in readonly mode
7 years ago
620ba4ed5d
Fix fouc in drive
7 years ago
b31bbebf7b
Buttons are missing in whiteboard when zoomed in
7 years ago
a5a08176fb
Merge branch 'master' into staging
7 years ago
54b5a2d654
Fix style issues in poll (Chrome)
7 years ago
86767184da
Fix style issues in poll for Edge
7 years ago
00e8d32d60
Fix column position in poll for Chrome
7 years ago
b110e1b8da
Fix style issues in poll for Edge
7 years ago
ecb537ac7f
Move code to render.js in poll
7 years ago
75b3ff9c60
CSS issue in polls
7 years ago
c46280d032
Fix style issues for Edge
7 years ago
128c9c2f4e
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
7 years ago
f0bdc3b26f
second try
7 years ago
d50a692986
add note about tags to prompt
7 years ago
c8928a0811
Switch the transform function and also stop calling textPatcher without the metadata
7 years ago
035150614d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
484e216054
Fix hashtag button in the toolbar
7 years ago
4c19375f4d
Avoid missing characters in poll's inputs
7 years ago
a12239405b
fix toolbar 'home link' to visit home page from drive
7 years ago
dd141b5c9f
Disable comments when a poll is not published
7 years ago
36aee2d174
lets try normalizing the dom before applying a patch
7 years ago
828a685ba8
Fix broken browser fight logging
7 years ago
aa744567ed
Fix thumbnails in sframe apps
7 years ago
5e7bf0cfb8
Embed an image in whiteboard
7 years ago
f0eb58ee95
Merge branch 'staging' into framework
7 years ago
9509d538e0
Cursor not being updated at the right times before applying a patch.
7 years ago
888028c542
Lint
7 years ago
e5a54b5978
Fix folder highlighting with drag&drop in the drive
7 years ago
1c7c37c121
Add the file class to pads in 'template' and 'recent' categories in the drive
7 years ago
ab3648a30a
Merge branch 'newpoll' into staging
7 years ago
1c4f1c785d
Improve stability and UI in poll and its comments
7 years ago
7559bc062e
lint compliance
7 years ago
503111d26a
use recompiled media-tag
7 years ago
427afc3954
override modified file name in pdfjs
7 years ago
d85db64939
add tags from drive
7 years ago
0aecfad854
Occasionally the language selector only says "Mode" rather than the language
7 years ago
ae87320408
Preview pane cannot be resized after it has been hidden and then shown again
7 years ago
1f35798194
stop event propagation from tag prompt
7 years ago
c936e5ae73
make context menu open correct app on correct port
7 years ago
d9e97b86e6
Merge branch 'staging' into framework
7 years ago
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
deed04108b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
a90c078e84
correct reference to undefined
7 years ago
26dfc65c25
Comments in polls
7 years ago
5304dc319f
Enable redirection to the previous page after registration
7 years ago
ceb8ff18bd
Fix ghost icon in drive
7 years ago
846b1a9fb3
Improve description UI in poll. Enable tags and mediatag
7 years ago
68bda92291
Use codemirror for description in poll
7 years ago
b8ce149db6
add hint about tag usage
7 years ago
f15ec4efe9
add tagging to whiteboard and file apps
7 years ago
f90742603e
style fixes
7 years ago
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
707d3b3e94
Ability to export polls as csv
7 years ago
5cf86bf74a
Update UI in poll and remove old code
7 years ago
09c0a473e2
fix function signatures
7 years ago
3337689630
Wrong translation key in toolbar
7 years ago
94d2f4472b
Stop using presentSuccess because it is hidden behind the modal in slide
7 years ago
126742a1c3
Fix bugs in sframe poll and update UI
7 years ago
351b95d6a9
resolve merge conflicts
7 years ago
6c7b135f91
lint compliance
7 years ago
94c392b79f
secure messaging
7 years ago
53f65f6a87
Merge branch 'staging' into framework
7 years ago
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
1e5bc5da14
onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer
7 years ago
7230c780a1
Get rid of last usages of cryptpad-common in pad/inner
7 years ago
12e82e80ec
When changing the title of a presentation, the title in the bottom of the slide should also change
7 years ago
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
Caleb James DeLisle