[X2Go-Commits] [pale-moon] 270/294: Merge branch 'Sync-weave'

git-admin at x2go.org git-admin at x2go.org
Sat Apr 27 08:58:31 CEST 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch upstream/28.5.0
in repository pale-moon.

commit 3eb4310cd889e6c8d22c27f0326273acf0a3e8bf
Merge: 07381c3 1e868fa
Author: wolfbeast <mcwerewolf at wolfbeast.com>
Date:   Wed Apr 17 20:22:59 2019 +0200

    Merge branch 'Sync-weave'

 .../base/content/aboutaccounts/aboutaccounts.css   |  24 -
 .../base/content/aboutaccounts/aboutaccounts.js    | 543 --------------
 .../base/content/aboutaccounts/aboutaccounts.xhtml | 112 ---
 .../base/content/aboutaccounts/images/fox.png      | Bin 1951 -> 0 bytes
 .../aboutaccounts/images/graphic_sync_intro.png    | Bin 6441 -> 0 bytes
 .../aboutaccounts/images/graphic_sync_intro at 2x.png | Bin 12852 -> 0 bytes
 .../basilisk/base/content/aboutaccounts/main.css   | 166 -----
 .../base/content/aboutaccounts/normalize.css       | 402 -----------
 .../basilisk/base/content/abouthome/aboutHome.css  |   4 +
 .../base/content/abouthome/aboutHome.xhtml         |   2 +
 .../basilisk/base/content/browser-context.inc      |  14 -
 .../basilisk/base/content/browser-doctype.inc      |   2 +
 .../basilisk/base/content/browser-fxaccounts.js    | 314 --------
 .../basilisk/base/content/browser-menubar.inc      |  34 +-
 .../basilisk/base/content/browser-places.js        |  13 +-
 application/basilisk/base/content/browser-sets.inc |   7 +-
 .../basilisk/base/content/browser-syncui.js        | 592 +++++++--------
 application/basilisk/base/content/browser.css      |  12 +
 application/basilisk/base/content/browser.js       |  37 +-
 application/basilisk/base/content/browser.xul      |  70 +-
 .../basilisk/base/content/global-scripts.inc       |   1 -
 application/basilisk/base/content/nsContextMenu.js |   5 -
 .../basilisk/base/content/sync/customize.css       |  28 -
 .../basilisk/base/content/sync/customize.js        |  25 -
 .../basilisk/base/content/sync/customize.xul       |  62 --
 application/basilisk/base/jar.mn                   |  35 +-
 .../basilisk/components/about/AboutRedirector.cpp  |  10 +-
 application/basilisk/components/build/nsModule.cpp |   4 +-
 .../components/customizableui/CustomizableUI.jsm   |   1 -
 .../customizableui/CustomizableWidgets.jsm         | 138 ----
 .../customizableui/content/panelUI.inc.xul         | 110 ---
 .../basilisk/components/customizableui/moz.build   |   5 +-
 application/basilisk/components/moz.build          |   7 +-
 application/basilisk/components/nsBrowserGlue.js   | 119 +--
 .../basilisk/components/places/PlacesUIUtils.jsm   |   6 +-
 application/basilisk/components/places/moz.build   |   2 +-
 .../components/preferences/in-content/jar.mn       |   4 +-
 .../preferences/in-content/preferences.js          |   2 +
 .../preferences/in-content/preferences.xul         |   8 +
 .../components/preferences/in-content/sync.js      | 451 +-----------
 .../components/preferences/in-content/sync.xul     | 327 ++-------
 .../sync/aboutSyncTabs-bindings.xml                |   0
 .../content => components}/sync/aboutSyncTabs.css  |   0
 .../content => components}/sync/aboutSyncTabs.js   | 113 +--
 .../content => components}/sync/aboutSyncTabs.xul  |   0
 .../{base/content => components}/sync/addDevice.js |   0
 .../content => components}/sync/addDevice.xul      |   2 +-
 .../content => components}/sync/genericChange.js   |  15 +-
 .../content => components}/sync/genericChange.xul  |   4 +-
 application/basilisk/components/sync/jar.mn        |  22 +
 .../{base/content => components}/sync/key.xhtml    |   2 +-
 .../{syncedtabs/jar.mn => sync/moz.build}          |   7 +-
 .../basilisk/components/sync/notification.xml      | 129 ++++
 application/basilisk/components/sync/progress.js   |  71 ++
 .../basilisk/components/sync/progress.xhtml        |  55 ++
 .../{base/content => components}/sync/quota.js     |   0
 .../{base/content => components}/sync/quota.xul    |   0
 .../{base/content => components}/sync/setup.js     |  35 +-
 .../{base/content => components}/sync/setup.xul    |  15 +-
 .../{base/content => components}/sync/utils.js     |  29 +-
 .../components/syncedtabs/EventEmitter.jsm         |  45 --
 .../syncedtabs/SyncedTabsDeckComponent.js          | 169 -----
 .../components/syncedtabs/SyncedTabsDeckStore.js   |  60 --
 .../components/syncedtabs/SyncedTabsDeckView.js    | 116 ---
 .../components/syncedtabs/SyncedTabsListStore.js   | 235 ------
 .../components/syncedtabs/TabListComponent.js      | 138 ----
 .../basilisk/components/syncedtabs/TabListView.js  | 568 ---------------
 .../basilisk/components/syncedtabs/moz.build       |  17 -
 .../basilisk/components/syncedtabs/sidebar.js      |  30 -
 .../basilisk/components/syncedtabs/sidebar.xhtml   | 114 ---
 application/basilisk/components/syncedtabs/util.js |  23 -
 application/basilisk/configure.in                  |   7 +
 .../locales/en-US/chrome/browser/aboutAccounts.dtd |  16 -
 .../locales/en-US/chrome/browser/aboutHome.dtd     |   4 +
 .../locales/en-US/chrome/browser/browser.dtd       |  66 +-
 .../en-US/chrome/browser/preferences/sync.dtd      |  73 +-
 .../locales/en-US/chrome/browser/syncBrand.dtd     |   1 -
 .../locales/en-US/chrome/browser/syncKey.dtd       |   8 +-
 .../locales/en-US/chrome/browser/syncProgress.dtd  |  15 +
 .../en-US/chrome/browser/syncQuota.properties      |   2 +-
 .../locales/en-US/chrome/browser/syncSetup.dtd     |  18 +-
 .../en-US/chrome/browser/syncSetup.properties      |  28 +-
 application/basilisk/locales/jar.mn                |  12 +-
 application/basilisk/themes/linux/jar.mn           |   6 +-
 application/basilisk/themes/linux/syncProgress.css |  46 ++
 .../basilisk/themes/linux/syncedtabs/sidebar.css   |  69 --
 application/basilisk/themes/osx/jar.mn             |  10 +-
 application/basilisk/themes/osx/syncProgress.css   |  46 ++
 .../basilisk/themes/osx/syncedtabs/sidebar.css     | 154 ----
 application/basilisk/themes/shared/browser.inc     |   2 +-
 .../themes/shared/customizableui/panelUI.inc.css   | 276 +------
 .../basilisk/themes/shared/menupanel.inc.css       |  19 +
 .../themes/shared/syncedtabs/sidebar.inc.css       | 234 ------
 .../basilisk/themes/shared/toolbarbuttons.inc.css  |  46 ++
 application/basilisk/themes/windows/jar.mn         |   8 +-
 .../basilisk/themes/windows/syncProgress.css       |  46 ++
 .../basilisk/themes/windows/syncedtabs/sidebar.css | 132 ----
 application/palemoon/configure.in                  |   4 -
 old-configure.in                                   |   7 -
 services/cloudsync/CloudSync.jsm                   |  89 ---
 services/cloudsync/CloudSyncAdapters.jsm           |  88 ---
 services/cloudsync/CloudSyncBookmarks.jsm          | 795 ---------------------
 .../cloudsync/CloudSyncBookmarksFolderCache.jsm    | 105 ---
 services/cloudsync/CloudSyncEventSource.jsm        |  65 --
 services/cloudsync/CloudSyncLocal.jsm              |  87 ---
 services/cloudsync/CloudSyncPlacesWrapper.jsm      | 375 ----------
 services/cloudsync/CloudSyncTabs.jsm               | 318 ---------
 services/cloudsync/docs/api.md                     | 234 ------
 services/cloudsync/docs/architecture.rst           |  54 --
 services/cloudsync/docs/dataformat.rst             |  77 --
 services/cloudsync/docs/example.rst                | 132 ----
 services/cloudsync/docs/index.rst                  |  19 -
 services/cloudsync/moz.build                       |  21 -
 services/cloudsync/tests/mochitest/browser.ini     |   5 -
 .../cloudsync/tests/mochitest/browser_tabEvents.js |  79 --
 .../cloudsync/tests/mochitest/other_window.html    |   7 -
 services/cloudsync/tests/xpcshell/head.js          |  10 -
 .../cloudsync/tests/xpcshell/test_bookmarks.js     |  73 --
 services/cloudsync/tests/xpcshell/test_lazyload.js |  18 -
 services/cloudsync/tests/xpcshell/test_module.js   |  19 -
 services/cloudsync/tests/xpcshell/test_tabs.js     |  29 -
 services/cloudsync/tests/xpcshell/xpcshell.ini     |  10 -
 services/moz.build                                 |   3 -
 .../sync/tests/unit/test_fxa_node_reassignment.js  | 321 ---------
 .../sync/tests/unit/test_fxa_service_cluster.js    |  68 --
 services/sync/tests/unit/test_fxa_startOver.js     |  63 --
 services/sync/tests/unit/xpcshell.ini              |   5 -
 toolkit/modules/AppConstants.jsm                   |   7 -
 toolkit/modules/moz.build                          |   3 +-
 129 files changed, 1161 insertions(+), 9085 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git


More information about the x2go-commits mailing list