yflory
|
ae7d97b3dd
|
Ability to disable apps using appconfig
|
6 years ago |
|
yflory
|
f883fb7e04
|
Preserve chat and cursor channel when importing a template
|
6 years ago |
|
yflory
|
1a0344547b
|
Improve cursor in pad
|
6 years ago |
|
yflory
|
7bbf6951f2
|
Disable cursors in pad
|
6 years ago |
|
yflory
|
bfd94c7f2b
|
Merge branch 'cursor' into staging
|
6 years ago |
|
yflory
|
95a0bc9fc1
|
Merge branch 'rochat' into staging
|
6 years ago |
|
yflory
|
489a99c5c4
|
Don't delete the old chat for now
|
6 years ago |
|
yflory
|
0197f583f2
|
Translations for the cursor position settings
|
6 years ago |
|
yflory
|
13da052325
|
Update translation key
|
6 years ago |
|
yflory
|
fb5ad34299
|
Fix typo...
|
6 years ago |
|
yflory
|
a121df2600
|
Delete validateKey in the messenger memory when we leave the channel
|
6 years ago |
|
ansuz
|
8affe4053c
|
Merge branch 'staging' of github.com:joldie/cryptpad into print-code
|
6 years ago |
|
yflory
|
d88dee9a83
|
Restrict sending messages in a pad chat to editors only
|
6 years ago |
|
yflory
|
32fc941141
|
Merge branch 'staging' into cursor
|
6 years ago |
|
yflory
|
a2e28e6e25
|
Fix missing avatar in cursor tooltip
|
6 years ago |
|
joldie
|
b2c20682df
|
Removed unnecessary media query.
|
6 years ago |
|
yflory
|
186e4b14fe
|
Add missing file
|
6 years ago |
|
yflory
|
c6f63d4d54
|
Cursor position in pad
|
6 years ago |
|
joldie
|
35c39fae5d
|
Added print button to code pad page.
|
6 years ago |
|
yflory
|
600c984576
|
Only show the user colors in the userlist if the app supports it
|
6 years ago |
|
yflory
|
081fc01694
|
Add a settings category about the cursor
|
6 years ago |
|
yflory
|
c81b4d77e8
|
lint compliance
|
6 years ago |
|
yflory
|
690cba2b8f
|
Add cursor in slide
|
6 years ago |
|
yflory
|
f157f852b1
|
Fix and improve cursor
|
6 years ago |
|
yflory
|
1ba80a344b
|
See other users' cursor position
|
6 years ago |
|
yflory
|
008b5a3e9f
|
Fix an ownership issue in friend channels
|
6 years ago |
|
yflory
|
ca45ff31d1
|
Refactor messenger to use commands from UI to store
|
6 years ago |
|
yflory
|
cc3e6f3924
|
Fix scrollbar position in ckeditor #296
|
6 years ago |
|
yflory
|
f5965716b6
|
Minor update because of flow...
|
6 years ago |
|
yflory
|
2a46b8f855
|
Fix an issue with last known hash in the messenger
|
6 years ago |
|
yflory
|
dbad925e5e
|
New cursor recovery system (beta)
|
6 years ago |
|
yflory
|
13d6579861
|
Add typing test in the code app
|
6 years ago |
|
yflory
|
015449832c
|
Fix missing characters caused by concurrent editing
|
6 years ago |
|
yflory
|
0e6057ee3c
|
Merge branch 'soon'
|
6 years ago |
|
yflory
|
3e45cff7c0
|
Merge branch 'staging' into soon
|
6 years ago |
|
yflory
|
56267f4ee1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
|
yflory
|
aa3f6cb7d7
|
Update some icons in the drive
|
6 years ago |
|
ansuz
|
1b83431382
|
Merge branch 'master' of https://git.xwikisas.com/xwiki-labs/cryptpad
|
6 years ago |
|
ansuz
|
d407f9af74
|
downgrade an XXX to a FIXME
|
6 years ago |
|
ansuz
|
04d96d5d0e
|
remove outdated comments
|
6 years ago |
|
ansuz
|
fcce48f2dd
|
Merge branch 'soon' into staging
|
6 years ago |
|
yflory
|
8522c3723d
|
Translations for the NGI logo
|
6 years ago |
|
yflory
|
3d712d9008
|
Merge branch 'cursor' into staging
|
6 years ago |
|
yflory
|
9d9845434e
|
lint compliance
|
6 years ago |
|
yflory
|
3b9e1ee10c
|
Fix scrolling issue in pads when clicking on buttons
|
6 years ago |
|
yflory
|
ab35d6b778
|
lint compliance
|
6 years ago |
|
yflory
|
3a4cfbb7e8
|
Disable HTML in chat
|
6 years ago |
|
yflory
|
22f1ac9e1e
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
6 years ago |
|
yflory
|
04decacaca
|
Forbid JavaScript in links to the bounce app
|
6 years ago |
|
yflory
|
fc915e3337
|
Use DiffMarked in messenger to avoid duplicate code
|
6 years ago |
|
yflory
|
c64feae7bf
|
Merge branch 'staging' into cursor
|
6 years ago |
|
yflory
|
2a6945cbe5
|
Fix export in the pad app with Chrome
|
6 years ago |
|
yflory
|
b166c70a5f
|
Fix conflict when a user was reverting the latest patch from someone else
|
6 years ago |
|
yflory
|
8f849d8d4a
|
Merge branch 'staging' into cursor
|
6 years ago |
|
yflory
|
4daa2266c0
|
Fix new network open for each shared folder
|
6 years ago |
|
yflory
|
fe0d579d56
|
Cursor improvements in pad (Beta)
|
6 years ago |
|
yflory
|
82c3c7f50b
|
Improve the Typing Test in pad
|
6 years ago |
|
yflory
|
a5b04bd62a
|
Download a file from the drive using the context menu
|
6 years ago |
|
Paul Libbrecht
|
3f2e6b0611
|
completion
|
6 years ago |
|
yflory
|
dcdc0972dd
|
Update template icon in the drive tree
|
6 years ago |
|
yflory
|
4e26a8fbc5
|
Merge branch 'soon' into staging
|
6 years ago |
|
Paul Libbrecht
|
12b2224dad
|
Bad syntax error left. Sorry. Now fixed.
paul
|
6 years ago |
|
yflory
|
b74e086602
|
Shortcuts are now added from sframe-common
|
6 years ago |
|
yflory
|
05e7d5eb9b
|
Add missing translation
|
6 years ago |
|
yflory
|
997692efb4
|
Use the font-size codemirror setting in the slide app too
|
6 years ago |
|
yflory
|
c4c1fcb080
|
Fix table rendering in polls description
|
6 years ago |
|
yflory
|
1c5847dd01
|
Prevent Ctrl+S from saving useless content. Add support for custom shortcuts in CkEditor
|
6 years ago |
|
yflory
|
1d31aab990
|
Display more warning messages about the full drive export
|
6 years ago |
|
yflory
|
7509ce1cc7
|
Use new application icons
|
6 years ago |
|
Paul Libbrecht
|
31a6fac4e0
|
Update German translation with latest phrases. Paul
|
6 years ago |
|
yflory
|
5ce76a6358
|
Fix a new z-index issue in slide...
|
6 years ago |
|
ansuz
|
ef08771ffa
|
Fix typo in German translation, closes #290
s/Unbenennen/Umbenennen
|
6 years ago |
|
yflory
|
db25d914ab
|
Improve default UI for small or zoomed screens
|
6 years ago |
|
yflory
|
9d6c9dcf5e
|
Fix font issue with new paragraph in pads (#284)
|
6 years ago |
|
yflory
|
8b554dec63
|
Set font size in code editor from the settings page (#140)
|
6 years ago |
|
yflory
|
2af2fccc11
|
Fix overflowing text in pad
|
6 years ago |
|
yflory
|
e4daa5adbe
|
Fix random character insertion
|
6 years ago |
|
yflory
|
aa6c6c7f3a
|
Merge branch 'master' into staging
|
6 years ago |
|
yflory
|
d3dbd0c712
|
Move static pages content in their own file
|
6 years ago |
|
yflory
|
bf720f2f30
|
Fix export with old polls
|
6 years ago |
|
yflory
|
e3b89a5e59
|
Fix kanban color picker preventing items drag&drop #277
|
6 years ago |
|
yflory
|
98db6057c8
|
Allow shared workers by default
|
6 years ago |
|
yflory
|
d748620129
|
Add timeout when downloading a file in drive export
|
6 years ago |
|
yflory
|
3c99302c32
|
Update French translation
|
6 years ago |
|
yflory
|
4e3c09f640
|
Merge branch 'master' into staging
|
6 years ago |
|
yflory
|
6924541080
|
Merge branch 'move' into staging
|
6 years ago |
|
yflory
|
85cb56df1d
|
Import changes from pull requests in master (translation files were moved)
|
6 years ago |
|
yflory
|
35b0f878c7
|
Merge branch 'backupdrive' into staging
|
6 years ago |
|
yflory
|
fc86e5daf8
|
French translation
|
6 years ago |
|
yflory
|
ef37bac2e7
|
Add UI for the CryptDrive export
|
6 years ago |
|
yflory
|
6397528f0f
|
Fix poll export
|
6 years ago |
|
yflory
|
3e9e92dcac
|
Implement full CryptDrive export
|
6 years ago |
|
yflory
|
5a6c3597db
|
Fix missing cursor in empty pads with Chrome and fix page mode
|
6 years ago |
|
yflory
|
f538a05044
|
Fix an issue with empty mediatag widgets in pads
|
6 years ago |
|
yflory
|
92ce311694
|
Basic CryptDrive export with pads
|
6 years ago |
|
yflory
|
f4d5a7567f
|
Return an error when the pad has been deleted from the server
|
6 years ago |
|
yflory
|
9f0398826d
|
Make customized translations more maintainable
|
6 years ago |
|
yflory
|
947c9c5e40
|
lint compliance
|
6 years ago |
|
yflory
|
caa72ba949
|
Remove dropdown menus scrollbar when space is available
|
6 years ago |
|
yflory
|
8261ad86ae
|
Update translation
|
6 years ago |
|
yflory
|
3257914b17
|
Add support for PowerShell mode in codemirror
|
6 years ago |
|
yflory
|
bf55657993
|
Password-protected shared folders
|
6 years ago |
|
yflory
|
e6379dacd8
|
Redraw the preview in the code app when the tab gets the focus
|
6 years ago |
|
yflory
|
c127f0a5f6
|
Add a comment
|
6 years ago |
|
yflory
|
7d3d3cf5ac
|
Distinguish between two anonymous users in the chat
|
6 years ago |
|
ansuz
|
90c905827d
|
Merge pull request #281 from ryanpcmcquen/patch-2
Typo fix: additionnal => additional
|
6 years ago |
|
yflory
|
2a313a90e0
|
Don't rejoin a dropped channel on reconnect and leave chat channel
|
6 years ago |
|
yflory
|
498703384f
|
Don't rejoin a dropped channel on reconnect and leave chat channel
|
6 years ago |
|
yflory
|
2a86db2001
|
New Features page
|
6 years ago |
|
yflory
|
5cbe2f7c0f
|
Fix tag autocomplete and Tags category in the drive
|
6 years ago |
|
yflory
|
5d3d591228
|
Keep trying until the first tab is loaded
|
6 years ago |
|
yflory
|
c59d744d78
|
Fix loading a tab while another one is initializing the worker
|
6 years ago |
|
ansuz
|
1d63419df8
|
update error handling, but leave the note to come back
|
6 years ago |
|
yflory
|
c5c6dc8223
|
Enable browser notifications for messaging tools
|
6 years ago |
|
yflory
|
1201f2dcc4
|
Fix small UI issue
|
6 years ago |
|
yflory
|
9a6e6f6e15
|
Fix User menu and link to drive in anonymous shared folders
|
6 years ago |
|
yflory
|
d78a00b5e1
|
Ese the correct document type in the text for the store corner popup
|
6 years ago |
|
yflory
|
930677750c
|
Merge branch 'anonsf' into staging
|
6 years ago |
|
yflory
|
dcabfb464d
|
Refresh shared folder on change for anon users
|
6 years ago |
|
yflory
|
0a83840c9c
|
View a shared folder with an unregistered user
|
6 years ago |
|
Ryan P. C. McQuen
|
df442f9b1e
|
Typo fix: additionnal => additional
|
6 years ago |
|
yflory
|
e1329b7d46
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
|
yflory
|
17bc1ee703
|
Load shared folder when not logged in
|
6 years ago |
|
yflory
|
0e04c4392c
|
Avoid timeout in accounts.cryptpad.fr caused by the auth app
|
6 years ago |
|
ansuz
|
e77f833652
|
come back to this error
|
6 years ago |
|
ansuz
|
ad4e36015b
|
Merge branch 'soon' into staging
|
6 years ago |
|
ansuz
|
91cff453f1
|
enable shared folders by default
|
6 years ago |
|
yflory
|
673dc22159
|
Update messenger UI
|
6 years ago |
|
yflory
|
0e9b30744b
|
Add support for less highlighting
|
6 years ago |
|
yflory
|
6b4643a916
|
Add syntax highlighting in code blocks rendered from markdown
|
6 years ago |
|
ansuz
|
cb87f49b1f
|
Merge pull request #271 from Nordgedanken/fix-#254
[WIP] Partially Fix #254
|
6 years ago |
|
yflory
|
248b87a1e1
|
Enable chat in the poll app
|
6 years ago |
|
yflory
|
9db9b132b6
|
Use framework outer in the whiteboard app
|
6 years ago |
|
yflory
|
8243927352
|
Fix an issue preventing shared folders from being moved in the drive
|
6 years ago |
|
yflory
|
35977a7ef0
|
Color consistency in kanban
|
6 years ago |
|
ansuz
|
7deb346552
|
update to new marked lib without breaking custom renderers
|
6 years ago |
|
yflory
|
4025022352
|
Fix contextual chat notifications
|
6 years ago |
|
yflory
|
e75b9ea168
|
Prevent shared folders from being dropped to the trash
|
6 years ago |
|
yflory
|
874156ccf0
|
Prevent shared folders from being moved to the trash using the del key
|
6 years ago |
|
yflory
|
bd1b120ab1
|
Add feedback about crowdfunding
|
6 years ago |
|
yflory
|
f662036817
|
Change the hash in the address bar when browsing a shared folder
|
6 years ago |
|
yflory
|
38daf4676c
|
Add text in the drive's share button for consistency
|
6 years ago |
|
yflory
|
7a93927068
|
Fix UI issues with the new pad modals
|
6 years ago |
|
yflory
|
179df27e3c
|
Fix autostore not displaying the error message when over pin limit
|
6 years ago |
|
yflory
|
c1ef8243a1
|
Ability to select multiple files to upload (#275)
|
6 years ago |
|
yflory
|
747c7ffdc3
|
Improve UI for contextual chat and add warning message
|
6 years ago |
|
yflory
|
6c27d2964c
|
Disable friends chat in pad messenger
|
6 years ago |
|
yflory
|
1895d6cbd8
|
Disable crowdfunding message for premium users
|
6 years ago |
|
yflory
|
6257b23f16
|
Crowdfunding config
|
6 years ago |
|
yflory
|
716159d300
|
Add OpenCollective links
|
6 years ago |
|
MTRNord
|
8b384d6bb3
|
fix jscolor picker for new kanban items and fix the code according to CI
|
6 years ago |
|
MTRNord
|
e7a1433a30
|
fix loading of the item color from saved state
|
6 years ago |
|
MTRNord
|
2ef397a483
|
improve item color picker logic and UX
|
6 years ago |
|
yflory
|
d2c1ed5eff
|
Implement reconnect function in the messenger
|
6 years ago |
|
MTRNord
|
3c2417b479
|
fix more whitespace in jkanban.js
|
6 years ago |
|
MTRNord
|
7e686a065e
|
Merge remote-tracking branch 'origin/fix-#254' into fix-#254
|
6 years ago |
|
MTRNord
|
57ed2636ac
|
jkanban.js fix whitespace changes
|
6 years ago |
|
yflory
|
1b2f47c0c0
|
Try a new status indicator in messaging
|
6 years ago |
|
yflory
|
1cd1542d19
|
Update messaging info displayed before entering a room
|
6 years ago |
|
yflory
|
10823fc124
|
Add toolbar notification when the messenger is closed
|
6 years ago |
|
yflory
|
5276dc0bf6
|
lint compliance
|
6 years ago |
|
yflory
|
621fc9a897
|
Ability to disable messenger at a global level
|
6 years ago |
|
yflory
|
c38eb6588e
|
Fix small issues with the messenger
|
6 years ago |
|
yflory
|
8b05b1acaf
|
Fix scrolling issue in pad when the userlist or the messenger was too big
|
6 years ago |
|
yflory
|
42ffe0ee30
|
Fix initial history rules
|
6 years ago |
|
yflory
|
6c6ce7b7a8
|
Fix messenger bugs
|
6 years ago |
|
yflory
|
19da04664a
|
other typo
|
6 years ago |
|
yflory
|
b62aa9224e
|
Fix typo
|
6 years ago |
|
yflory
|
ac989a1e73
|
lint compliance
|
6 years ago |
|
yflory
|
f3c36bfd57
|
Improve messenger initial history
|
6 years ago |
|
yflory
|
26055e5e55
|
Messenger messages UI
|
6 years ago |
|
yflory
|
40c7cdd7c8
|
Fix an issue with messenger while opening the same tab twice
|
6 years ago |
|
yflory
|
216c94b1f0
|
Fix messenger notifications
|
6 years ago |
|
yflory
|
382690e5c8
|
Don't open other pads' chat in the current pad's messenger
|
6 years ago |
|
yflory
|
3acf202830
|
Test UI
|
6 years ago |
|
yflory
|
56c30fc02e
|
lint compliance
|
6 years ago |
|
yflory
|
8f6d0b1c3a
|
Merge branch 'staging' into chat
|
6 years ago |
|
yflory
|
9eb4e2e0dc
|
Reorder the chat rooms in the list based on the time of the last message
|
6 years ago |
|
yflory
|
cdce69e677
|
Improve messenger UI in apps
|
6 years ago |
|
yflory
|
d4dd58e7df
|
Add a pad room when the messenger is active in a pad
|
6 years ago |
|
yflory
|
9e27f111cb
|
lint compliance
|
6 years ago |
|
yflory
|
e6743887fc
|
Refactor contacts/messenger so that it is usable directly in the apps
|
6 years ago |
|
ansuz
|
0e70961074
|
password-protected shared folders aren't urgent. dropping the XXX
|
6 years ago |
|
yflory
|
5b6aa4ba0a
|
Reorder autostore options in Settings
|
6 years ago |
|
yflory
|
2f3576f90e
|
Fix image preview not resized correctly in the mediatag dialog
|
6 years ago |
|
yflory
|
ab07554d0b
|
Fix initial size of the image preview in the mediatag dialog
|
6 years ago |
|
yflory
|
525703e7d8
|
Fix autostore popup displayed for dropped files
|
6 years ago |
|
yflory
|
855612e98b
|
Make oo work with hashes v2
|
6 years ago |
|
yflory
|
bf9cf95292
|
Merge branch 'staging' into oo2
|
6 years ago |
|
yflory
|
ee1027ceb9
|
Ability to import mediatags to the drive
|
6 years ago |
|
yflory
|
2bb7e68792
|
Remember previous values in the file upload modal
|
6 years ago |
|
yflory
|
475301477f
|
Progress bar for loading a pad (framework only)
|
6 years ago |
|
yflory
|
264f7dc6a1
|
Move base64 migration prompt to corner and only when the pad is stored
|
6 years ago |
|
yflory
|
7b06626581
|
Merge branch 'autostore' into staging
|
6 years ago |
|
yflory
|
90c96bfb70
|
Prompt users to migrate base64 images to mediatags in the pad app
|
6 years ago |
|
yflory
|
b1f2d287b4
|
Add warning for chrome 68 users on Mac
|
6 years ago |
|
Marcel
|
886451393e
|
Merge branch 'master' into fix-#254
|
6 years ago |
|
yflory
|
256b7b5bb4
|
Phantom viewers potential fix
|
6 years ago |
|
yflory
|
0e1c525c30
|
Fix an issue with new shared folder added to drive from another session
|
6 years ago |
|
yflory
|
d201e9a0cd
|
Disable some toolbar features not available if the pad is not stored
|
6 years ago |
|
yflory
|
9ebb598467
|
Make automatic pad storage configurable
|
6 years ago |
|
yflory
|
e8a5244362
|
Autostore base
|
6 years ago |
|
yflory
|
5cd3cdc208
|
Don't handle drop events in the blockbase64 plugin
|
6 years ago |
|
yflory
|
3f89dd9908
|
Disable pasting base64 images in ckeditor
|
6 years ago |
|
yflory
|
aa2a01174f
|
lint compliance
|
6 years ago |
|
yflory
|
a117e329dc
|
Add a Share entry in the drive's context menu
|
6 years ago |
|
yflory
|
e0b7f3f965
|
When importing a shared folder to the drive, open this folder directly
|
6 years ago |
|
yflory
|
630a2dab78
|
Fix context menu issues with shared folders in the tree
|
6 years ago |
|
yflory
|
fddff11fae
|
Rename shared drive to shared folder
|
6 years ago |
|
yflory
|
61659c1252
|
Fix template icon not overriden by a thumbnail in the PCS
|
6 years ago |
|
yflory
|
ce08d7b650
|
Merge branch 'master' into soon
|
6 years ago |
|
yflory
|
b084b892bd
|
Fix cache issues with workers in firefox
|
6 years ago |
|
ansuz
|
af40e140f9
|
safety net for call of undefined function in mergeDrive
|
6 years ago |
|
ansuz
|
2259d1b6ac
|
Merge branch 'soon' into staging
|
6 years ago |
|
ansuz
|
8a113d742e
|
Merge pull request #245 from xwiki-labs/issue-169-anchors-should-output-anchors
#169: First anchor test and restore of the CKEditor anchor function.
|
6 years ago |
|
ansuz
|
fb9cf2c81e
|
lint compliance
|
6 years ago |
|
Paul Libbrecht
|
0dc1500784
|
This should solve issue #169: The test now completes with the insertion of a random anchor (menu-driven) and some text, the export is then checked to contain <a name="..." id="..."> as expected, then cleans up.
paul
|
6 years ago |
|
ansuz
|
88c43cfc5c
|
address a linter error
|
6 years ago |
|
ansuz
|
f5172fd05f
|
Merge branch 'soon' into staging
|
6 years ago |
|
ansuz
|
24c7ce57e1
|
apply the fix for password change recommended by @sairim
|
6 years ago |
|
MTRNord
|
343e63f41b
|
Fix drag bug
|
6 years ago |
|
MTRNord
|
1bf1253963
|
Add color picker to items
|
6 years ago |
|
MTRNord
|
8df1dc19f2
|
Add Color picker for board title and let it have less space between boards. (Default colors are still working)
|
6 years ago |
|
yflory
|
a65e083fca
|
Change PCS template icons
|
6 years ago |
|
yflory
|
33fb48d59a
|
Update shared folder icon in the drive
|
6 years ago |
|
yflory
|
9a6fa4cbe2
|
Create a copy when uploading an owned file in a shared folder
|
6 years ago |
|
yflory
|
55715748cc
|
Fix typo in contacts app preventing new lines
|
6 years ago |
|
yflory
|
20a9eee719
|
Disable shared folders creation by default
|
6 years ago |
|
yflory
|
f2baaf5b5b
|
Fix shared folders issues including disappearing folders
|
6 years ago |
|
yflory
|
4325ed4dde
|
Fix small UI issues in drive
|
6 years ago |
|
yflory
|
bad1d7311a
|
Fix drive tests
|
6 years ago |
|
yflory
|
8ab786e7df
|
Drive restore loading screen text
|
6 years ago |
|
yflory
|
d816a2ed9f
|
Prevent timeout when restoring drive
|
6 years ago |
|
yflory
|
2be78deb93
|
Fix Drive history
|
6 years ago |
|
yflory
|
8b20b14184
|
Fix current path in toolbar reversing some names
|
6 years ago |
|
yflory
|
c08951dd91
|
Press enter to create a shared folder when typing its name
|
6 years ago |
|
yflory
|
8c20c7823e
|
Empty trash callback was missing
|
6 years ago |
|
yflory
|
1e092f36ba
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
|
yflory
|
a95cf85f20
|
Fix shared folder creation using the wrong icon
|
6 years ago |
|
Caleb James DeLisle
|
5527949c70
|
Make LessLoader flow properly, sorry about that
|
6 years ago |
|
ansuz
|
a181c09a68
|
Merge branch 'soon' into staging
|
6 years ago |
|
ansuz
|
c1eb6d6a01
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
6 years ago |
|
ansuz
|
e2600e4b36
|
display a loading screen while users are changing their passwords
|
6 years ago |
|
yflory
|
f97685cc15
|
lint compliance
|
6 years ago |
|
yflory
|
ef73cf89cd
|
Merge branch 'soon' into staging
|
6 years ago |
|
yflory
|
8eccffd8e4
|
Don't remove migrated read-only pads
|
6 years ago |
|
yflory
|
64b51f3a80
|
jshint compliance
|
6 years ago |
|
yflory
|
ebfa2c2dc3
|
Merge branch 'less-less' into staging
|
6 years ago |
|
yflory
|
aafcb1bc02
|
Merge branch 'sharedfolder' into staging
|
6 years ago |
|
Caleb James DeLisle
|
8d95efa144
|
Reference the relevant line in alertify.js
|
6 years ago |