Commit Graph

6425 Commits

Author SHA1 Message Date
Mark Banner
2154101b48 Bug 1022594 Part 1 follow-up. Fix random failure in browser/components/loop/test/standalone/index.html - use fake timers to prevent timers kicking in when we don't want them. r=nperriault 2014-08-05 17:32:53 +01:00
Ed Morley
e20cf0387e Merge mozilla-central and fx-team 2014-08-05 16:33:55 +01:00
Ed Morley
1301a0494b Merge latest green fx-team changeset and mozilla-central; a=merge 2014-08-05 16:13:06 +01:00
Mark Banner
bcaa68f18f Bug 1022594 Part 1 Change Loop's incoming call handling to get the call details before displaying the incoming call UI. r=nperriault 2014-08-05 15:54:55 +01:00
Dan Mosedale
b703674ebc Bug 976114 - stand up basic functional test for a fetching a URL, r=Standard8 2014-08-05 07:21:28 -07:00
Nicolas Perriault
2cb00a4a0e Bug 1040662: Fixed erroneous path to react lib in Loop UI showcase. r=Standard8 NPOTB DONTBUILD 2014-08-05 14:09:15 +01:00
Richard Marti
f0e5b0eb11 Bug 1035629 - Convert most Privacy pane dialogs to be in-content. r=MattN 2014-08-04 18:58:13 -07:00
Simon Montagu
46d5f1b91c Bug 756022 patch 4: change "Western" to "Latin" and "Other Languages" to "Other Writing Systems" in the font preferences dialog, r=jfkthame 2014-08-05 10:49:17 +03:00
Simon Montagu
bb379e11f7 Bug 756022 patch 3: merge tr with x-western, r=jfkthame 2014-08-05 10:49:16 +03:00
Simon Montagu
dc330880c3 Bug 750622 patch 2: merge x-central-euro with x-western, r=jfkthame 2014-08-05 10:49:16 +03:00
Simon Montagu
19df2710fa Bug 750622 patch 1: merge x-baltic with x-western, r=jfkthame 2014-08-05 10:49:16 +03:00
Nicolas Perriault
50c73db0ef Bug 1040662: Upgrade Loop's use of React to version 0.11.1. r=Standard8
--HG--
rename : browser/components/loop/content/shared/libs/react-0.10.0.js => browser/components/loop/content/shared/libs/react-0.11.1.js
2014-08-04 16:35:35 +01:00
Sebastian Hengst
46c071d323 Bug 1034841 - Loop: Fix 'Privacy notice' url and also improve l10n situation. r=Standard8 2014-08-04 13:28:44 +01:00
Nicolas Perriault
c92589373b Bug 972992 (Part 2): Loop desktop feedback add an API client to actually submit feedback. r=Standard8 2014-08-04 13:28:26 +01:00
Nicolas Perriault
71d4a28b52 Bug 972992 (Part 1): Loop desktop client user feedback form. r=Standard8 2014-07-23 19:27:55 +02:00
Florian Quèze
4bc0b50c33 Bug 1029148 - store current search engine configuration outside of prefs, r=MattN. 2014-08-05 01:02:19 +02:00
Tyler Colgan
0aa9a773e1 Bug 952224 - Remove _ensureInitialized(), along with any calls made to it, now that synchronous start up fallback for session store has been removed r=smacleod 2014-08-02 11:16:23 +02:00
Andrei Oprea
986cae7134 Bug 1000127 - Implement new standalone UI link clicker, r=dmose 2014-08-01 16:36:39 -07:00
Steven MacLeod
97fa27922f Bug 1027181 - Call click() instead of syntehsizing mouse events in customizableui test to ensure subview opens. r=mconley
--HG--
extra : rebase_source : 17b71f4b8a15cbbbe51adac514e4038afa1f2ca6
2014-08-01 16:28:07 -04:00
Florian Quèze
7a7aaac1c4 Bug 1046142 - Empty language to translate to drop down on localized builds, r=gavin.
--HG--
extra : rebase_source : 0d2c4d772a672a4b2f7db28ea5cf0905d58b03b1
2014-08-01 15:18:46 +02:00
Bernardo P. Rittmeyer
940ba3ab42 Bug 951396 - Bookmark toolbar now can show icons in HiDPI resolution using a new helper function in PlacesUIUtils.jsm. r=MattN,mak 2014-07-31 19:29:57 -07:00
Ryan VanderMeulen
c9cbdf1824 Merge m-c to fx-team. a=merge 2014-07-31 15:54:50 -04:00
Paolo Amadini
b8ffc1ef8e Bug 1040721 - The search service should provide details for parsing search result URLs. r=gavin 2014-07-31 15:57:02 +01:00
Carsten "Tomcat" Book
3926eb977d Merge mozilla-central to fx-team 2014-07-31 13:08:59 +02:00
Carsten "Tomcat" Book
beada222aa merge fx-team to mozilla-central a=merge 2014-07-31 13:01:27 +02:00
Tyler Colgan
cf87500faa Bug 1038215 - Change FormData.collect() to avoid storing credit card data for Session Restore r=ttaubert 2014-07-30 15:25:35 +02:00
Nathan Froyd
9ea6c585f8 Bug 1042878 - part 2 - move MOZ_CAIRO_CFLAGS et al additions to C*FLAGS into moz.build; r=glandium 2014-07-24 11:55:33 -04:00
Michael Pruett
deb4bdcc72 Bug 574460 - Fix handling of permission deletion notifications in preference dialogs. Original patch by Mehdi Mulani. r=unfocused 2014-07-06 13:35:00 +02:00
Ryan VanderMeulen
879108f360 Merge inbound to m-c. a=merge 2014-07-30 17:13:20 -04:00
Mike de Boer
3949616956 Bug 1023193: make a customizableWidget out of the Loop toolbar button. r=mconley 2014-07-30 18:19:27 +02:00
Mark Banner
63cbabf64a Bug 1044419 Change the Loop Standalone client to use the same version of the sdk as the desktop. r=nperriault
--HG--
rename : browser/components/loop/content/libs/sdk-content/css/ot.css => browser/components/loop/content/shared/libs/sdk-content/css/ot.css
rename : browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-chrome.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-chrome.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-copy-firefox.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-firefox.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-firefox.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/access-predenied-chrome.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-predenied-chrome.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/access-prompt-chrome.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-prompt-chrome.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-publisher.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-publisher.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-subscriber.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-subscriber.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/buttons.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/buttons.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/loader.gif => browser/components/loop/content/shared/libs/sdk-content/images/rtc/loader.gif
rename : browser/components/loop/content/libs/sdk-content/images/rtc/mic-off.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-off.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/mic-on.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-on.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/speaker-off.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-off.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/speaker-on.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-on.png
rename : browser/components/loop/content/libs/sdk-content/js/dynamic_config.min.js => browser/components/loop/content/shared/libs/sdk-content/js/dynamic_config.min.js
rename : browser/components/loop/content/libs/sdk.js => browser/components/loop/content/shared/libs/sdk.js
2014-07-30 17:13:18 +01:00
Mark Banner
a76ab086d1 Bug 1044796 Provide an option to Loop's standalone client makefile to create a version.txt file. r=nperriault 2014-07-30 17:13:16 +01:00
Carsten "Tomcat" Book
283616b382 Merge mozilla-central to mozilla-inbound 2014-07-30 14:10:53 +02:00
Nathan Froyd
4246e6b6ea Bug 1044162 - part 1 - make EXTRA_{PP_,}JS_MODULES communicate their installation path; r=mshal
This patch makes EXTRA_{PP_,}JS_MODULES similar in functionality to
TESTING_JS_MODULES: we indicate the path relative to
$(FINAL_TARGET)/modules with an appropriate hierarchy of paths.
2014-07-25 13:40:07 -04:00
Michael Pruett
4390f594df Bug 570175 - Add tests for cookie exception permissions. Original patch by Mehdi Mulani. r=unfocused 2014-07-27 23:16:10 -05:00
Mark Banner
448f845a02 Bug 1033988 Remove workaround for old-style parameter when getting a call url from the Loop server. r=nperriault 2014-07-29 17:17:40 +01:00
Mark Banner
409cac1cd8 Bug 1035369 Update the parameter name for the push url when registering with the Loop server to match with the latest version of the API. r=mdeboer 2014-07-29 17:17:40 +01:00
Carsten "Tomcat" Book
e7a665fd8a Merge mozilla-central to mozilla-inbound 2014-07-29 15:33:14 +02:00
Carsten "Tomcat" Book
57b3a22ea7 Merge mozilla-central to fx-team on a CLOSED TREE 2014-07-29 11:19:53 +02:00
Mike Hommey
20d181268e Bug 1043820 - Remove PARALLEL_DIRS. r=gps 2014-07-29 08:57:59 +09:00
Nicolas Perriault
24569d0177 Bug 1042799: Loop UI components showcase, r=mikedeboer 2014-07-29 11:23:31 +01:00
Carsten "Tomcat" Book
adebf9396b Merge mozilla-central to fx-team 2014-07-28 16:04:12 +02:00
Nicolas Perriault
09cdf2ed4e Bug 1000131 (Part 2): Loop expired call url view styling, r=dmose. 2014-07-28 12:51:42 -07:00
Birunthan Mohanathas
fa5a303828 Bug 1038458 - Part 7: Flatten browser/components/shell/{public,src}/ directories. r=mak
--HG--
rename : browser/components/shell/src/Makefile.in => browser/components/shell/Makefile.in
rename : browser/components/shell/src/nsGNOMEShellService.cpp => browser/components/shell/nsGNOMEShellService.cpp
rename : browser/components/shell/src/nsGNOMEShellService.h => browser/components/shell/nsGNOMEShellService.h
rename : browser/components/shell/public/nsIMacShellService.idl => browser/components/shell/nsIMacShellService.idl
rename : browser/components/shell/public/nsIShellService.idl => browser/components/shell/nsIShellService.idl
rename : browser/components/shell/public/nsIWindowsShellService.idl => browser/components/shell/nsIWindowsShellService.idl
rename : browser/components/shell/src/nsMacShellService.cpp => browser/components/shell/nsMacShellService.cpp
rename : browser/components/shell/src/nsMacShellService.h => browser/components/shell/nsMacShellService.h
rename : browser/components/shell/src/nsSetDefaultBrowser.js => browser/components/shell/nsSetDefaultBrowser.js
rename : browser/components/shell/src/nsSetDefaultBrowser.manifest => browser/components/shell/nsSetDefaultBrowser.manifest
rename : browser/components/shell/src/nsShellService.h => browser/components/shell/nsShellService.h
rename : browser/components/shell/src/nsWindowsShellService.cpp => browser/components/shell/nsWindowsShellService.cpp
rename : browser/components/shell/src/nsWindowsShellService.h => browser/components/shell/nsWindowsShellService.h
2014-07-26 09:32:14 -07:00
Birunthan Mohanathas
3571e0740d Bug 1038458 - Part 6: Flatten browser/components/sessionstore/src/ directory. r=mak
--HG--
rename : browser/components/sessionstore/src/ContentRestore.jsm => browser/components/sessionstore/ContentRestore.jsm
rename : browser/components/sessionstore/src/DocShellCapabilities.jsm => browser/components/sessionstore/DocShellCapabilities.jsm
rename : browser/components/sessionstore/src/FrameTree.jsm => browser/components/sessionstore/FrameTree.jsm
rename : browser/components/sessionstore/src/GlobalState.jsm => browser/components/sessionstore/GlobalState.jsm
rename : browser/components/sessionstore/src/PageStyle.jsm => browser/components/sessionstore/PageStyle.jsm
rename : browser/components/sessionstore/src/PrivacyFilter.jsm => browser/components/sessionstore/PrivacyFilter.jsm
rename : browser/components/sessionstore/src/PrivacyLevel.jsm => browser/components/sessionstore/PrivacyLevel.jsm
rename : browser/components/sessionstore/src/RecentlyClosedTabsAndWindowsMenuUtils.jsm => browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
rename : browser/components/sessionstore/src/SessionCookies.jsm => browser/components/sessionstore/SessionCookies.jsm
rename : browser/components/sessionstore/src/SessionFile.jsm => browser/components/sessionstore/SessionFile.jsm
rename : browser/components/sessionstore/src/SessionHistory.jsm => browser/components/sessionstore/SessionHistory.jsm
rename : browser/components/sessionstore/src/SessionMigration.jsm => browser/components/sessionstore/SessionMigration.jsm
rename : browser/components/sessionstore/src/SessionSaver.jsm => browser/components/sessionstore/SessionSaver.jsm
rename : browser/components/sessionstore/src/SessionStorage.jsm => browser/components/sessionstore/SessionStorage.jsm
rename : browser/components/sessionstore/src/SessionStore.jsm => browser/components/sessionstore/SessionStore.jsm
rename : browser/components/sessionstore/src/SessionWorker.js => browser/components/sessionstore/SessionWorker.js
rename : browser/components/sessionstore/src/SessionWorker.jsm => browser/components/sessionstore/SessionWorker.jsm
rename : browser/components/sessionstore/src/TabAttributes.jsm => browser/components/sessionstore/TabAttributes.jsm
rename : browser/components/sessionstore/src/TabState.jsm => browser/components/sessionstore/TabState.jsm
rename : browser/components/sessionstore/src/TabStateCache.jsm => browser/components/sessionstore/TabStateCache.jsm
rename : browser/components/sessionstore/src/Utils.jsm => browser/components/sessionstore/Utils.jsm
rename : browser/components/sessionstore/src/nsSessionStartup.js => browser/components/sessionstore/nsSessionStartup.js
rename : browser/components/sessionstore/src/nsSessionStore.js => browser/components/sessionstore/nsSessionStore.js
rename : browser/components/sessionstore/src/nsSessionStore.manifest => browser/components/sessionstore/nsSessionStore.manifest
2014-07-26 09:32:08 -07:00
Birunthan Mohanathas
d8357c3703 Bug 1038458 - Part 5: Flatten browser/components/places/src/ directory. r=mak
--HG--
rename : browser/components/places/src/BrowserPlaces.manifest => browser/components/places/BrowserPlaces.manifest
rename : browser/components/places/src/PlacesProtocolHandler.js => browser/components/places/PlacesProtocolHandler.js
rename : browser/components/places/src/PlacesUIUtils.jsm => browser/components/places/PlacesUIUtils.jsm
2014-07-26 09:32:02 -07:00
Birunthan Mohanathas
1091aaac95 Bug 1038458 - Part 4: Flatten browser/components/migration/{public,src}/ directories. r=mak
--HG--
rename : browser/components/migration/src/BrowserProfileMigrators.manifest => browser/components/migration/BrowserProfileMigrators.manifest
rename : browser/components/migration/src/ChromeProfileMigrator.js => browser/components/migration/ChromeProfileMigrator.js
rename : browser/components/migration/src/FirefoxProfileMigrator.js => browser/components/migration/FirefoxProfileMigrator.js
rename : browser/components/migration/src/IEProfileMigrator.js => browser/components/migration/IEProfileMigrator.js
rename : browser/components/migration/src/MigrationUtils.jsm => browser/components/migration/MigrationUtils.jsm
rename : browser/components/migration/src/ProfileMigrator.js => browser/components/migration/ProfileMigrator.js
rename : browser/components/migration/src/SafariProfileMigrator.js => browser/components/migration/SafariProfileMigrator.js
rename : browser/components/migration/public/nsIBrowserProfileMigrator.idl => browser/components/migration/nsIBrowserProfileMigrator.idl
rename : browser/components/migration/src/nsIEHistoryEnumerator.cpp => browser/components/migration/nsIEHistoryEnumerator.cpp
rename : browser/components/migration/src/nsIEHistoryEnumerator.h => browser/components/migration/nsIEHistoryEnumerator.h
2014-07-26 09:31:57 -07:00
Birunthan Mohanathas
1dd0c022e7 Bug 1038458 - Part 3: Flatten browser/components/feeds/{public,src}/ directories. r=mak
--HG--
rename : browser/components/feeds/src/BrowserFeeds.manifest => browser/components/feeds/BrowserFeeds.manifest
rename : browser/components/feeds/src/FeedConverter.js => browser/components/feeds/FeedConverter.js
rename : browser/components/feeds/src/FeedWriter.js => browser/components/feeds/FeedWriter.js
rename : browser/components/feeds/src/WebContentConverter.js => browser/components/feeds/WebContentConverter.js
rename : browser/components/feeds/src/nsFeedSniffer.cpp => browser/components/feeds/nsFeedSniffer.cpp
rename : browser/components/feeds/src/nsFeedSniffer.h => browser/components/feeds/nsFeedSniffer.h
rename : browser/components/feeds/public/nsIFeedResultService.idl => browser/components/feeds/nsIFeedResultService.idl
rename : browser/components/feeds/public/nsIWebContentConverterRegistrar.idl => browser/components/feeds/nsIWebContentConverterRegistrar.idl
2014-07-26 09:31:52 -07:00
Birunthan Mohanathas
8000cbf350 Bug 1038458 - Part 2: Flatten browser/components/downloads/src/ directory. r=mak
--HG--
rename : browser/components/downloads/src/BrowserDownloads.manifest => browser/components/downloads/BrowserDownloads.manifest
rename : browser/components/downloads/src/DownloadsCommon.jsm => browser/components/downloads/DownloadsCommon.jsm
rename : browser/components/downloads/src/DownloadsLogger.jsm => browser/components/downloads/DownloadsLogger.jsm
rename : browser/components/downloads/src/DownloadsStartup.js => browser/components/downloads/DownloadsStartup.js
rename : browser/components/downloads/src/DownloadsTaskbar.jsm => browser/components/downloads/DownloadsTaskbar.jsm
rename : browser/components/downloads/src/DownloadsUI.js => browser/components/downloads/DownloadsUI.js
2014-07-26 09:31:46 -07:00
Birunthan Mohanathas
c831788bcb Bug 1038458 - Part 1: Flatten browser/components/customizableui/src/ directory. r=mak
--HG--
rename : browser/components/customizableui/src/CustomizableUI.jsm => browser/components/customizableui/CustomizableUI.jsm
rename : browser/components/customizableui/src/CustomizableWidgets.jsm => browser/components/customizableui/CustomizableWidgets.jsm
rename : browser/components/customizableui/src/CustomizeMode.jsm => browser/components/customizableui/CustomizeMode.jsm
rename : browser/components/customizableui/src/DragPositionManager.jsm => browser/components/customizableui/DragPositionManager.jsm
rename : browser/components/customizableui/src/PanelWideWidgetTracker.jsm => browser/components/customizableui/PanelWideWidgetTracker.jsm
rename : browser/components/customizableui/src/ScrollbarSampler.jsm => browser/components/customizableui/ScrollbarSampler.jsm
rename : browser/components/customizableui/src/logging.js => browser/components/customizableui/logging.js
2014-07-26 09:31:41 -07:00