Commit Graph

17008 Commits

Author SHA1 Message Date
Mike Hommey
0d6cf23aa9 Bug 1184446 - Remove manual package manifest preprocessing. r=mshal
packager.py itself has been able to do preprocessing since the beginning.
For some reason, Makefile.in-driven preprocessing was kept back then, and
never was removed, and even worse, concatenation was added on top of it.

There is however a downside to the current way of doing things: error
reporting is given relative to the given manifest, which in the current
case is the preprocessed/concatenated file, so line numbers don't match
what is in the file in the source tree. However, when packager.py does
preprocessing itself, line numbers are reported properly.

Thus, switch all package manifests to packager.py-driven preprocessing.
2015-07-17 06:45:14 +09:00
Michael Layzell
a30ff0929b Bug 1165263 - Part 7: Update tracking protection to account for new nsPermissionManager semantics, r=margaret 2015-07-16 14:50:03 -04:00
Michael Layzell
d0d68ff95d Bug 1165263 - Part 5: Update PermissionsUtils.importPrefBranch to use origins instead of hosts, r=ehsan 2015-07-16 14:49:59 -04:00
Ryan VanderMeulen
fa5776b708 Merge m-c to fx-team. a=merge 2015-07-15 13:30:09 -04:00
Ryan VanderMeulen
2806c1d5bc Merge fx-team to m-c. a=merge 2015-07-15 13:25:33 -04:00
Sebastian Kaspari
4c9e9a642b Bug 1181660 - Restricted profiles: At least one restriction has to be enabled in order to be a restricted profile. r=ally
--HG--
extra : commitid : LZIPv44RxPH
extra : rebase_source : 0a6bd7f4aec4ec41edffd89fcf1e8c69fdf46760
2015-07-15 13:14:14 +02:00
Martyn Haigh
4afff5f6f8 Bug 1175970 - Tell users about tracking protection the first time they open a new private tab r=margaret
--HG--
extra : commitid : E4VV10gQZGi
2015-07-15 11:23:37 +01:00
Chenxia Liu
d056b5e31b Bug 1147112 - Add doorhanger icons. r=ally
--HG--
extra : commitid : 1UbFqLnBub5
extra : rebase_source : 5894465732cb816e1443993ca3e526afc8402f90
2015-07-09 18:46:37 -07:00
Chenxia Liu
76b7474e8a Bug 1175972 - Update visuals of tracking protection doorhanger notification. r=ally
--HG--
rename : mobile/android/base/resources/layout/default_doorhanger.xml => mobile/android/base/resources/layout/doorhanger_security.xml
rename : mobile/android/base/resources/layout/default_doorhanger.xml => mobile/android/base/resources/layout/doorhanger_trackingprotection.xml
rename : mobile/android/base/widget/DefaultDoorHanger.java => mobile/android/base/widget/ContentSecurityDoorHanger.java
extra : commitid : JoqeJoTXsor
extra : rebase_source : 1d808cafd5db3166b681e72b23e8a5c388268524
2015-07-08 15:42:11 -07:00
Michael Comella
15f184d590 Bug 1181882 - Hide find in page bar when home pager is shown. r=sebastian
--HG--
extra : commitid : 2RuhjpSdVzQ
extra : rebase_source : 4f5257487cc24fc263ec5a1fd377615ab92e7f62
extra : histedit_source : 302f3804c53e1448692533d6d9787db18b4e0257
2015-07-08 18:03:15 -07:00
Melchiorre Alastra
37410529a8 Bug 1122329 - Remove = null from instance = null in StringHelper. r=mhaigh 2015-07-08 12:50:00 -04:00
dominique vincent
65691ee813 Bug 1180811 - Dismiss Zoomed View when user taps outside the zoomed area. r=mcomella 2015-07-08 17:02:46 +02:00
James Hugman
e8d20bd42c Bug 1132922 – Disable voice search for pre ICS devices. r=liuche
--HG--
extra : transplant_source : %E8-%1A%03c%0C%7D%A349-f%7B%7D%F1%E5%12%FFs%9E
2015-06-30 11:03:33 -07:00
Carsten "Tomcat" Book
4d0773212e merge mozilla-inbound to mozilla-central a=merge 2015-07-14 12:23:09 +02:00
Richard Newman
641117825b Bug 783901 - Use flat icons for send tab notification. r=mcomella 2015-07-13 20:11:25 -07:00
Mark Capella
417c9610fd Bug 1181969 - Typing one letter hides the keyboard, r=mcomella 2015-07-13 20:15:47 -04:00
Michael Comella
0894e9d54e Bug 1182328 - Backed out changeset 2e02ac7f87ab. r=me
Did not mean to land this WIP patch.

--HG--
extra : commitid : 5eVOarG5Ath
2015-07-13 17:14:41 -07:00
Michael Comella
ac5d33f998 Bug 1182328 - Only add Browsable to apps with schemes that are not file. r=margaret
--HG--
extra : commitid : 3EOSfKghvGf
extra : rebase_source : 8a406e87949754ed91291eebfc5a6f6487d8d44f
2015-07-09 17:28:37 -07:00
Sylvestre Ledru
2cfaca06a1 Bug 1176533 - Rename the variable MOZ_APP_VERSION_ABOUT for something more general r=glandium
--HG--
rename : browser/config/version_about.txt => browser/config/version_display.txt
2015-07-11 19:37:54 -06:00
Ryan VanderMeulen
07e1b2ced2 Merge m-c to inbound. a=merge 2015-07-14 23:38:02 -04:00
Seth Fowler
9391045db4 Bug 1183836 - Remove support for decode-on-draw-only. r=tn 2015-07-14 18:16:31 -07:00
Jonathan Almeida
3fa7fc6821 Bug 1181020 - Update Robocop to latest version to support RecyclerView. r=mcomella
- Removed old robotium jar in replace for the newer one.
 - Newer robotium has packaging changes which were updated in all tests.
 - Updated in build.gradle and makefile.

--HG--
extra : transplant_source : %949%F2%F6%10v%9A%CA%8B%FD%EE%05%28%D8%1E%0D%09_%BE%D3
2015-07-07 14:18:56 -07:00
Carsten "Tomcat" Book
4a67c881e4 merge mozilla-inbound to mozilla-central a=merge 2015-07-13 11:51:14 +02:00
Jim Chen
876ede193f Bug 1178850 - Copy generated natives header; r=nalexander
Copy the natives header from the objdir to the source directory,
along with the generated wrapper files from before.

The patch also removes saving the originals to .old files to avoid
producing untracked files in the source tree.
2015-07-10 23:41:36 -04:00
Henry Addo henry@addhen.org
3c9cc3bdbf Bug 1079182 - Fix Replace globe with magnifying glass in tablet editing mode. r=henry 2015-07-08 10:33:23 +09:00
Allison Naaktgeboren
48e4f237a4 Bug 1148524 - Add 'edit login' option in about:passwords context menu.r=margaret 2015-07-10 17:41:46 -07:00
Nick Alexander
5a41a44863 Bug 1182579 - Compute Android version codes in Python. r=gps
I considered three ways to do this:

* one, as a Python script executed with $(shell);
* two, as a Python script that writes an include file for the preprocessor;
* three, as a function exposed to the moz.build sandbox.

I rejected two because it's both tied to the preprocessor, and awkward
to make handle the dependency on the buildid (in a file) and
additional build defines (in config.status).

I rejected three because I know of no precedent for this approach, and
it hides the dependency on the buildid.

One doesn't handle failures in the script gracefully, but neither did
the existing approach.  This patch is at least testable.

--HG--
extra : commitid : 8dfw1ri7qjr
extra : rebase_source : da0e5ec705e0ac4c795bd2d7892f73857a1699ac
2015-07-08 12:43:06 -07:00
Nick Alexander
2d04ca30ee Bug 1182579 - Pre: Remove unused MIN_CPU_VERSION. r=me
We migrated to use MOZ_MIN_CPU_VERSION in moz.build some time back.

--HG--
extra : commitid : GoBGHdceR8r
extra : rebase_source : 8b9d82ec76459154296598610f71b1ea5fdae372
2015-07-08 12:08:31 -07:00
Nick Alexander
69feff025e Bug 1182579 - Pre: Remove unused UA_BUILDID. r=me
--HG--
extra : commitid : 3UpDYQegl1b
extra : rebase_source : 246cb1b05c26337e57fe7dba2645aa422523d41c
2015-07-07 16:55:48 -07:00
Wes Kocher
2d39f043e9 Merge m-c to fx-team, a=merge CLOSED TREE 2015-07-10 16:21:00 -07:00
Wes Kocher
7888a63c73 Merge inbound to central, a=merge 2015-07-10 16:06:49 -07:00
Florian Quèze
dce3ea6229 Bug 1175218 - disable region defaults by making the geoSpecificDefaults.url pref empty to fix test bustage, a=KWierso on CLOSED TREE 2015-07-10 23:58:40 +02:00
vivek
c6502fbaad Bug 1182267 - Invalidated cached OAuth token upon receiving un-Authorized response r=nalexander.
--HG--
extra : commitid : 1t2ughxeyms
extra : rebase_source : 2375f878a60b317abbfe78f517c46a95d7cf437e
extra : amend_source : d10d99e5de81ad2d2db849895e4843703f8e6949
2015-07-10 21:53:11 +03:00
Florian Quèze
af833ef045 Bug 1175218 - The original default engine should be set per region rather than per locale, r=markh.
--HG--
extra : rebase_source : 98eed0fe583dfaef7b83eccba4534b6e46c5accf
2015-07-10 21:06:24 +02:00
Eugen Sawin
a28184b2b3 Bug 1178818 - Don't use promises in DOMApplicationRegistry proxy object. r=myk 2015-07-10 14:30:04 +02:00
Wes Kocher
97bb5a6f42 Merge m-c to fx-team, a=merge 2015-07-09 18:08:05 -07:00
Wes Kocher
2c7068c994 Merge inbound to central, a=merge 2015-07-09 18:01:25 -07:00
vivek
950c51e39d Bug 1182248 - Debug mode setting updated from static flag r=nalexander.
* The checkbox setting would be reflected until the FxAccountUtils is not gc-ed.

--HG--
extra : commitid : 7DYPFsmPhsh
extra : rebase_source : 8871d267f831e9411db521184c13e5e19a1948a1
2015-07-10 00:34:51 +03:00
Ryan VanderMeulen
f416bf7777 Merge m-c to fx-team. a=merge 2015-07-09 13:53:46 -04:00
Carsten "Tomcat" Book
f494aa659e merge mozilla-inbound to mozilla-central a=merge 2015-07-09 17:54:48 +02:00
Geoff Brown
65e4c8cee0 Bug 1179981 - A new test harness for robocop; r=jmaher 2015-07-09 12:30:01 -06:00
Michael Comella
d5150631bb Bug 1179731 - Hide autocomplete suggestions when showing the home pager. r=sebastian
--HG--
extra : commitid : L8snhFbg4vf
extra : rebase_source : 028fd29ae4962307374a836d444e4d17bfbcf706
2015-07-08 17:53:25 -07:00
Ryan VanderMeulen
dc954fae3a Merge m-c to inbound. a=merge
CLOSED TREE
2015-07-09 13:52:22 -04:00
Maksim Lebedev
dbc64b549d Bug 1177323 - disable decode-only-on-draw preference. r=seth
--HG--
extra : rebase_source : 3c452f3188fd22c1d5d293103645d30bcef6a939
2015-07-08 00:19:00 +02:00
Martyn Haigh
472e082735 Bug 1181124 - Remove mdpi folder from CONSTRAINED_AAPT_CONFIGURATIONS in Makefile.in r=nalexander
--HG--
extra : commitid : HybZqiNAnRO
extra : rebase_source : fa88d8de028c877546171a7a81f35dfb640fcf40
2015-07-07 17:35:09 +01:00
Martyn Haigh
32adeccc6a Bug 1180766 - tab_queue_prompt.xml file has two elements with the id of tab_queue_container r=sebastian
--HG--
extra : commitid : 70SsxGsgFZW
extra : rebase_source : 5ae4e02e25540354581ab0bf2e9e3d700bd82bfd
extra : amend_source : 1e1291472db55350ab7c47ef8053f40167470bdd
2015-07-07 16:35:36 +01:00
Margaret Leibovic
313ec41bae Bug 1179872 - Remove about:apps page and menu item. r=mcomella
--HG--
extra : commitid : I868jpOSYPO
extra : rebase_source : bc65dc5c0f6389b79fddc5c553f6f6ef9110751e
2015-07-07 16:01:43 -07:00
Michael Comella
be905ce5c3 Bug 1180011 - Replace tablet private browsing url bar assets. r=margaret
The phone assets were updated but the tablet assets were not.

Ideally, we'd merge these assets but let's not yak shave.

--HG--
extra : commitid : 1nkbfuuK85h
extra : rebase_source : 5252de4c79a74112f4837ca84f00f90e431a5598
2015-07-07 13:42:19 -07:00
Nick Alexander
3116ddce8f Bug 1161234 - Part 2: Accept non-default auth, token, and profile endpoints. r=me
This allows us to create accounts that Sync against non-production
endpoints from JavaScript.  In future we will include oauth and
eventually content server endpoints in these messages.

--HG--
extra : commitid : IwJPgL5C3fO
extra : rebase_source : 092e5052f6185c73df8d46285b1529e6fe83d4ef
2015-07-08 13:46:07 -07:00
Martyn Haigh
e67cc9971b Bug 1182011 - Remove ScrollAnimator.java r=sebastian
--HG--
extra : commitid : IEa2XHzNIwi
extra : rebase_source : b643276ab092888a945dc11fe1b3c30bc863e0bc
extra : amend_source : 03db29b5eb5d0d251dfbc7a0f97edc53aae430a4
2015-07-09 11:56:25 +01:00