yflory
|
3a4cfbb7e8
|
Disable HTML in chat
|
6 years ago |
yflory
|
22f1ac9e1e
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
6 years ago |
yflory
|
fc915e3337
|
Use DiffMarked in messenger to avoid duplicate code
|
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
|
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
|
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 |
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
|
8b554dec63
|
Set font size in code editor from the settings page (#140)
|
6 years ago |
yflory
|
e4daa5adbe
|
Fix random character insertion
|
6 years ago |
yflory
|
98db6057c8
|
Allow shared workers by default
|
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
|
fc86e5daf8
|
French translation
|
6 years ago |
yflory
|
ef37bac2e7
|
Add UI for the CryptDrive export
|
6 years ago |
yflory
|
3e9e92dcac
|
Implement full CryptDrive export
|
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
|
caa72ba949
|
Remove dropdown menus scrollbar when space is available
|
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
|
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
|
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
|
17bc1ee703
|
Load shared folder when not logged in
|
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
|
0e9b30744b
|
Add support for less highlighting
|
6 years ago |
yflory
|
6b4643a916
|
Add syntax highlighting in code blocks rendered from markdown
|
6 years ago |
ansuz
|
7deb346552
|
update to new marked lib without breaking custom renderers
|
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
|
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
|
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 |
yflory
|
d2c1ed5eff
|
Implement reconnect function in the messenger
|
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
|
6c6ce7b7a8
|
Fix messenger bugs
|
6 years ago |
yflory
|
ac989a1e73
|
lint compliance
|
6 years ago |
yflory
|
f3c36bfd57
|
Improve messenger initial history
|
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
|
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 |
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 |
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
|
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
|
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 |
yflory
|
a65e083fca
|
Change PCS template icons
|
6 years ago |
yflory
|
9a6fa4cbe2
|
Create a copy when uploading an owned file in a shared folder
|
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
|
d816a2ed9f
|
Prevent timeout when restoring drive
|
6 years ago |
yflory
|
2be78deb93
|
Fix Drive history
|
6 years ago |
yflory
|
8c20c7823e
|
Empty trash callback was missing
|
6 years ago |
Caleb James DeLisle
|
5527949c70
|
Make LessLoader flow properly, sorry about that
|
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 |
Caleb James DeLisle
|
a57a8e51a1
|
Prevent alertify.js from overriding styles
|
6 years ago |
ansuz
|
e110f20397
|
support blocks on remote domains
|
6 years ago |
yflory
|
e59aec0a45
|
Try...catch on testworker.js
|
6 years ago |
yflory
|
08005a709e
|
Add a share icon in the drive when displaying a shared folder
|
6 years ago |
ansuz
|
1629d7bb1d
|
provide a SANE default in case httpUnsafeOrigin is not provided
|
6 years ago |
ansuz
|
bcbec0144c
|
provide a default in case httpUnsafeOrigin is not provided
|
6 years ago |
yflory
|
6143bceabb
|
Fix XXX
|
6 years ago |
ansuz
|
a2fd32d6a3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
ansuz
|
e6d4bced18
|
clean up extraneous variables and log statements
|
6 years ago |
yflory
|
ecb9f039b1
|
Fix pad password change not reloading with the correct URL
|
6 years ago |
yflory
|
c9ac3c7c2b
|
Fix search in shared folders
|
6 years ago |
yflory
|
fc91cf606b
|
Disable moveToTrash button for pads in shared folders
|
6 years ago |
ansuz
|
2c22232a47
|
check if a user is logged in strictly by User_hash
|
6 years ago |
ansuz
|
848a918eda
|
remove out of date comments
|
6 years ago |
yflory
|
5b48eff78c
|
Remove owned pads deleted from the server in shared folders
|
6 years ago |
ansuz
|
b9c4aa43b5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
ansuz
|
3d95e6088a
|
leave a FIXME note
|
6 years ago |
Caleb James DeLisle
|
792f7bcc64
|
show how long less takes to compile
|
6 years ago |
Caleb James DeLisle
|
6c49318ac7
|
Show how long it takes to parse less
|
6 years ago |
Caleb James DeLisle
|
0d5ac05866
|
refactoring of the less infrastructure
|
6 years ago |
yflory
|
b5c2eb8a9c
|
Automatically refresh the drive when a change occurs in a shared folder
|
6 years ago |
yflory
|
4706b8a9de
|
Store newly created pads in the correct (shared) folder
|
6 years ago |
yflory
|
6a80f49fe0
|
Don't load expired or deleted shared folders
|
6 years ago |
Caleb James DeLisle
|
a6d3dbf94f
|
Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS
|
6 years ago |
Caleb James DeLisle
|
4a352f2ed8
|
Use import (reference) whenever the less file supposedly emits no CSS
|
6 years ago |
yflory
|
7d89026d83
|
Fix more issues with shared folders
|
6 years ago |
Caleb James DeLisle
|
c5105d7b84
|
Merge branch 'check-for-css-variables' into staging
|
6 years ago |
Caleb James DeLisle
|
a440359bc7
|
Commit patches provided to me by someone who Seemed Trustworthy At The Time
(should fix false negatives in shared-worker detection)
|
6 years ago |
Caleb James DeLisle
|
cb8888ea1a
|
Yes, so it turns out that making a small asthetic change after testing on every browser does actually break it :|
|
6 years ago |
Caleb James DeLisle
|
fabdbc3b61
|
Add a feedback test for checking for CSS variables, so we won't use a feature which is not implemented by the vast majority of the people using CryptPad...
|
6 years ago |
yflory
|
8516587ece
|
lint compliance
|
6 years ago |
yflory
|
9787f5304a
|
Don't unpin channels that are still in another proxy
|
6 years ago |
yflory
|
321c7d5512
|
Move pin/unpin outside of userObject
|
6 years ago |
ansuz
|
8574128efd
|
unstub password change function
|
6 years ago |
ansuz
|
25b0d764ed
|
pass initialState variable when copying your drive in the changeUserPassword function
because the hardest problems to debug are always fixed with one line changes
|
6 years ago |
ansuz
|
54bc29f28c
|
WIP maybe I missed something
|
6 years ago |
yflory
|
66a494cbd2
|
temp
|
6 years ago |
yflory
|
4b86ed2dec
|
Shared folders UI
|
6 years ago |
ansuz
|
0a9ea95796
|
always set userHash in localStorage even with modern users
|
6 years ago |
yflory
|
bc7524c134
|
Fix tippy
|
6 years ago |
yflory
|
6312dadb60
|
Fix shared folders names in the drive
|
6 years ago |
yflory
|
e0cc1a6eb6
|
Display a shared folder in the drive
|
6 years ago |
ansuz
|
a15e232469
|
complete modern user registration/login. general cleanup
|
6 years ago |
ansuz
|
d79064a4c5
|
Merge branch 'staging' into modern-users2
|
6 years ago |
ansuz
|
4ef2cfa88d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
ansuz
|
57a39258c3
|
WIP big commit
|
6 years ago |
ansuz
|
0c3b898000
|
simple one line fixes
|
6 years ago |
yflory
|
0c9dfc1fb5
|
Add proxy manager inner
|
6 years ago |
yflory
|
bd6a199dca
|
Add missing functions to the proxy manager
|
6 years ago |
yflory
|
a25a72b5db
|
Add a proxy manager to handle operations between shared folders
|
6 years ago |
yflory
|
66591a3654
|
Merge branch 'rohref' into sharedfolder
|
6 years ago |
ansuz
|
a3e0e765b5
|
derive block URI and URL in dedicated functions
|
6 years ago |
yflory
|
a99e5a3aaa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
yflory
|
af5cc30381
|
Fix undefined function when calling error() in the drive
|
6 years ago |
yflory
|
071c34d4fa
|
Fix undefined secret with password-protected files (#250)
|
6 years ago |
yflory
|
27797c0520
|
Fix undefined secret with password-protected files (#250)
|
6 years ago |
yflory
|
425ac8ea57
|
Migration for read-only links + fix issues with read-only pads
|
6 years ago |
yflory
|
0f9a71686e
|
Add support for read-only href stored in filesData
|
7 years ago |
yflory
|
34914785eb
|
lint compliance
|
7 years ago |
yflory
|
a537f7de8b
|
Fix infinite loading screen caused by some browser settings
|
7 years ago |
yflory
|
470f404a24
|
temp
|
7 years ago |
ansuz
|
cfc81e8c96
|
allocate blockSeed as Uint8Array
|
7 years ago |
yflory
|
554b4a978d
|
Load shared folders in the store
|
7 years ago |
ansuz
|
7aa7b82c60
|
merge staging
|
7 years ago |
yflory
|
6dc7e7eff4
|
Disable WebWorkers by default
|
7 years ago |
yflory
|
bfb850554d
|
Fix the contacts app with workers
|
7 years ago |
yflory
|
87dc528a99
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
yflory
|
6d8693ff8c
|
Fix history mode UI
|
7 years ago |
ansuz
|
7dc393a2d2
|
remove debug log
|
7 years ago |
ansuz
|
d76f3dceab
|
remove comment
|
7 years ago |
ansuz
|
fb5553f918
|
fix typo
|
7 years ago |
yflory
|
76bc82ac13
|
lint compliance
|
7 years ago |
yflory
|
0160ef30b7
|
Fix pad password change
|
7 years ago |
yflory
|
fbe940c024
|
Fallback to async store in self.crypto doesn't exist in webworkers (ie/edge)
|
7 years ago |
ansuz
|
01614c4256
|
verify old user password before proceeding to change passwords
|
7 years ago |
ansuz
|
85bcaa51f7
|
export a constant for the number of required bytes at login time
allocate bytes for blockSeed when changing passwords
|
7 years ago |
yflory
|
a146f6acc9
|
Change user account password function
|
7 years ago |
ansuz
|
6fde027a6c
|
add some TODOs
|
7 years ago |
ansuz
|
9a7abe0b1e
|
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
|
7 years ago |
ansuz
|
c2014c5906
|
a bit of cleanup, bug fixes, and lint compliance
|
7 years ago |
yflory
|
36d1ae0f6c
|
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
|
7 years ago |
yflory
|
71b085ba23
|
Owned drive migration UI
|
7 years ago |
ansuz
|
c3741f847d
|
resolve conflicts from merge with staging
|
7 years ago |
ansuz
|
d03339f20b
|
check for the presence of a blockHash in localStorage when logging in
|
7 years ago |
ansuz
|
3ba0ad3cf1
|
get, set, and clear blocks from localStorage
|
7 years ago |
ansuz
|
cb5fa72dba
|
implement removeLoginBlock rpc
|
7 years ago |
yflory
|
7948fe2b70
|
Merge branch 'soon' into staging
|
7 years ago |
yflory
|
29f577dfc6
|
Improve history to load it chunk by chunk
|
7 years ago |
ansuz
|
577dea4c75
|
clientside implementation of block signing and encryption
|
7 years ago |
yflory
|
c802b761c7
|
Fix pads not stored in the correct folder the first time
|
7 years ago |
yflory
|
60db53a993
|
Use framework in the whiteboard app
|
7 years ago |
yflory
|
d37aa0646e
|
Change account password (clientside RPC)
|
7 years ago |
yflory
|
54d63df1cf
|
Ability to change the password of a pad
|
7 years ago |
yflory
|
d1e8baca68
|
Lint compliance
|
7 years ago |
yflory
|
4896fe81fe
|
Merge branch 'serviceworker' into staging
|
7 years ago |
yflory
|
1b49020753
|
Add support for async store when WebWorker is not available
|
7 years ago |
ansuz
|
ff25929c18
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
54b52d681c
|
fix broken share menu resulting from adblock plus triggered by 'share'
|
7 years ago |
yflory
|
d558b9e3e8
|
Fix 404 issues in media-tag
|
7 years ago |
yflory
|
9fbf507cda
|
Fix new version detection
|
7 years ago |
ansuz
|
aa51463a9a
|
Merge branch 'soon' into staging
|
7 years ago |
yflory
|
4dec2cca5c
|
Translations for new version detected
|
7 years ago |
yflory
|
089e0361b6
|
Detect new version
|
7 years ago |
yflory
|
da396b6528
|
Remove XXX
|
7 years ago |
yflory
|
aeaf7d1950
|
Fix mediatag...
|
7 years ago |
yflory
|
054ad9e741
|
Fix 404 in thumbnails creation with corrupted data in the drive
|
7 years ago |
yflory
|
8f28621bb0
|
Remove unnecessary logs when logging in
|
7 years ago |
yflory
|
e39c77e162
|
Merge branch 'staging' into serviceworker
|
7 years ago |
yflory
|
921e6eb3c3
|
Fix wrong pad title in drive
|
7 years ago |
yflory
|
996245ec3d
|
Merge branch 'staging' into serviceworker
|
7 years ago |
yflory
|
47dee664da
|
Add support for login & logout while keeping the same shared worker
|
7 years ago |
ansuz
|
756681211b
|
update home page icons, allow for customization
|
7 years ago |
yflory
|
02b282a1a5
|
Disconnect from shared/service worker
|
7 years ago |
Caleb James DeLisle
|
1775638d00
|
Merge commit '0c8ce27' into staging
|
7 years ago |
Caleb James DeLisle
|
0c8ce27f24
|
Make the less loader only load particular less files once
|
7 years ago |
yflory
|
af2a13e5ae
|
Fix UI issue with PPF in the file picker
|
7 years ago |
yflory
|
574d99f9db
|
Remove support for old media-tag
|
7 years ago |
ansuz
|
eac7d38655
|
test media-tag, and fix the bug the tests exposed
|
7 years ago |
yflory
|
bc57f8c274
|
Replace media-tag.js with the new one
|
7 years ago |
yflory
|
87f4fe9c84
|
Add error code to a feedback key
|
7 years ago |
yflory
|
f05e2225d6
|
lint compliance
|
7 years ago |
yflory
|
78ff55e34e
|
Fix race condition
|
7 years ago |
yflory
|
48dc8c78b4
|
Fix cache and merge issues
|
7 years ago |
yflory
|
305b47132c
|
lint compliance
|
7 years ago |
yflory
|
14db9fad8e
|
Merge branch 'echidna' into serviceworker
|
7 years ago |
yflory
|
a6d9ecb3ba
|
lint compliance
|
7 years ago |
yflory
|
598d56c75e
|
Fix cache issues
|
7 years ago |
yflory
|
cefe19b0e1
|
Merge branch 'echidna' into serviceworker
|
7 years ago |