Commit Graph

7521 Commits (e772e7e3883f99b797fbf2a7d86de9a792ac23c2)

Author SHA1 Message Date
yflory 4f2a8c2d85 Fix kanban colors
ansuz edd46ebdb2 add some admin UI for profiling the server's workers
yflory 519d5d7b5c New CodeMirror default theme on dark mode
yflory c2a9355e4a Add background-color to forms
yflory b99fc88429 Clean colortheme files
yflory 623aba2705 Migrate all remaining apps to support dark theme
yflory e41e6c39ce Fix profile corrupted cache
yflory 59ca7ac4d2 Notifications app dark
yflory b7681ffbf2 Kanban and file app dark
yflory e4dbd04103 Fix iframe URL caching
yflory 9756e87f1b Admin, accounts code and debug dark mode
yflory 37b5e8f559 Keep theme on logout
yflory 27994d1a6f Fix premium ticket filter
yflory 89406f5d89 Start with black background when OS is set to dark theme
yflory d372c64c62 Fix race condition against Firefox...
yflory e25b87534e Fix LESS cache
yflory 3084cf7129 Dark background in boot2
yflory ead767658f Fix race condition
yflory 44889a291d Fix messenger colors
yflory 40c2a6541f Reenable dark theme
yflory 36472855ff LESS loading screen
yflory 4c17cfcf44 lint compliance
yflory baddf8ae11 Move all color variables to colortheme.less
Weblate 81427fea5d Translated using Weblate (Japanese)
Currently translated at 29.3% (397 of 1353 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ja/
Weblate 4c7d683c6f Translated using Weblate (Turkish)
Currently translated at 1.4% (20 of 1353 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/tr/
Weblate ae8e0d31a4 Translated using Weblate (Finnish)
Currently translated at 98.6% (1335 of 1353 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
yflory 45dff2f5c4 Cleanup
yflory 2554dacc4b Add custom colortheme
yflory bda1f36263 Dark mode selection
ansuz 8786c5a618 remove more XXX notes
yflory daace8f12c Merge branch 'soon' into staging
Weblate 916e560404 Translated using Weblate (German)
Currently translated at 100.0% (1353 of 1353 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
Weblate 2616d901f3 Translated using Weblate (French)
Currently translated at 100.0% (1353 of 1353 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
Weblate b9b83f78f4 Translated using Weblate (English)
Currently translated at 100.0% (1353 of 1353 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
yflory 991e965a10 Use correct size format in features.js
David Benqué 04a2700502 Remove hard-coded translations
David Benqué 1aa598e9a9 Merge branch 'soon' into staging
Weblate 78d341fd23 Translated using Weblate (French)
Currently translated at 100.0% (1353 of 1353 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
Weblate a837fbc77b Translated using Weblate (English)
Currently translated at 100.0% (1353 of 1353 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1352 of 1352 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1351 of 1351 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1350 of 1350 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Weblate 123919516a Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
David Benqué c87540bc94 Remove unused translation keys
David Benqué fdeef1ec65 Delete FAQ translation keys
yflory d223261776 Fix alertify logs in secureiframe
Weblate 176398bf64 Translated using Weblate (German)
Currently translated at 100.0% (1432 of 1432 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/

Translated using Weblate (German)

Currently translated at 99.5% (1425 of 1432 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
yflory 03e690b0bc lint compliance
yflory 720938d22c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 5a104eaa58 Add the drive channel to support tickets
ansuz 4ae850b9c6 Merge branch 'soon' into staging
Weblate c51962f3f3 Translated using Weblate (German)
Currently translated at 99.3% (1423 of 1432 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/

Translated using Weblate (German)

Currently translated at 99.3% (1422 of 1432 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/

Translated using Weblate (German)

Currently translated at 99.1% (1419 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/

Translated using Weblate (German)

Currently translated at 99.0% (1418 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/

Translated using Weblate (German)

Currently translated at 98.9% (1416 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/

Translated using Weblate (German)

Currently translated at 98.5% (1410 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
Weblate 703d827508 Translated using Weblate (French)
Currently translated at 100.0% (1432 of 1432 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Translated using Weblate (French)

Currently translated at 100.0% (1431 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Translated using Weblate (French)

Currently translated at 100.0% (1431 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
Weblate d04e069dca Translated using Weblate (English)
Currently translated at 100.0% (1432 of 1432 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1431 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 99.9% (1430 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
ansuz c0a26e82b7 remove many XXX notes and hardcoded translations
ansuz d8b367cf8d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz e410167334 Merge branch 'soon' into staging
Weblate 9df9ec4148 Translated using Weblate (German)
Currently translated at 98.4% (1409 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/

Translated using Weblate (German)

Currently translated at 98.3% (1408 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
Weblate 5cc88c992d Translated using Weblate (German)
Currently translated at 96.0% (1374 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
Weblate c6be5e9624 Translated using Weblate (English)
Currently translated at 100.0% (1431 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1430 of 1430 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1430 of 1430 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1429 of 1429 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1429 of 1429 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1428 of 1428 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1427 of 1427 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1426 of 1426 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1425 of 1425 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1424 of 1424 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1423 of 1423 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1422 of 1422 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1421 of 1421 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1421 of 1421 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1420 of 1420 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1420 of 1420 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1419 of 1419 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1418 of 1418 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1418 of 1418 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1417 of 1417 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1416 of 1416 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1415 of 1415 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1414 of 1414 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1414 of 1414 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1413 of 1413 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1412 of 1412 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Weblate ad0a4dc85b Translated using Weblate (French)
Currently translated at 100.0% (1431 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Translated using Weblate (French)

Currently translated at 96.3% (1379 of 1431 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Translated using Weblate (French)

Currently translated at 100.0% (1411 of 1411 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
yflory 5ca7247304 More cache eviction tools
ansuz e6cce9c04d Merge branch 'soon' into staging
ansuz 858de83984 set title from the default title in slides if undefined
ansuz 6fd5cf45c7 Merge branch 'soon' into staging
Weblate fc8cce001b Translated using Weblate (English)
Currently translated at 100.0% (1411 of 1411 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Weblate 294887bc47 Translated using Weblate (French)
Currently translated at 100.0% (1411 of 1411 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
ansuz 8a67b2ad59 Merge branch 'soon' into staging
Weblate 509abc6c11 Translated using Weblate (German)
Currently translated at 100.0% (1411 of 1411 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
yflory d2fb68642d Fix links in error screen
yflory 9f724ff143 Merge branch 'soon' into staging
yflory 87a7669f29 Fix timeout issue on cacheready
yflory b8b2373512 Fix slides colors reset
yflory 98acca0c0e Fix drive reconnect error
yflory 56ff641da6 lint compliance
yflory 1d366730fd Merge branch 'soon' into staging
yflory 2bcaf110a7 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
yflory 43d2b308ab Fix rounding error with rich text scrollbar
ansuz 5011f260fb Merge branch 'soon' into staging
ansuz 7cd637624e remove XXX notes
Weblate 5da03ecf31 Translated using Weblate (French)
Currently translated at 100.0% (1411 of 1411 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Translated using Weblate (French)

Currently translated at 100.0% (1410 of 1410 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
Weblate 15a700b6b3 Translated using Weblate (English)
Currently translated at 100.0% (1411 of 1411 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
ansuz 6871846306 Merge branch 'soon' into staging
Weblate d8f0c8058b Translated using Weblate (Chinese (Simplified))
Currently translated at 25.8% (364 of 1410 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/zh_Hans/
Weblate c318926974 Translated using Weblate (French)
Currently translated at 100.0% (1410 of 1410 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
yflory 94ce56fbac Don't prompt for shared folder password when offline
yflory 56b227260d Fix history size in the apps
yflory 97b0ac4daa Merge branch 'soon' into staging
yflory c5e078267e Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
yflory 25e67c2027 Fix FALSE_INIT error
Weblate a35521474e Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
Weblate 72b82f412b Translated using Weblate (German)
Currently translated at 100.0% (1411 of 1411 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
yflory 0c9c3c23a4 Remove unused translation key
ansuz e7bcd1901a Merge branch 'x2t' into staging
ansuz d1eff71584 Merge branch 'soon' into staging
yflory b239a528bf Minor code improvement
yflory 1fdacd8657 Merge branch 'z-offline2' of github.com:xwiki-labs/cryptpad into z-offline2
yflory 57a4d0590c Guard against forks while in offline mode
ansuz 1a5d9e6b91 remove hardcoded translations
ansuz b1d9442008 Merge branch 'z-offline2' of github.com:xwiki-labs/cryptpad into z-offline2
yflory 181a4efd8b Fix race conditions and multiple tabs on the same worker
yflory e2969f5ac3 Merge branch 'z-offline2' of github.com:xwiki-labs/cryptpad into z-offline2
yflory 2928cd2c7e Fix race condition and infinite loading screen in offline mode
David Benqué b30201157b Use key for "offline no cache" error
ansuz 7ae7e92fef Merge branch 'soon' into z-offline2
Weblate 4782210d9f Translated using Weblate (French)
Currently translated at 99.4% (1403 of 1411 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
Weblate dc15b51aeb Translated using Weblate (English)
Currently translated at 100.0% (1411 of 1411 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1410 of 1410 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1409 of 1409 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Weblate 75c7ba5d4f Translated using Weblate (German)
Currently translated at 100.0% (1408 of 1408 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
yflory 82624c10a5 Open 'cache' apps when the worker is stuck offline
yflory d12603c50a Fix shared folder password change with the cache
yflory 1f7aca39ab Improve access modal password section
yflory d3db915927 Fix inconsistency between SF title in the tree and in the content
yflory b7a492a11b Fix race condition between setPadTitle and drive sync
yflory 1f16b525d3 Don't show the password field in the modal if no password
yflory bb2299376f Fix cursor error logs when not synced yet
yflory a09d25a35a Stay at max scroll in rich text on content update
yflory b33225e2d7 Fix safe links for pads stored in teams
yflory 224fae35aa Handle XXX in async store
yflory 77a4faa90d Fix Dom Exception with mediatags
yflory 3ff54a4a71 Correctly set feedback and token when the drive is synced
yflory a6f9031cd6 Fix typo in translation key
yflory b71ce434ce lint compliance
yflory 1f98ad94cc Fix merge issues
ansuz beb74b46d5 merge offlineCache and soon
David Benqué ddf464ceab Clean up XXX notes
yflory bf15530964 Use all required fonts
ansuz f9f23fc464 Merge branch 'soon' into staging
ansuz 5bedff19b4 fix an undefined reference
ansuz 681b128b77 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 0696a339cb Merge branch 'soon' into staging
ansuz ecdd1a3f43 replace cache XXX notes with ICE (in case of emergency) strings
ansuz 8cabe7ded8 clean up error serialization code a bit
David Benqué 7068b24f73 Use team favicon
ansuz 7ddeacc629 serialize localForage errors and add a safety net
yflory 0b82810bf3 Print fix for firefox
yflory c3077ab427 Enable 'print' option in the onlyoffice menu
ansuz 7b1e3f6e84 Merge branch 'soon' into staging
ansuz 662629185d remove hardcoded translations for admin panel
yflory f95af39995 lint compliance
Weblate 0ef6e537b5 Translated using Weblate (English)
Currently translated at 100.0% (1408 of 1408 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1407 of 1407 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1406 of 1406 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1405 of 1405 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1404 of 1404 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1403 of 1403 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1402 of 1402 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1401 of 1401 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
yflory 4977194121 Merge branch 'staging' into x2t
yflory a5f95f1b34 Spreadsheet PDF export
ansuz c462f5ab2a remove stubbed 'user app'
ansuz c806b97076 resolve conflicts between rebrand and staging
ansuz affd221eb7 lint compliance
yflory 32669dc099 Fix type error
yflory 8cb19cdc76 Fix invalid LKH in roster
yflory 9f02df0b31 Correctly move tickets after closing them
yflory 7e1c7c481e Fix support panel UI issue
ansuz b7ea099eab re-enable indexedDB cache for testing
ansuz 92055f2567 Merge branch 'soon' into staging
ansuz d44f1880a4 temporarily disable the document cache, wait to clear it before redirecting to login
ansuz d5a704d3b9 Merge branch 'soon' into staging