yflory
|
ef452d1221
|
Fix language detection in codemirror when importing a markdown file
|
2019-01-15 18:20:33 +01:00 |
|
yflory
|
8dbeee1af9
|
Realtime spreadsheets
|
2019-01-15 17:54:44 +01:00 |
|
yflory
|
a41a31a574
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-01-15 14:34:17 +01:00 |
|
yflory
|
6fa7b147e9
|
Add C, C++, Objective-C and Java to the list of languages in the code app
|
2019-01-15 14:34:11 +01:00 |
|
yflory
|
c5f554fe7b
|
Test with onlyoffice 5.2.6
|
2019-01-15 14:28:49 +01:00 |
|
yflory
|
b79ba61984
|
Improve realtime channel for onlyoffice
|
2019-01-15 10:46:39 +01:00 |
|
ansuz
|
5a61453492
|
Merge branch 'soon' into staging
|
2019-01-14 16:42:37 +01:00 |
|
ansuz
|
6cf8720458
|
update how the async store chooses to prune history to avoid the diverged checkpoint bug
|
2019-01-14 16:40:54 +01:00 |
|
ansuz
|
9105a89eab
|
intantiate ephemeral channels with 34 hex characters
|
2019-01-14 15:32:49 +01:00 |
|
yflory
|
efdecd4059
|
First step for realtime in onlyoffice apps
|
2019-01-14 14:01:22 +01:00 |
|
ansuz
|
6f89156415
|
guard against calling an undefined function
|
2019-01-11 17:01:43 +01:00 |
|
yflory
|
41a1148c17
|
Use the same code for the different frontend channels
|
2019-01-11 15:30:26 +01:00 |
|
ansuz
|
20959f84ae
|
return Boolean from our test for WebRTC support
|
2019-01-10 18:21:39 +01:00 |
|
yflory
|
b4aae68c0c
|
Fix access rights in the file app
|
2019-01-09 12:15:08 +01:00 |
|
ansuz
|
0783944e1c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-01-08 15:17:51 +01:00 |
|
ansuz
|
424a14625d
|
add feedback keys for password change and drive migration
|
2019-01-08 15:17:43 +01:00 |
|
yflory
|
573a3557f1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-01-08 15:03:16 +01:00 |
|
yflory
|
5b80fafe5e
|
Add feedback
|
2019-01-08 15:03:02 +01:00 |
|
ansuz
|
bcd6a4b6c6
|
add feedback keys
|
2019-01-08 14:33:02 +01:00 |
|
yflory
|
107c352922
|
Update translations
|
2019-01-08 14:02:54 +01:00 |
|
yflory
|
f760253137
|
Fix typo
|
2019-01-08 14:02:03 +01:00 |
|
yflory
|
d87a87410d
|
Preserve hidden owned pads from a deleted folder
|
2019-01-08 13:57:22 +01:00 |
|
yflory
|
a9e030a6a8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-01-08 10:54:00 +01:00 |
|
ansuz
|
611fb4895c
|
Merge branch 'soon' into staging
|
2019-01-07 17:07:21 +01:00 |
|
Paul Libbrecht
|
1cd79e12f2
|
Latest update of the German translation (cursors, shared folders, ...).
|
2019-01-07 12:25:19 +01:00 |
|
yflory
|
1e672c4a6b
|
Use onlyoffice spreadsheets without ooserver
|
2019-01-07 12:02:38 +01:00 |
|
yflory
|
047a4a3ab4
|
Copy files to a shared folder instead of moving them
|
2019-01-07 10:25:13 +01:00 |
|
rhoio
|
5294604b90
|
Style, grammar and typo fixes in german translation
|
2019-01-06 17:40:36 +01:00 |
|
yflory
|
0a7adb3e88
|
Hide duplicated owned pads
|
2019-01-04 15:10:13 +01:00 |
|
yflory
|
7658fb90a2
|
Translations for spellcheck
|
2019-01-03 18:47:27 +01:00 |
|
yflory
|
cef9733262
|
Enable spellcheck in pad
|
2018-12-21 18:16:29 +01:00 |
|
yflory
|
c6acd191b9
|
Own drive translations
|
2018-12-20 11:18:12 +01:00 |
|
yflory
|
f2f9b57505
|
Own drive migration
|
2018-12-19 18:59:20 +01:00 |
|
yflory
|
b2b23446e8
|
Add missing translations
|
2018-12-18 14:48:52 +01:00 |
|
yflory
|
bbc06f668f
|
Fix undefined hash for deleted shared folders
|
2018-12-17 15:49:48 +01:00 |
|
yflory
|
a11a883cff
|
Cursor improvements in pad, code and slide
|
2018-12-17 11:44:08 +01:00 |
|
yflory
|
760f58b74c
|
Merge branch 'staging' into oo2
|
2018-12-13 16:24:11 +01:00 |
|
yflory
|
ae7d97b3dd
|
Ability to disable apps using appconfig
|
2018-12-12 14:52:58 +01:00 |
|
yflory
|
f883fb7e04
|
Preserve chat and cursor channel when importing a template
|
2018-12-12 13:48:28 +01:00 |
|
yflory
|
1a0344547b
|
Improve cursor in pad
|
2018-12-11 15:59:40 +01:00 |
|
yflory
|
bfd94c7f2b
|
Merge branch 'cursor' into staging
|
2018-12-11 13:36:49 +01:00 |
|
yflory
|
95a0bc9fc1
|
Merge branch 'rochat' into staging
|
2018-12-11 13:36:41 +01:00 |
|
yflory
|
489a99c5c4
|
Don't delete the old chat for now
|
2018-12-11 13:35:00 +01:00 |
|
yflory
|
0197f583f2
|
Translations for the cursor position settings
|
2018-12-11 12:04:11 +01:00 |
|
yflory
|
13da052325
|
Update translation key
|
2018-12-11 11:09:34 +01:00 |
|
yflory
|
fb5ad34299
|
Fix typo...
|
2018-12-11 10:57:43 +01:00 |
|
yflory
|
a121df2600
|
Delete validateKey in the messenger memory when we leave the channel
|
2018-12-11 10:52:11 +01:00 |
|
ansuz
|
8affe4053c
|
Merge branch 'staging' of github.com:joldie/cryptpad into print-code
|
2018-12-11 10:41:17 +01:00 |
|
yflory
|
d88dee9a83
|
Restrict sending messages in a pad chat to editors only
|
2018-12-10 17:47:47 +01:00 |
|
yflory
|
32fc941141
|
Merge branch 'staging' into cursor
|
2018-12-10 13:46:27 +01:00 |
|
yflory
|
a2e28e6e25
|
Fix missing avatar in cursor tooltip
|
2018-12-10 13:46:21 +01:00 |
|
yflory
|
c6f63d4d54
|
Cursor position in pad
|
2018-12-10 11:57:39 +01:00 |
|
joldie
|
35c39fae5d
|
Added print button to code pad page.
|
2018-12-06 16:43:48 +01:00 |
|
yflory
|
600c984576
|
Only show the user colors in the userlist if the app supports it
|
2018-12-06 13:59:56 +01:00 |
|
yflory
|
081fc01694
|
Add a settings category about the cursor
|
2018-12-06 13:48:14 +01:00 |
|
yflory
|
c81b4d77e8
|
lint compliance
|
2018-12-06 11:55:40 +01:00 |
|
yflory
|
f157f852b1
|
Fix and improve cursor
|
2018-12-06 11:54:34 +01:00 |
|
yflory
|
1ba80a344b
|
See other users' cursor position
|
2018-12-04 17:18:42 +01:00 |
|
yflory
|
008b5a3e9f
|
Fix an ownership issue in friend channels
|
2018-11-27 16:57:55 +01:00 |
|
yflory
|
ca45ff31d1
|
Refactor messenger to use commands from UI to store
|
2018-11-27 16:55:56 +01:00 |
|
yflory
|
f5965716b6
|
Minor update because of flow...
|
2018-11-27 13:58:33 +01:00 |
|
yflory
|
2a46b8f855
|
Fix an issue with last known hash in the messenger
|
2018-11-27 13:42:11 +01:00 |
|
yflory
|
dbad925e5e
|
New cursor recovery system (beta)
|
2018-11-26 16:23:16 +01:00 |
|
yflory
|
13d6579861
|
Add typing test in the code app
|
2018-11-22 14:45:12 +01:00 |
|
ansuz
|
1b83431382
|
Merge branch 'master' of https://git.xwikisas.com/xwiki-labs/cryptpad
|
2018-11-20 13:11:49 +01:00 |
|
ansuz
|
d407f9af74
|
downgrade an XXX to a FIXME
|
2018-11-20 11:27:59 +01:00 |
|
ansuz
|
fcce48f2dd
|
Merge branch 'soon' into staging
|
2018-11-20 11:12:41 +01:00 |
|
yflory
|
8522c3723d
|
Translations for the NGI logo
|
2018-11-19 17:08:20 +01:00 |
|
yflory
|
3a4cfbb7e8
|
Disable HTML in chat
|
2018-11-13 17:19:28 +01:00 |
|
yflory
|
22f1ac9e1e
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2018-11-13 14:21:24 +01:00 |
|
yflory
|
fc915e3337
|
Use DiffMarked in messenger to avoid duplicate code
|
2018-11-13 14:14:23 +01:00 |
|
yflory
|
b166c70a5f
|
Fix conflict when a user was reverting the latest patch from someone else
|
2018-11-09 16:38:16 +01:00 |
|
yflory
|
8f849d8d4a
|
Merge branch 'staging' into cursor
|
2018-11-08 18:24:33 +01:00 |
|
yflory
|
4daa2266c0
|
Fix new network open for each shared folder
|
2018-11-08 18:24:06 +01:00 |
|
yflory
|
fe0d579d56
|
Cursor improvements in pad (Beta)
|
2018-11-08 12:06:46 +01:00 |
|
yflory
|
82c3c7f50b
|
Improve the Typing Test in pad
|
2018-11-08 10:46:07 +01:00 |
|
yflory
|
a5b04bd62a
|
Download a file from the drive using the context menu
|
2018-11-06 18:35:04 +01:00 |
|
Paul Libbrecht
|
3f2e6b0611
|
completion
|
2018-11-06 13:01:17 +01:00 |
|
yflory
|
4e26a8fbc5
|
Merge branch 'soon' into staging
|
2018-11-06 10:47:03 +01:00 |
|
Paul Libbrecht
|
12b2224dad
|
Bad syntax error left. Sorry. Now fixed.
paul
|
2018-11-05 19:10:56 +01:00 |
|
yflory
|
b74e086602
|
Shortcuts are now added from sframe-common
|
2018-11-05 17:46:51 +01:00 |
|
yflory
|
05e7d5eb9b
|
Add missing translation
|
2018-11-05 17:32:25 +01:00 |
|
yflory
|
997692efb4
|
Use the font-size codemirror setting in the slide app too
|
2018-11-05 17:30:07 +01:00 |
|
yflory
|
1c5847dd01
|
Prevent Ctrl+S from saving useless content. Add support for custom shortcuts in CkEditor
|
2018-11-05 16:53:25 +01:00 |
|
yflory
|
1d31aab990
|
Display more warning messages about the full drive export
|
2018-11-05 15:09:32 +01:00 |
|
yflory
|
7509ce1cc7
|
Use new application icons
|
2018-11-05 12:02:27 +01:00 |
|
Paul Libbrecht
|
31a6fac4e0
|
Update German translation with latest phrases. Paul
|
2018-11-02 21:03:20 +01:00 |
|
ansuz
|
ef08771ffa
|
Fix typo in German translation, closes #290
s/Unbenennen/Umbenennen
|
2018-10-29 12:11:16 +01:00 |
|
yflory
|
db25d914ab
|
Improve default UI for small or zoomed screens
|
2018-10-29 11:48:22 +01:00 |
|
yflory
|
8b554dec63
|
Set font size in code editor from the settings page (#140)
|
2018-10-29 11:46:57 +01:00 |
|
yflory
|
e4daa5adbe
|
Fix random character insertion
|
2018-10-25 17:26:46 +02:00 |
|
yflory
|
98db6057c8
|
Allow shared workers by default
|
2018-10-23 15:06:17 +02:00 |
|
yflory
|
3c99302c32
|
Update French translation
|
2018-10-23 14:21:42 +02:00 |
|
yflory
|
4e3c09f640
|
Merge branch 'master' into staging
|
2018-10-22 17:22:28 +02:00 |
|
yflory
|
6924541080
|
Merge branch 'move' into staging
|
2018-10-22 17:13:41 +02:00 |
|
yflory
|
85cb56df1d
|
Import changes from pull requests in master (translation files were moved)
|
2018-10-22 17:11:17 +02:00 |
|
yflory
|
fc86e5daf8
|
French translation
|
2018-10-22 15:13:55 +02:00 |
|
yflory
|
ef37bac2e7
|
Add UI for the CryptDrive export
|
2018-10-19 18:38:35 +02:00 |
|
yflory
|
3e9e92dcac
|
Implement full CryptDrive export
|
2018-10-18 18:50:38 +02:00 |
|
yflory
|
92ce311694
|
Basic CryptDrive export with pads
|
2018-10-17 14:32:33 +02:00 |
|
yflory
|
f4d5a7567f
|
Return an error when the pad has been deleted from the server
|
2018-10-16 17:49:24 +02:00 |
|
yflory
|
9f0398826d
|
Make customized translations more maintainable
|
2018-10-15 18:38:41 +02:00 |
|
yflory
|
caa72ba949
|
Remove dropdown menus scrollbar when space is available
|
2018-10-15 16:35:21 +02:00 |
|
yflory
|
3257914b17
|
Add support for PowerShell mode in codemirror
|
2018-10-08 11:16:38 +02:00 |
|
yflory
|
bf55657993
|
Password-protected shared folders
|
2018-10-05 18:06:11 +02:00 |
|
yflory
|
c127f0a5f6
|
Add a comment
|
2018-10-05 18:04:48 +02:00 |
|
yflory
|
7d3d3cf5ac
|
Distinguish between two anonymous users in the chat
|
2018-10-05 18:04:20 +02:00 |
|
ansuz
|
90c905827d
|
Merge pull request #281 from ryanpcmcquen/patch-2
Typo fix: additionnal => additional
|
2018-10-05 10:22:03 -04:00 |
|
yflory
|
2a313a90e0
|
Don't rejoin a dropped channel on reconnect and leave chat channel
|
2018-10-04 11:08:23 -04:00 |
|
yflory
|
498703384f
|
Don't rejoin a dropped channel on reconnect and leave chat channel
|
2018-10-04 15:29:34 +02:00 |
|
yflory
|
2a86db2001
|
New Features page
|
2018-10-03 17:25:04 +02:00 |
|
yflory
|
5cbe2f7c0f
|
Fix tag autocomplete and Tags category in the drive
|
2018-10-03 15:22:13 +02:00 |
|
yflory
|
5d3d591228
|
Keep trying until the first tab is loaded
|
2018-10-02 18:14:06 +02:00 |
|
yflory
|
c59d744d78
|
Fix loading a tab while another one is initializing the worker
|
2018-10-02 17:49:39 +02:00 |
|
ansuz
|
1d63419df8
|
update error handling, but leave the note to come back
|
2018-10-02 11:31:08 -04:00 |
|
yflory
|
c5c6dc8223
|
Enable browser notifications for messaging tools
|
2018-10-02 12:08:25 +02:00 |
|
yflory
|
1201f2dcc4
|
Fix small UI issue
|
2018-10-01 18:28:25 +02:00 |
|
yflory
|
9a6e6f6e15
|
Fix User menu and link to drive in anonymous shared folders
|
2018-10-01 18:24:08 +02:00 |
|
yflory
|
d78a00b5e1
|
Ese the correct document type in the text for the store corner popup
|
2018-10-01 17:35:19 +02:00 |
|
yflory
|
930677750c
|
Merge branch 'anonsf' into staging
|
2018-10-01 16:21:53 +02:00 |
|
yflory
|
0a83840c9c
|
View a shared folder with an unregistered user
|
2018-10-01 15:17:27 +02:00 |
|
Ryan P. C. McQuen
|
df442f9b1e
|
Typo fix: additionnal => additional
|
2018-09-28 20:16:41 -07:00 |
|
yflory
|
17bc1ee703
|
Load shared folder when not logged in
|
2018-09-28 15:06:24 +02:00 |
|
ansuz
|
e77f833652
|
come back to this error
|
2018-09-25 20:09:45 -04:00 |
|
ansuz
|
ad4e36015b
|
Merge branch 'soon' into staging
|
2018-09-20 11:44:56 -04:00 |
|
ansuz
|
91cff453f1
|
enable shared folders by default
|
2018-09-20 11:40:42 -04:00 |
|
yflory
|
0e9b30744b
|
Add support for less highlighting
|
2018-09-19 17:06:39 +02:00 |
|
yflory
|
6b4643a916
|
Add syntax highlighting in code blocks rendered from markdown
|
2018-09-19 16:51:53 +02:00 |
|
ansuz
|
7deb346552
|
update to new marked lib without breaking custom renderers
|
2018-09-17 15:35:53 -04:00 |
|
yflory
|
bd1b120ab1
|
Add feedback about crowdfunding
|
2018-09-17 16:02:52 +02:00 |
|
yflory
|
f662036817
|
Change the hash in the address bar when browsing a shared folder
|
2018-09-17 15:10:10 +02:00 |
|
yflory
|
7a93927068
|
Fix UI issues with the new pad modals
|
2018-09-17 14:39:52 +02:00 |
|
yflory
|
179df27e3c
|
Fix autostore not displaying the error message when over pin limit
|
2018-09-17 11:23:35 +02:00 |
|
yflory
|
c1ef8243a1
|
Ability to select multiple files to upload (#275)
|
2018-09-17 10:31:27 +02:00 |
|
yflory
|
6c27d2964c
|
Disable friends chat in pad messenger
|
2018-09-14 15:42:41 +02:00 |
|
yflory
|
1895d6cbd8
|
Disable crowdfunding message for premium users
|
2018-09-14 11:21:52 +02:00 |
|
yflory
|
6257b23f16
|
Crowdfunding config
|
2018-09-14 10:36:29 +02:00 |
|
yflory
|
716159d300
|
Add OpenCollective links
|
2018-09-13 18:47:46 +02:00 |
|
yflory
|
d2c1ed5eff
|
Implement reconnect function in the messenger
|
2018-09-13 15:44:48 +02:00 |
|
yflory
|
10823fc124
|
Add toolbar notification when the messenger is closed
|
2018-09-12 15:07:50 +02:00 |
|
yflory
|
5276dc0bf6
|
lint compliance
|
2018-09-12 14:53:55 +02:00 |
|
yflory
|
621fc9a897
|
Ability to disable messenger at a global level
|
2018-09-12 14:51:37 +02:00 |
|
yflory
|
c38eb6588e
|
Fix small issues with the messenger
|
2018-09-12 11:55:26 +02:00 |
|
yflory
|
6c6ce7b7a8
|
Fix messenger bugs
|
2018-09-11 17:42:00 +02:00 |
|
yflory
|
ac989a1e73
|
lint compliance
|
2018-09-11 16:48:44 +02:00 |
|
yflory
|
f3c36bfd57
|
Improve messenger initial history
|
2018-09-11 16:47:52 +02:00 |
|
yflory
|
40c7cdd7c8
|
Fix an issue with messenger while opening the same tab twice
|
2018-09-10 18:16:24 +02:00 |
|
yflory
|
216c94b1f0
|
Fix messenger notifications
|
2018-09-10 17:50:36 +02:00 |
|
yflory
|
382690e5c8
|
Don't open other pads' chat in the current pad's messenger
|
2018-09-10 17:43:19 +02:00 |
|
yflory
|
cdce69e677
|
Improve messenger UI in apps
|
2018-09-10 13:20:01 +02:00 |
|
yflory
|
d4dd58e7df
|
Add a pad room when the messenger is active in a pad
|
2018-09-07 19:35:06 +02:00 |
|
yflory
|
9e27f111cb
|
lint compliance
|
2018-09-06 18:45:53 +02:00 |
|
yflory
|
e6743887fc
|
Refactor contacts/messenger so that it is usable directly in the apps
|
2018-09-06 18:41:22 +02:00 |
|
yflory
|
525703e7d8
|
Fix autostore popup displayed for dropped files
|
2018-09-04 10:36:19 +02:00 |
|
yflory
|
855612e98b
|
Make oo work with hashes v2
|
2018-09-03 11:20:32 +02:00 |
|
yflory
|
bf9cf95292
|
Merge branch 'staging' into oo2
|
2018-09-03 10:49:12 +02:00 |
|
yflory
|
ee1027ceb9
|
Ability to import mediatags to the drive
|
2018-08-31 15:41:08 +02:00 |
|
yflory
|
2bb7e68792
|
Remember previous values in the file upload modal
|
2018-08-30 12:14:37 +02:00 |
|
yflory
|
475301477f
|
Progress bar for loading a pad (framework only)
|
2018-08-30 12:07:21 +02:00 |
|
yflory
|
264f7dc6a1
|
Move base64 migration prompt to corner and only when the pad is stored
|
2018-08-30 11:21:33 +02:00 |
|
yflory
|
7b06626581
|
Merge branch 'autostore' into staging
|
2018-08-30 10:26:19 +02:00 |
|
yflory
|
90c96bfb70
|
Prompt users to migrate base64 images to mediatags in the pad app
|
2018-08-29 18:20:34 +02:00 |
|
yflory
|
b1f2d287b4
|
Add warning for chrome 68 users on Mac
|
2018-08-28 17:44:15 +02:00 |
|
yflory
|
256b7b5bb4
|
Phantom viewers potential fix
|
2018-08-28 16:28:32 +02:00 |
|
yflory
|
0e1c525c30
|
Fix an issue with new shared folder added to drive from another session
|
2018-08-28 14:29:13 +02:00 |
|
yflory
|
d201e9a0cd
|
Disable some toolbar features not available if the pad is not stored
|
2018-08-28 12:12:47 +02:00 |
|
yflory
|
9ebb598467
|
Make automatic pad storage configurable
|
2018-08-28 11:42:48 +02:00 |
|
yflory
|
e8a5244362
|
Autostore base
|
2018-08-27 14:58:09 +02:00 |
|
yflory
|
a117e329dc
|
Add a Share entry in the drive's context menu
|
2018-08-23 12:34:44 +02:00 |
|
yflory
|
e0b7f3f965
|
When importing a shared folder to the drive, open this folder directly
|
2018-08-23 11:55:14 +02:00 |
|
yflory
|
61659c1252
|
Fix template icon not overriden by a thumbnail in the PCS
|
2018-08-22 16:32:44 +02:00 |
|
yflory
|
ce08d7b650
|
Merge branch 'master' into soon
|
2018-08-22 15:34:06 +02:00 |
|
yflory
|
b084b892bd
|
Fix cache issues with workers in firefox
|
2018-08-22 15:26:42 +02:00 |
|
ansuz
|
af40e140f9
|
safety net for call of undefined function in mergeDrive
|
2018-08-16 16:59:52 +02:00 |
|
yflory
|
a65e083fca
|
Change PCS template icons
|
2018-07-28 11:38:22 +02:00 |
|
yflory
|
9a6fa4cbe2
|
Create a copy when uploading an owned file in a shared folder
|
2018-07-28 08:58:16 +02:00 |
|
yflory
|
20a9eee719
|
Disable shared folders creation by default
|
2018-07-20 18:41:14 +02:00 |
|
yflory
|
f2baaf5b5b
|
Fix shared folders issues including disappearing folders
|
2018-07-20 18:28:56 +02:00 |
|
yflory
|
4325ed4dde
|
Fix small UI issues in drive
|
2018-07-20 12:29:18 +02:00 |
|
yflory
|
bad1d7311a
|
Fix drive tests
|
2018-07-20 12:04:42 +02:00 |
|
yflory
|
d816a2ed9f
|
Prevent timeout when restoring drive
|
2018-07-19 17:51:38 +02:00 |
|
yflory
|
2be78deb93
|
Fix Drive history
|
2018-07-19 17:07:14 +02:00 |
|
yflory
|
8c20c7823e
|
Empty trash callback was missing
|
2018-07-19 15:32:45 +02:00 |
|
Caleb James DeLisle
|
5527949c70
|
Make LessLoader flow properly, sorry about that
|
2018-07-18 16:22:44 +02:00 |
|
yflory
|
ef73cf89cd
|
Merge branch 'soon' into staging
|
2018-07-18 15:10:23 +02:00 |
|
yflory
|
8eccffd8e4
|
Don't remove migrated read-only pads
|
2018-07-18 14:56:49 +02:00 |
|
yflory
|
64b51f3a80
|
jshint compliance
|
2018-07-18 14:25:48 +02:00 |
|
yflory
|
ebfa2c2dc3
|
Merge branch 'less-less' into staging
|
2018-07-18 14:18:37 +02:00 |
|
yflory
|
aafcb1bc02
|
Merge branch 'sharedfolder' into staging
|
2018-07-18 14:18:30 +02:00 |
|
Caleb James DeLisle
|
8d95efa144
|
Reference the relevant line in alertify.js
|
2018-07-18 13:22:27 +02:00 |
|
Caleb James DeLisle
|
a57a8e51a1
|
Prevent alertify.js from overriding styles
|
2018-07-18 13:20:16 +02:00 |
|
ansuz
|
e110f20397
|
support blocks on remote domains
|
2018-07-17 17:41:30 +02:00 |
|
yflory
|
e59aec0a45
|
Try...catch on testworker.js
|
2018-07-17 16:46:24 +02:00 |
|
yflory
|
08005a709e
|
Add a share icon in the drive when displaying a shared folder
|
2018-07-17 16:38:20 +02:00 |
|
ansuz
|
1629d7bb1d
|
provide a SANE default in case httpUnsafeOrigin is not provided
|
2018-07-17 16:31:15 +02:00 |
|
ansuz
|
bcbec0144c
|
provide a default in case httpUnsafeOrigin is not provided
|
2018-07-17 16:20:40 +02:00 |
|
yflory
|
6143bceabb
|
Fix XXX
|
2018-07-17 15:38:23 +02:00 |
|
ansuz
|
a2fd32d6a3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-07-17 14:49:19 +02:00 |
|
ansuz
|
e6d4bced18
|
clean up extraneous variables and log statements
|
2018-07-17 14:34:25 +02:00 |
|
yflory
|
ecb9f039b1
|
Fix pad password change not reloading with the correct URL
|
2018-07-17 12:27:23 +02:00 |