Commit Graph

13393 Commits

Author SHA1 Message Date
Jakub Miara
e3223384c9 Bug 1002537 - Use ReentrantReaderWriterLock in FaviconCache. r=rnewman,ckitching 2014-05-27 11:24:09 -07:00
Margaret Leibovic
686d47e2c5 Bug 701725 - Create "undo close tab" super toast. r=bnicholson 2014-05-01 16:46:46 -07:00
Mark Finkle
0fe1d418fd Bug 1013532 - Prep casting code to enable casting and Roku on Nightly r=wesj 2014-05-27 09:12:53 -04:00
Lucas Rocha
40bbd8893e Bug 1010764 - Use same placeholder image on all tabs (r=mfinkle) 2014-05-27 11:23:17 +01:00
Nick Alexander
653a984638 Bug 1015974 - Prophylactically stop Sync icon animation on creation. r=rnewman
It appears that Android 4.4.2 is a special snow-flake that starts the
animation on creation: http://stackoverflow.com/q/21699985.  This patch
works around that special behaviour.

Don't you love when you need to update your comment -- gleaned from
working code and documentation -- to account for Android inexplicably
changing behaviour?
2014-05-26 18:12:07 -07:00
Nick Alexander
c03d4a23f9 Bug 1014150 - Sync clients and tabs when refreshing Remote Tabs and when Sending Tab to Device. r=rnewman
Both collections impact the state of your remote tabs, so we should
update both when we want your tabs.
2014-05-26 10:06:11 -07:00
Carsten "Tomcat" Book
00eac7d5ba merge fx-team to mozilla-central 2014-05-26 14:59:21 +02:00
Gokul Caushik
2fe541095b Bug 972723 - Fixed race condition and added a comment in this bug. r=wesj 2014-05-22 18:28:00 +02:00
Vikneshwar
556ff21cc7 Bug 1010096 - Added logic to display addons alphabetical in about:addons. r=margaret 2014-05-23 14:02:00 +02:00
Margaret Leibovic
57a74f2026 Bug 1014708 - Back out testFindInPage changes from bug 958111 and disable testFindInPage. r=gbrown 2014-05-23 18:33:48 -07:00
Margaret Leibovic
2a351a3927 Bug 1014708 - Disable zoom for find in page. r=mfinkle 2014-05-23 18:33:45 -07:00
Wes Kocher
4623b8b4a6 Merge m-c to fx-team 2014-05-23 17:43:08 -07:00
Wes Kocher
594334d9ce merge inbound to m-c 2014-05-23 17:19:27 -07:00
Wes Kocher
996c3dc9d1 Merge fx-team to m-c 2014-05-23 17:04:56 -07:00
Wes Kocher
ac63bf06e5 Backed out changeset 52632d896ef7 (bug 985614) for m-oth bustage 2014-05-23 12:13:54 -07:00
Nick Alexander
a461b99329 Bug 998700 - Animate sync icon during refresh of Remote Tabs panel. r=lucasr
It turns out that animation-list can be combined with rotate to avoid
shipping extra bitmaps, and twelve frames is smooth enough.  This patch
takes that approach.

The trickiest part is exposing the icon drawable in a reasonable way to
the inner PanelView.
2014-05-23 11:43:39 -07:00
Nick Alexander
37a58318d1 Bug 1009327 - Add "manual connect" to Android about:devices page. r=mfinkle 2014-05-23 11:43:39 -07:00
Nick Alexander
21bfe1a799 Bug 997288 - Add select tab button to "New [private] tab opened" toasts. r=wesj 2014-05-23 11:43:38 -07:00
Carsten "Tomcat" Book
f30dcfc791 merge fx-team to mozilla-central 2014-05-23 15:49:37 +02:00
Martyn Haigh
e2fb6969d1 Bug 985614 - trigger onsuccess for package install from marketplace r=myk 2014-05-23 12:39:37 +01:00
Brian Nicholson
0855e2eda8 Bug 997447 - Replace uses of EditText with FloatingHintEditText. r=lucasr 2014-05-23 09:50:18 -07:00
Brian Nicholson
ed406de802 Bug 997447 - Add FloatingHintEditText widget. r=lucasr 2014-05-23 09:50:17 -07:00
Lucas Rocha
275025d8c4 Bug 1010261 - Change SuggestedSites to account for enabled/disabled state (r=mfinkle) 2014-05-23 14:27:53 +01:00
Lucas Rocha
58541bc625 Bug 1010261 - Add preferences UI for disabling suggested sites (r=liuche) 2014-05-23 14:27:52 +01:00
Lucas Rocha
233a8e6fe6 Bug 1011620 - Generate suggestedsites.json from region.properties (r=nalexander) 2014-05-23 13:29:18 +01:00
Kartikaya Gupta
4fe707c360 Bug 1014034 - Use the root bounds to get the page size rather than scrollWidth/height which seem to not always work. r=Cwiiis 2014-05-23 09:42:46 -04:00
Kartikaya Gupta
2dc5ed7a73 Bug 1014054 - Use the right screen size when computing the displayport margins. r=Cwiiis 2014-05-23 09:42:38 -04:00
Michael Comella
64c30ea7c0 Bug 1009315 - Part 2: Refactor top sites probe names to be generic. r=liuche 2014-05-15 12:13:39 -07:00
Michael Comella
065deb73b6 Bug 1009315 - Part 1: Sort TelemetryContract items. r=liuche 2014-05-15 12:09:25 -07:00
Wes Kocher
e594fbd022 Merge m-c to inbound 2014-05-22 17:55:00 -07:00
Myk Melez
81ff0c0610 Bug 1007770 - use the app (i.e. "rocket ship") icon in the update notification; r=blassey, ibarlow 2014-05-22 17:35:21 -07:00
Wes Kocher
4a7629e50a Merge inbound to m-c 2014-05-22 17:30:30 -07:00
Carsten "Tomcat" Book
b4c4345ac9 Merge mozilla-central to mozilla-inbound 2014-05-22 15:44:47 +02:00
Wes Kocher
91aab75d1b Merge m-c to fx-team 2014-05-21 20:40:01 -07:00
Wes Kocher
1f2aaaf04e Merge fx-team to m-c 2014-05-21 20:29:05 -07:00
Ryan VanderMeulen
fb13d0f20c Merge m-c to fx-team. 2014-05-21 16:21:31 -04:00
Ryan VanderMeulen
7b152917f2 Merge inbound to m-c. 2014-05-21 15:49:59 -04:00
Wes Johnston
6a7829a41a Bug 1001129 - Allow setting a default selected item in grid views. r=mfinkle 2014-05-21 12:16:26 -07:00
Wes Johnston
d87141ca8f Bug 1009560 - Download images to share on a background thread. r=mcomella 2014-05-21 12:15:16 -07:00
Chenxia Liu
7692957fbb Bug 1013601 - Part 2: Change callers to use uptimeMillis(). r=rnewman 2014-05-21 11:31:59 -07:00
Kartikaya Gupta
38e324242e Bug 1001438 - Switch Fennec to using margins-based displayport as well. r=Cwiiis 2014-05-21 12:06:03 -04:00
Kartikaya Gupta
ed28b62150 Bug 1001438 - Remove setCriticalDisplayPortForElement and have the getter function automatically compute it. r=tn 2014-05-21 12:06:02 -04:00
Kartikaya Gupta
36b70927ca Bug 1001438 - Change layers.low-precision-resolution to be a float pref instead of a divide-by-1000 int pref. r=Cwiiis 2014-05-21 12:06:02 -04:00
Lucas Rocha
71cfccd381 Bug 1013870 - Implement isValidFragment() in GeckoPreferences (r=liuche) 2014-05-21 15:55:54 +01:00
Lucas Rocha
ec67ff097b Backout cb54921d1abc for bug 1013870, busted build 2014-05-21 15:22:55 +01:00
Lucas Rocha
0314eb8535 Bug 1013870 - Implement isValidFragment() in GeckoPreferences (r=liuche) 2014-05-21 14:51:49 +01:00
Ryan VanderMeulen
7285915a55 Merge m-c to fx-team. 2014-05-21 08:56:33 -04:00
Carsten "Tomcat" Book
e52ec8ff1a merge fx-team to mozilla-central 2014-05-21 13:57:43 +02:00
J. Ryan Stinnett
8348b2fca5 Bug 1010750 - Part 2: Repair dbg-browser-actors on Fennec. r=margaret, r=past
--HG--
rename : mobile/android/chrome/content/dbg-browser-actors.js => mobile/android/modules/dbg-browser-actors.js
2014-05-19 09:23:00 -04:00
James Hugman
defa72f6f7 Bug 995803 - fix crash in java.lang.IllegalStateException: Already registered Webapps. r=mfinkle 2014-05-19 08:36:00 +02:00
Alexandru Chiriac
7094171d2d Bug 997049 - Fixed "Switch to tab" functionality for Reading List entries. r=margaret 2014-05-20 15:55:46 -07:00
Chenxia Liu
c6dcda146c Bug 913457 - Part 2: Handle unpinning of removed sites. r=lucasr 2014-05-20 14:02:58 -07:00
Chenxia Liu
70e2a0a536 Bug 913457 - Part 1: Add "Remove" to Top Sites grid items. r=sola 2014-05-20 14:02:58 -07:00
Chenxia Liu
ff7aedb506 Bug 913457 - Part 0: Cleanup - Remove unused Activity var. r=lucsar 2014-05-20 14:02:57 -07:00
Jim Chen
2e90e32119 Bug 1012722 - Switch most BrowserApp event listeners to native; r=mfinkle 2014-05-20 16:09:55 -04:00
Jim Chen
b4615cee0e Bug 1012722 - Switch most GeckoApp event listeners to native; r=mfinkle 2014-05-20 16:09:54 -04:00
Richard Newman
3f9aa66774 Bug 1004529 - Don't fetch display metrics when calling Resource.updateConfiguration. r=nalexander 2014-05-20 12:25:21 -07:00
Jim Chen
385e12261f Bug 994472 - Emulate previous backspace behavior; r=wesj 2014-05-20 12:39:51 -04:00
Jim Chen
6b6e89f2bb Bug 994472 - Use text spans to implement autocompletion; r=wesj 2014-05-20 12:39:50 -04:00
Carsten "Tomcat" Book
4e6b93d81b Merge mozilla-central to fx-team 2014-05-20 16:17:08 +02:00
Biraj Karmakar
b1d3e63d95 Bug 1011782 : Updated the privacy policy url in Fennec . r=nalexander 2014-05-17 05:46:42 +05:30
Matthew Ostrowski
7f6b070cf4 Bug 1006824 - Don't log command line at start-up in official builds. r=nalexander 2014-05-19 14:11:00 +02:00
J. Ryan Stinnett
c7e10918ff Bug 1010750 - Part 1: Test debug server startup on Fennec. r=margaret 2014-05-16 11:04:00 -04:00
Myk Melez
fed5a056a1 Bug 991394 - actually rename profiles.ini sections when removing profile; r=mfinkle
--HG--
extra : rebase_source : 557a44d699f86d89ee959cb8897e6d0c1c304227
2014-05-21 08:12:51 -07:00
Mark Capella
60753c693f Bug 852595 - Increase vertical space to show more remote tabs in tabs tray, r=nalexander
* * *
Bug 852595 - (p2) Smooth mHeader display transition, r=nalexander
* * *
Bug 852595 - (p3) Can we always just , r=nalexander
2014-05-21 03:33:48 -04:00
Zhanpeng Zeng
546a32e006 Bug 923368 - Home panel items should allow for copying URL. r=margaret 2014-05-21 20:27:18 +08:00
Martyn Haigh
b2e450fbf4 Bug 970200 - Check against user general update settings for webapp updates. r=mfinkle 2014-05-06 07:32:00 -04:00
Monica Chew
4841496a48 Bug 1014282: Do not direct every ssl error to 'Report Web Forgery' (r=margaret) 2014-05-22 16:26:57 -07:00
Cykesiopka
17e952b63e Bug 622332 - Show cert SHA-256 fingerprint and remove MD5 fingerprint. r=keeler 2014-05-22 00:52:00 +02:00
Robert Kaiser
8e8ac9fd30 back out bug 1006615 (blocklist domain change) as data collection systems aren't completely ready yet 2014-05-21 23:36:58 +02:00
Myk Melez
3749ed24c8 Bug 1010549 - package dom_messages.xpt; r=wesj
--HG--
extra : rebase_source : 43bc229e74e626304a1c31c4b0b2d27f97ba0fde
2014-05-19 15:00:55 -07:00
Wes Kocher
67236caa6b merge fx-team to m-c 2014-05-19 13:06:45 -07:00
Jim Chen
b21e9a8e8f Bug 993261 - Remove legacy code for redirecting key events to URL bar. r=lucasr 2014-05-15 14:06:00 +02:00
Lucas Rocha
81e12bfd41 Bug 1011533 - Update ShapeCurve's path in onSizeChanged instead of onMeasure (r=bnicholson) 2014-05-19 10:55:52 +01:00
Phil Ringnalda
8e09f81424 Merge f-t to m-c 2014-05-17 18:05:32 -07:00
Brian Nicholson
44cd23941c Bug 1011666 - GeckoSharedPrefs cleanup. r=mcomella 2014-05-16 14:15:41 -07:00
Chenxia Liu
2cf8b3f646 Bug 921136 - Unify removal behavior for bookmark-history-readinglist items from Home items. r=margaret 2014-05-16 14:07:25 -07:00
Jim Chen
d7c3413791 Bug 1007290 - Remove text type code from ToolbarEditText. r=lucasr 2014-05-15 10:58:00 -04:00
Wes Johnston
56cc98778e backout b56da878caed and 8487d4305be3 (bug 901360) from Aurora for regressions a=mfinkle 2014-05-16 12:13:50 -05:00
Margaret Leibovic
ad843fa544 Bug 1009586 - Get rid of "Add panel" item in home settings. r=liuche 2014-05-16 13:09:15 +01:00
Margaret Leibovic
4406656195 Bug 1010237 - Remove unused data sent with Link:Favicon message. r=bnicholson 2014-05-16 13:09:12 +01:00
Jim Chen
8bb72418c9 Bug 1000618 - Restart input after hiding it during blur. r=lucasr 2014-05-14 16:30:00 +02:00
Wes Kocher
202d548b78 Merge inbound to m-c 2014-05-15 15:59:45 -07:00
Chris Kitching
b72d415905 Bug 1010348: Update mixed-content warning kb article for Android. r=margaret 2014-05-15 15:05:05 +01:00
Wes Kocher
e6779db575 Merge m-c to inbound 2014-05-16 17:15:49 -07:00
Jim Chen
74fabdc3d2 Bug 992357 - e. Add tests for NativeJSObject array support; r=blassey 2014-05-16 18:25:29 -04:00
Jim Chen
c5ae95c1bf Bug 992357 - b. Add array support stubs; r=blassey 2014-05-16 18:25:29 -04:00
Jim Chen
1288077545 Bug 992357 - a. Add array types to jni-generator.py; r=till 2014-05-16 18:25:28 -04:00
Mark Finkle
ca519eba9a Backout ad3355a8d31f, c788ef01538a for being a bit too restrictive for user choice 2014-05-20 00:15:53 -04:00
Wes Kocher
5e4284679e Merge m-c to fx-team 2014-05-19 15:51:14 -07:00
Wes Johnston
617dbb6873 Bug 1001851 - Fall back to saving temp files if other file pickers fail. r=rnewman 2014-05-19 15:49:09 -07:00
Alexandru Chiriac
dab3f927fc Bug 943908 - Show tooltip when long-pressing action bar items. r=wesj 2014-05-19 15:01:02 -07:00
Michael Comella
e9e6cd4b46 Bug 1012795 - Pass resource ID name with editing mode cancel event. r=mfinkle 2014-05-19 14:37:17 -07:00
Brian Nicholson
6bfed08342 Bug 993705 - Avoid third party lookup for number-only searches. r=mfinkle 2014-05-22 22:10:31 -07:00
Wes Kocher
763058b4d8 Backed out changeset cff9a2cee111 (bug 1014708) for breaking robocop-1 2014-05-22 21:23:10 -07:00
Michael Comella
301d1b429b Bug 958889 - Part 7: Prevent tablets from showing new remote tabs panel states. r=nalexander 2014-05-22 18:38:04 -07:00
Michael Comella
4aadffce91 Bug 958889 - Part 6: Refresh remote tabs panel on activity resume. r=nalexander 2014-05-22 18:38:04 -07:00
Michael Comella
711126aff7 Bug 958889 - Part 5: Make RemoteTabsContainer.show/hide idempotent. r=nalexander 2014-05-22 18:38:03 -07:00
Michael Comella
013a32356b Bug 958889 - Part 4: Add remote tabs verification screen for phones. r=nalexander 2014-05-22 18:38:03 -07:00
Michael Comella
dd36404bc9 Bug 958889 - Part 3: Add RemoteTabsSetupPanel for phones. r=nalexander,lucasr 2014-05-22 18:38:03 -07:00
Michael Comella
35b9345b1a Bug 958889 - Part 2.8: Add RemoteTabsPanel. r=nalexander 2014-05-22 18:38:03 -07:00
Michael Comella
9ee2ca1def Bug 958889 - Part 2.7: Provide public read-only access to FXAccount state and resend verification code. r=nalexander 2014-05-22 18:38:02 -07:00
Wes Kocher
4a25a8769b Merge m-c to fx-team 2014-05-22 17:58:43 -07:00
Richard Newman
5d8dcf9a37 Bug 1014338 - Part 2: add delayed distro initialization hook. r=margaret 2014-05-22 17:35:44 -07:00
Richard Newman
81d2d2e2a0 Bug 1014338 - Part 1: rework distribution handling. r=margaret
This patch cleans up some of the distribution loading code, and provides a hook
point for callers to hang code that needs to run once the distribution has been
loaded.
2014-05-22 17:35:39 -07:00
Richard Newman
b81eebd709 Bug 1014338 - Part 0: move Distribution class into its own package. r=margaret
--HG--
rename : mobile/android/base/Distribution.java => mobile/android/base/distribution/Distribution.java
2014-05-22 17:34:04 -07:00
Richard Newman
d44b0faec2 Bug 1014338 - Pre: add ThreadUtils.assertNotOnUiThread. r=margaret 2014-05-22 17:34:04 -07:00
Richard Newman
f34ef75ba6 Bug 1011008 - Part 2: handle system locale changes correctly in background code. r=nalexander 2014-05-22 17:31:45 -07:00
Richard Newman
616a194e3f Bug 1011008 - Part 1: handle system locale changes correctly. r=nalexander 2014-05-22 17:31:20 -07:00
Margaret Leibovic
1de5772941 Bug 1014708 - Disable zoom for find in page. r=mfinkle 2014-05-22 10:59:05 -07:00
Mark Finkle
4d4d42458d Bug 1007431 - Add menu item that links to SUMO help r=rnewman 2014-05-22 16:31:40 -04:00
Masayuki Nakano
dea0fc341d Bug 865649 part.5 Set KeyboardEvent.code value on Android and Gonk r=smaug+nchen+mwu 2014-05-25 11:09:00 +09:00
Wes Kocher
64c4381b8e Merge m-c to inbound 2014-05-23 17:37:56 -07:00
Myk Melez
2cacad54f0 Bug 1014800 - don't redefine dump in browser context; r=wesj
--HG--
extra : rebase_source : a2e80414987cb24850973cb6d7bb1e5c7f8d5bba
2014-05-23 13:04:43 -07:00
James Willcox
a5f4817d8c Bug 1014794 - Make console.log output go to logcat on Android once again r=baku
--HG--
extra : rebase_source : d56f2929e21ea048d3c5f58c53fce9d04377907a
2014-05-23 14:56:03 -05:00
Ryan VanderMeulen
6b74e5a464 Merge m-c to inbound. 2014-05-16 15:28:18 -04:00
Myk Melez
831e20635b Bug 1010587 - set android:debuggable="true" #ifdef NIGHTLY_BUILD and MOZ_DEBUG; r=nalexander 2014-05-16 12:03:39 -07:00
Marco Castelluccio
98f16ffbdc Bug 972201 - Remove the MOZ_B2G_CERTDATA hack. r=briansmith 2014-05-18 15:42:42 +02:00
Blair McBride
76578b64c3 Bug 926712 - Use WebIDL to expose InstallTrigger, r=Mossop,bholley 2013-12-12 02:08:00 +00:00
Eugen Sawin
ce2193c486 Bug 1002426 - Check resolution restore status via specialized flag. r=kats, r=tn 2014-05-12 19:26:53 +02:00
Martyn Haigh
f7d35f5863 Bug 970203 - Animate webapp update checking and downloading icons. r=wesj 2014-05-13 09:06:00 -04:00
Margaret Leibovic
0f83115a82 Bug 1005107 - Include charsetMenu.properties in localized files. r=Pike 2014-05-14 14:34:26 +01:00
Lucas Rocha
8492000359 Bug 1009574 - Use final en-US specific URLs on suggested sites (r=mfinkle) 2014-05-14 10:03:44 +01:00
Nick Alexander
5e6438e350 Bug 1009732 - Do only one Proguard pass when build is not MOZILLA_OFFICIAL. r=ckitching
DONTBUILD

This continues the convention that a developer build is when
MOZILLA_OFFICIAL is not defined.
2014-05-13 22:20:36 -07:00
Richard Newman
9674f260e1 Bug 917480 - Part 6: tablet mode. r=nalexander 2014-05-13 20:50:28 -07:00
Richard Newman
ad4e2573ea Bug 917480 - Part 5: UI telemetry for locale switching. r=mfinkle 2014-05-13 20:50:28 -07:00
Richard Newman
57cd5c9b1c Bug 917480 - Part 4: handle resetting to the system default locale. r=nalexander 2014-04-29 13:41:38 -07:00
Richard Newman
b2f66e197b Bug 917480 - Part 3: manifest changes for locale changes on API 17. r=nalexander
locale and layoutDirection need to appear together in android:configChanges
attributes. We specify these in any activity that we don't want Android to
automatically relaunch when a locale change occurs, which is most or all of
them.
2014-05-13 20:50:27 -07:00
Richard Newman
fb4045eb34 Bug 917480 - Part 2: add 'Language' section to top-level preferences, allowing for browser locale switching. r=nalexander
* * *
Bug 917480 - Part 2d: compute locale list at build time.
2014-05-13 20:50:27 -07:00
Richard Newman
6019732cbe Bug 917480 - Part 1: add basic locale preference handling to GeckoPreferences. r=liuche 2014-05-13 20:50:27 -07:00
Richard Newman
3e5ab0e3e3 Bug 917480 - Part 0: refactor checking of isGeckoPref inside GeckoPreferences. r=liuche 2014-05-13 20:50:26 -07:00
Richard Newman
62c0e56a01 Bug 917480 - Pre: commenting. r=nalexander 2014-05-13 20:50:26 -07:00
Michael Comella
d9dc53fcdb Bug 1009279 - Change the margins to padding in the browser toolbar. r=bnicholson 2014-05-13 14:48:06 -07:00
Ryan VanderMeulen
0ec3ca27bc Merge inbound to m-c. 2014-05-13 16:27:03 -04:00
Margaret Leibovic
9ca3a8067d Bug 1009473 - Use lighter gray for item descriptions. r=lucasr 2014-05-13 18:26:07 +01:00
Margaret Leibovic
19eb44568f Bug 1009473 - Remove padding around list item images. r=lucasr 2014-05-13 18:26:04 +01:00
Brian Nicholson
50d67b910f Bug 1009105 - Clean up PageActionLayout. r=margaret 2014-05-13 09:58:00 -07:00
Lucas Rocha
5ccbeed7ff Bug 997888/1008210 - Exclude pinned/top sites from suggested sites (r=mfinkle) 2014-05-13 16:33:19 +01:00
Lucas Rocha
95d40b7601 Bug 997888 - Add API to exclude URLs from suggested sites (r=mfinkle) 2014-05-13 16:33:19 +01:00
Myk Melez
aebdc5e3bf Bug 1009311 - truncate AndroidLog tags longer than 18 characters; r=rnewman 2014-05-13 09:18:00 -07:00
Lucas Rocha
ba682ce0aa Bug 997777 - Optimize moveToPosition() in TopSitesCursorWrapper (r=wesj) 2014-05-13 14:08:30 +01:00
Carsten "Tomcat" Book
2b617398b0 Merge mozilla-central to fx-team 2014-05-13 12:48:23 +02:00
Carsten "Tomcat" Book
68401ff75f merge fx-team to mozilla-central 2014-05-13 12:30:36 +02:00
Michael Comella
ba2aef42e7 Bug 1001243: Disable tabs button when in editing mode. r=bnicholson 2014-05-12 15:19:16 -07:00
Mark Finkle
38fadc8622 Bug 1008645 - Add UI telemetry for First-run r=bnicholson 2014-05-12 18:16:51 -04:00
Mark Finkle
d4acd238c9 Bug 1008386 - Add thumbnail position to griditem loadurl probe r=lucasr 2014-05-12 18:16:44 -04:00
Nick Alexander
8ee72a0f08 Bug 1003359 - Delete existing zip before zipping resources. r=mcomella 2014-05-12 15:08:49 -07:00
Ryan VanderMeulen
de54ba8212 Merge m-c to fx-team. 2014-05-12 16:33:27 -04:00
Ryan VanderMeulen
fec4f55a1d Merge inbound to m-c. 2014-05-12 16:32:53 -04:00
Ryan VanderMeulen
0b55cefbfc Merge m-c to inbound. 2014-05-12 16:35:37 -04:00