Carsten "Tomcat" Book
4738ce7870
Merge mozilla-central to fx-team
2014-07-24 15:42:26 +02:00
Carsten "Tomcat" Book
db0e3ba9fb
merge fx-team to mozilla-central a=merge
2014-07-24 15:34:40 +02:00
Dão Gottwald
ca70cdfd69
Bug 1018405 - The "Manage" link next to the Firefox Account name should be a button instead. r=jaws
2014-07-24 15:04:24 +02:00
Wes Kocher
b42fc70a69
Merge m-c to inbound
2014-07-23 18:55:48 -07:00
Wes Kocher
3948d48c29
Merge fx-team to m-c a=merge
2014-07-23 18:47:48 -07:00
Jared Wein
cbbe62b119
Bug 1035625 - Support 'resizable' in-content preference subdialogs. r=MattN
2014-07-23 16:42:17 -04:00
Mike de Boer
9102cf83c7
Bug 1038648: [Loop] ensure exposed objects are immutable to prevent abuse by others. r=dolske
2014-07-23 19:08:21 +02:00
Ed Morley
dcb29bbb36
Backed out changeset 19ae3d5f6884 (bug 1038648) for failures in test_loopservice_initialize.js
2014-07-23 17:04:24 +01:00
Gijs Kruitbosch
d950b54159
Bug 1042300 - test fix: shouldn't assume in-content and instantApply prefs are enabled, r=jaws
2014-07-23 16:43:06 +01:00
Carsten "Tomcat" Book
07f9bf07af
Merge mozilla-central to fx-team
2014-07-23 16:22:24 +02:00
Mike de Boer
d68a31f896
Bug 1038648: [Loop] ensure exposed objects are immutable to prevent abuse by others. r=dolske
2014-07-23 15:25:49 +02:00
Andrea Marchesini
9679a08231
Bug 660237 - implement nsIDOMStorage with a proxy, r=bzbarsky, r=mayhemer
2014-07-23 01:07:12 -04:00
Mike Hommey
ad9b49263a
Bug 1041936 part 2 - Directly use the static library "xul" to link into "xul-gtest" instead of having an intermediate library "xul" used by "xul-shared" and "xul-gtest". r=gps
2014-07-23 13:33:09 +09:00
Mike Hommey
71623acdd6
Bug 1036894 part 9 - Replace all EXTRA_DSO_LDOPTS, SHARED_LIBRARY_LIBS and LIBS with EXTRA_LIBS, OS_LIBS or OS_LDFLAGS, appropriately. r=gps
...
OS_LIBS for libraries that are not part of the gecko tree, EXTRA_LIBS for
libraries, such as NSPR, that are in the tree, but are not handled by
moz.build just yet. Those EXTRA_LIBS may also come from a system library.
However, in cases where the expanded variables are always empty for the
in-tree case, OS_LIBS is used (as for, e.g. MOZ_ZLIB_LIBS). OS_LDFLAGS is
used exclusively for non-library linker flags.
Always pass EXTRA_LIBS before OS_LIBS on linker command lines.
Forbid EXTRA_DSO_LDOPTS, SHARED_LIBRARY_LIBS and LIBS in Makefiles.
2014-07-23 13:31:02 +09:00
Mike Hommey
e5c43ef995
Bug 1036894 part 8 - Move most in-tree library linkage information to moz.build, as USE_LIBS. r=gps
2014-07-23 13:30:52 +09:00
Mike Hommey
31cd528278
Bug 1036894 part 1 - Move MAKE_FRAMEWORK, SDK_LIBRARY, SHARED_LIBRARY_NAME and STATIC_LIBRARY_NAME to moz.build. r=gps
...
At the same time, make the Library data more useful in the build frontend.
2014-07-23 13:29:09 +09:00
Carsten "Tomcat" Book
0a354359a4
merge fx-team to mozilla-central a=merge
2014-07-22 15:53:08 +02:00
Tim Taubert
82aab73edd
Bug 1041527 - Ensure that about:home isn't the initial tab when opening new windows in tabview tests r=ehsan
2014-07-21 17:06:57 +02:00
Jonathan Griffin
efbbf73c27
Backed out changeset 64586374a208 on a CLOSED TREE
2014-07-22 18:29:57 -07:00
Wes Kocher
daf70bd542
Merge inbound to m-c a=merge
2014-07-21 18:00:14 -07:00
Wes Kocher
aa53df3588
Merge fx-team to mozilla-central a=merge
2014-07-21 17:25:48 -07:00
Nicolas Perriault
3e357e0dc1
Bug 1000131 - Expired Loop call url notification, r=dmose
...
--HG--
rename : browser/components/loop/standalone/content/js/webapp.js => browser/components/loop/standalone/content/js/webapp.jsx
2014-07-21 13:04:43 -07:00
Neil Deakin
e2716d6158
Bug 1013064, backout e5dfe9801f76, 11f3a97d1d2c, e2374762f521, 91db8acb8d7e, d0050ba0b875 due to sync issues
2014-07-21 09:09:41 -04:00
Florian Quèze
3031e4a163
Bug 1027024 - Never translate 'language' disappears when close/open translation infobar using a expired key - follow-up, r=mikedeboer.
2014-07-21 12:24:43 +02:00
Nicolas Perriault
cc20b93fc5
Bug 1020445: Fixed Loop conversation layout on Google Chrome, r=dmose
2014-07-23 12:52:17 -07:00
Richard Marti
ef7beda457
Bug 1038288 - Implement the updated InContent Preferences Design. r=jaws
2014-07-14 20:35:33 +02:00
Richard Marti
ea7237931e
Bug 1035541 - Convert Content pane dialogs to be in-content. r=MattN, mano
2014-07-09 19:53:52 +02:00
Alexandre Poirot
09c66c2ebd
Bug 1027242 - Blacklist mulet's failing tests + expose 'mulet' to ini files; fix previous bustage on a CLOSED TREE, r=ahal
2014-07-02 15:40:56 -07:00
Jonathan Griffin
0cd20a2c49
Backout 4f6d9db92389 for bustage on a CLOSED TREE
2014-07-22 17:55:50 -07:00
Alexandre Poirot
5a3800bc64
Bug 1027242 - Blacklist mulet's failing tests + expose 'mulet' to ini files; fix previous bustage on a CLOSED TREE, r=ahal
2014-07-02 15:40:56 -07:00
Alexandre Poirot
c044256760
Bug 1027242 - Blacklist mulet's failing tests + expose 'mulet' to ini files. r=ahal
2014-07-02 15:40:56 -07:00
Trevor Saunders
0cdb19dabd
bug 1036694 - merge nsIMarkupDocumentViewer into nsIContentViewer r=smaug
2014-07-09 17:27:49 -04:00
Andrei Oprea
c9f85c4a2f
Bug 1040901 - Make Loop incoming call view match MVP spec, r=dmose
...
--HG--
rename : browser/components/loop/content/js/conversation.js => browser/components/loop/content/js/conversation.jsx
2014-07-18 15:50:10 -07:00
Mark Banner
5e95371368
Bug 1038699 - Loop no longer resets the hawk session token when it is invalid. Handle the new server responses. r=dmose
2014-07-18 11:42:44 -07:00
Paul Kerr [:pkerr]
8d325f06e4
Bug 1002414 - Part 2: Add additional tests for new functional paths. r=standard8
2014-07-17 17:18:52 -07:00
Paul Kerr [:pkerr]
6ac7ae5335
Bug 1002414 - Part 1: Add retry logic to PushServer user agent. r=standard8
2014-07-17 15:28:38 -07:00
Ehsan Akhgari
d10c7ff9e5
Bug 1039845 - Give nsWindowsShellService a private destructor; r=bjacob
...
--HG--
extra : rebase_source : 0278ccf497f7db063b78deddd2ccce5a61fed718
2014-07-17 16:43:38 -04:00
Blake Winton
e95052c3f8
Bug 1038248 - Add UITelemetry to count the number and type of searches. r=mconley
2014-07-17 11:37:22 -04:00
Carsten "Tomcat" Book
5088831323
merge fx-team to mozilla-central a=merge
2014-07-17 16:31:33 +02:00
Nicolas Perriault
ee11ded0da
Bug 1039263: Fixed standalone Loop UI couldn't restart a call. r=dmose
2014-07-17 09:27:48 +01:00
Mark Banner
ef95024fc3
Bug 1036661 Accessing the loop panel for the first time triggers an error message in the console. r=dolske
2014-07-17 09:27:48 +01:00
Mark Banner
4587cd809a
Bug 1039757 Add a script to run relevant unit tests for Loop. r=dmose
2014-07-17 09:27:47 +01:00
Wes Kocher
d778407bb2
Merge m-c to fx-team
2014-07-16 17:46:33 -07:00
Wes Kocher
9ad6223bc1
Merge inbound to m-c a=merge
2014-07-16 17:08:26 -07:00
Dão Gottwald
20ed927900
Bug 1037017 - Remove cui-areatype from removable=false widgets. r=gijs
2014-07-16 22:04:06 +02:00
Mark Banner
992ddbe57a
Bug 1038675 expiresAt parameter of /call-url/ response has changed from hours to seconds with the latest server version (Loop desktop client doesn't register on startup of browser). r=nperriault
2014-07-16 15:15:08 +01:00
Nicolas Perriault
42c14a3f34
Bug 1020448 - Add Loop pending call timeout for the link clicker UI. r=Standard8,ui-review=dhenein
2014-07-16 15:15:08 +01:00
Mark Banner
054e18d505
Bug 1017273 Change Loop from compile-time enabled to runtime-enabled with a pref. r=dolske,r=jesup,r=glandium,r=gijs
2014-07-16 15:15:07 +01:00
Tim Taubert
af7f2cb616
Bug 1028187 - Enable IndexedDB for about:looppanel and about:loopconversation, sharing an origin r=bz
2014-07-03 17:16:08 -07:00
Richard Marti
f4d9de2ce6
Bug 1036054 - Convert Sync pane dialog to be in-content. r=mattn
2014-07-15 23:05:55 +02:00