7579 Commits (090a685628bb10487756800b0f6392403120c426)

Author SHA1 Message Date
Weblate 10b97784c0 Translated using Weblate (Russian)
Currently translated at 59.3% (803 of 1353 strings)

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

Translated using Weblate (Russian)

Currently translated at 58.9% (797 of 1353 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
4 years ago
yflory e205ca281b Add pad settings popup to control default layout 4 years ago
ansuz fd7e15fe8e merge dark2 into dark 4 years ago
yflory 5af6aaa57e Fix CSS conflicts with tokenfield 4 years ago
Weblate 6be94bc08a Translated using Weblate (Dutch)
Currently translated at 37.9% (513 of 1353 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/nl/
4 years ago
yflory 9c36fd9501 Merge branch 'dark' of github.com:xwiki-labs/cryptpad into dark 4 years ago
yflory 8edd6b791d Fix CkEditor scrollbar 4 years ago
David Benqué a2adf0f0a8 FIX poll comment colors 4 years ago
yflory 42dfa9a941 Merge branch 'staging' into dark 4 years ago
David Benqué 92fe01a6aa Comment colors 4 years ago
David Benqué e1c05a24e9 Dark Kanban 4 years ago
David Benqué 16e4b76f4b Dark toolbar and apps 4 years ago
yflory 96362b20b1 lint compliance 4 years ago
yflory 3952b2f013 Fix PCS issues: duplicate templates and offline PCS 4 years ago
yflory d74b2b6316 Make sure we can't request edit access to ourselves 4 years ago
yflory 0ab6d4d995 Fix duplicate in kanban 4 years ago
yflory dbba45e67e Don't remove both kanban items when a duplicate is deleted 4 years ago
yflory ef76665b76 Merge branch 'staging' into dark2 4 years ago
yflory 1c9d36d9ea Fix drag&drop in kanban for mobile 4 years ago
yflory 0e686eae63 Merge branch 'kanban-throttle' into staging 4 years ago
yflory eb85946ce2 Fix drag&drop in kanban for mobile 4 years ago
yflory 780e554cc8 Add textbox in whiteboard 4 years ago
yflory 5d5276110b Add textbox in whiteboard 4 years ago
David Benqué 70256b93ad Adjust logo color 4 years ago
yflory 399c3dfece Merge branch 'staging' into dark2 4 years ago
yflory 5535595096 Make sure we don't create multiple timeouts for the usage bar 4 years ago
yflory 2feed72d2a Merge branch 'staging' into dark2 4 years ago
yflory 7b666119c5 Add missing file 4 years ago
yflory e58d5cdfb4 Merge branch 'staging' into dark2 4 years ago
yflory cd417d3826 Fix search stuck with no results 4 years ago
yflory b51f6f2843 Merge branch 'kanban-throttle' into dark2 4 years ago
yflory f8add72f63 Increase throttle value 4 years ago
yflory ea13b40698 Fix kanban undefined 4 years ago
yflory 666c397203 Fix kanban undefined 4 years ago
yflory 37beedbe96 Mermaid dark theme 4 years ago
ansuz fc4a9b1497 Merge branch 'kanban-throttle' into dark2 4 years ago
ansuz 3a3b087fab Merge branch 'staging' into dark2 4 years ago
yflory f8ae3a8c8e Add missing return 4 years ago
yflory d17b17c2e3 Better kanban throttle 4 years ago
yflory ec4b95687c Implement undo/redo for whiteboard #195 4 years ago
David Benqué f99e7451e9 Drive and context menus 4 years ago
yflory c18f6eafdc Fix usage bar race condition in offline mode 4 years ago
yflory 3fdaf25429 Fix offline race condition in the user menu 4 years ago
yflory 6f399eb298 Fix drive search throttle 4 years ago
yflory b6ccff28db Throttle kanban refresh on remote changes 4 years ago
yflory 5ff7f1def8 Ability to collapse comment and TOC columns in rich text 4 years ago
ansuz 2f8573996a Merge branch 'staging' into dark 4 years ago
ansuz d4fa64a1bf lint compliance 4 years ago
ansuz 6c1e4352e5 Merge branch 'staging' into dark 4 years ago
ansuz 94b907e126 add an icon to the 'Performance' section of the admin sidebar 4 years ago
ansuz d4194a3aee Merge branch 'soon' into staging 4 years ago
ansuz bb7965d94a Merge branch 'profiling' into dark 4 years ago
ansuz 9a2ccccfd6 relabel XXX comments 4 years ago
yflory 0575a7a233 Scrollbar and rich text dark 4 years ago
yflory 4d21ca99c1 Add missing handler on teams 'new' cards 4 years ago
yflory 2501b39ba7 Default slide colors 4 years ago
yflory 4f2a8c2d85 Fix kanban colors 4 years ago
ansuz edd46ebdb2 add some admin UI for profiling the server's workers 4 years ago
yflory 519d5d7b5c New CodeMirror default theme on dark mode 4 years ago
yflory c2a9355e4a Add background-color to forms 4 years ago
yflory b99fc88429 Clean colortheme files 4 years ago
yflory 623aba2705 Migrate all remaining apps to support dark theme 4 years ago
yflory e41e6c39ce Fix profile corrupted cache 4 years ago
yflory 59ca7ac4d2 Notifications app dark 4 years ago
yflory b7681ffbf2 Kanban and file app dark 4 years ago
yflory e4dbd04103 Fix iframe URL caching 4 years ago
yflory 9756e87f1b Admin, accounts code and debug dark mode 4 years ago
yflory 37b5e8f559 Keep theme on logout 4 years ago
yflory 27994d1a6f Fix premium ticket filter 4 years ago
yflory 89406f5d89 Start with black background when OS is set to dark theme 4 years ago
yflory d372c64c62 Fix race condition against Firefox... 4 years ago
yflory e25b87534e Fix LESS cache 4 years ago
yflory 3084cf7129 Dark background in boot2 4 years ago
yflory ead767658f Fix race condition 4 years ago
yflory 44889a291d Fix messenger colors 4 years ago
yflory 40c2a6541f Reenable dark theme 4 years ago
yflory 36472855ff LESS loading screen 4 years ago
yflory 4c17cfcf44 lint compliance 4 years ago
yflory baddf8ae11 Move all color variables to colortheme.less 4 years ago
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/
4 years ago
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/
4 years ago
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/
4 years ago
yflory 45dff2f5c4 Cleanup 4 years ago
yflory 2554dacc4b Add custom colortheme 4 years ago
yflory bda1f36263 Dark mode selection 4 years ago
ansuz 8786c5a618 remove more XXX notes 4 years ago
yflory daace8f12c Merge branch 'soon' into staging 4 years ago
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/
4 years ago
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/
4 years ago
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/
4 years ago
yflory 991e965a10 Use correct size format in features.js 4 years ago
yflory fe9d39c66b Merge branch 'staging' into eunknown 4 years ago
David Benqué 04a2700502 Remove hard-coded translations 4 years ago
David Benqué 1aa598e9a9 Merge branch 'soon' into staging 4 years ago
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/
4 years ago
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/
4 years ago
yflory 0fc8bfde4a Use new server format for history keeper time 4 years ago
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/
4 years ago
David Benqué c87540bc94 Remove unused translation keys 4 years ago
David Benqué fdeef1ec65 Delete FAQ translation keys 4 years ago
yflory d223261776 Fix alertify logs in secureiframe 4 years ago
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/
4 years ago
yflory 03e690b0bc lint compliance 4 years ago
yflory 720938d22c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 4 years ago
yflory 5a104eaa58 Add the drive channel to support tickets 4 years ago
ansuz 4ae850b9c6 Merge branch 'soon' into staging 4 years ago
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/
4 years ago
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/
4 years ago
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/
4 years ago
ansuz c0a26e82b7 remove many XXX notes and hardcoded translations 4 years ago
ansuz d8b367cf8d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 4 years ago
ansuz e410167334 Merge branch 'soon' into staging 4 years ago
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/
4 years ago
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/
4 years ago
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/
4 years ago
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/
4 years ago
yflory 5ca7247304 More cache eviction tools 4 years ago
ansuz e6cce9c04d Merge branch 'soon' into staging 4 years ago
ansuz 858de83984 set title from the default title in slides if undefined 4 years ago
ansuz 6fd5cf45c7 Merge branch 'soon' into staging 4 years ago
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/
4 years ago
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/
4 years ago
ansuz 8a67b2ad59 Merge branch 'soon' into staging 4 years ago
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/
4 years ago
yflory d2fb68642d Fix links in error screen 4 years ago
yflory 9f724ff143 Merge branch 'soon' into staging 4 years ago
yflory 87a7669f29 Fix timeout issue on cacheready 4 years ago
yflory b8b2373512 Fix slides colors reset 4 years ago
yflory 98acca0c0e Fix drive reconnect error 4 years ago
yflory 56ff641da6 lint compliance 4 years ago
yflory 1d366730fd Merge branch 'soon' into staging 4 years ago
yflory 2bcaf110a7 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 4 years ago
yflory 43d2b308ab Fix rounding error with rich text scrollbar 4 years ago
ansuz 5011f260fb Merge branch 'soon' into staging 4 years ago
ansuz 7cd637624e remove XXX notes 4 years ago
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/
4 years ago
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/
4 years ago
ansuz 6871846306 Merge branch 'soon' into staging 4 years ago
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/
4 years ago
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/
4 years ago
yflory 94ce56fbac Don't prompt for shared folder password when offline 4 years ago
yflory 56b227260d Fix history size in the apps 4 years ago
yflory 97b0ac4daa Merge branch 'soon' into staging 4 years ago
yflory c5e078267e Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 4 years ago
yflory 25e67c2027 Fix FALSE_INIT error 4 years ago
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/
4 years ago
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/
4 years ago
yflory 0c9c3c23a4 Remove unused translation key 4 years ago
ansuz e7bcd1901a Merge branch 'x2t' into staging 4 years ago
ansuz d1eff71584 Merge branch 'soon' into staging 4 years ago