Paul O’Shannessy
c14242ec57
Merge mozilla-central & fx-team
2011-11-03 16:12:06 -07:00
Rob Campbell
04a8e53c79
Bug 699475 - Backed out changeset b878369ab3c8, testfailures and a
...
bug. a=orange
2011-11-03 19:55:02 -03:00
Rob Campbell
4d975d962c
Bug 699475 - Integrate RuleView into Highlighter Sidebar; r=dcamp
2011-11-03 18:40:36 -03:00
Paul O’Shannessy
865b93db8b
Bug 690992 - App tabs break deleting cookies on close [r=dietrich]
...
This does 2 things:
1. Makes sure that we don't try to split cookies in the case of _extractHostsForCookies doesn't return any hosts.
2. If _host & _scheme aren't present for an entry (always true at startup), we will create an nsIURI from the url and extract host & scheme from that.
2011-11-03 13:44:19 -07:00
Ed Morley
689909afab
Merge last green changeset of mozilla-inbound to mozilla-central
2011-11-03 19:48:45 +00:00
Jared Wein
9f8b2e12b5
Bug 699240 - Ctrl+F4 should not close app tabs on Windows. r=gavin
2011-11-03 12:14:58 -07:00
Heather Arther
686af0cb85
Bug 679467 - scratchpad doesn't display the value false; r=rcampbell
2011-11-03 12:39:32 -03:00
Joe Walker
686c77bf14
Bug 697039 - GCLI should officially drop support for older browsers; r=dcamp
2011-11-03 12:36:43 -03:00
Joe Walker
3185e92277
Bug 693955 - GCLI source code should be formatted perfectly; r=dcamp
2011-11-03 12:35:29 -03:00
Joe Walker
4ae21528a5
Bug 694932 - GCLI should make the same JS security checks as JSTerm; r=dcamp
2011-11-03 12:35:05 -03:00
Marco Bonardo
7d64e79a4d
Merge mozilla-central and mozilla-inbound
2011-11-03 15:56:28 +01:00
Rob Campbell
e13aae1370
Bug 695440 - Create sidebar for Highlighter tools; f=zpao; r=dcamp,dao
2011-11-03 10:37:14 -03:00
Rob Campbell
1e2ac2193c
backout of rev 73e8ca9230d6, wrong bug number. a=#developers
2011-11-03 09:44:40 -03:00
Rob Campbell
20f4788112
merge m-c to fx-team
2011-11-03 09:29:07 -03:00
Marco Bonardo
a9a0608213
Merge mozilla-central to mozilla-inbound
2011-11-03 10:46:56 +01:00
Jared Wein
b19b9b611a
Bug 669240 - Ctrl+F4 should not close app tabs on Windows. r=gavin
2011-11-02 19:09:37 -07:00
Philipp von Weitershausen
d69fb6bf5a
Merge services-central with mozilla-central
2011-11-02 15:00:49 -07:00
Paul ADENOT
ee488120b5
Bug 556563 - Disable/remove "View video" when you're already viewing the video. r=dolske
2011-11-02 13:52:21 -07:00
Heather Arthur
0c0e913bcf
Bug 644409 - Make scratchpads save their state across restarts. r=robcee, r=zpao
2011-11-02 12:32:55 -07:00
Heather Arthur
f58f25024b
Backed out changeset 3b63add3a404
2011-11-02 12:26:59 -07:00
Heather Arthur
bbea028fe1
Bug 644409 - Make scratchpads save their state across restarts
2011-11-02 12:14:30 -07:00
Kyle Huey
74ca38166a
Merge m-i to m-c.
2011-11-02 08:24:41 -04:00
Dave Camp
046d9f4003
Bug 693887 - Implement a rule-centric view for the style inspector. r=robcee, r=dao
2011-11-01 18:06:48 -07:00
Rob Campbell
ab8c4f3bb6
Bug 683873 - [highlighter] move the close button to the toolbar, test-fix; a=orange
2011-11-01 17:01:17 -03:00
Cedric Vivier
e9098bee9e
Bug 698703 - Source Editor should display text with the user's preferred monospace font size; r=msucan
2011-11-01 18:30:19 +08:00
Chenxia Liu
44d8dcafca
Bug 697750 - Follow-up: replace about:home sync "links" (actually buttons) with links. r=gavin.sharp
2011-10-28 15:00:48 -07:00
Philipp von Weitershausen
03290d8def
Merge m-c to s-c
2011-10-31 01:54:35 -07:00
Chenxia Liu
9668be584d
Bug 697217: follow-up to 675821, create new localization strings for sync links on about:home
2011-10-28 17:55:49 -04:00
Chenxia Liu
722c44e510
Bug 675821 - Part 3: tests for sync links behavior in aboutHome. r=philikon
2011-10-26 21:27:49 -04:00
Chenxia Liu
53784af0a7
Bug 675821 - Part 2: update sync links in aboutHome UI on sync setup or unlink. r=philikon
2011-10-26 21:26:53 -04:00
Chenxia Liu
809c000574
Bug 675821 - Part 1: add Sync Setup and Pair links to aboutHome. r=gavin.sharp
2011-10-26 21:26:51 -04:00
Philipp von Weitershausen
d16c0424f8
Merge m-c to s-c
2011-10-26 19:08:26 -07:00
Dão Gottwald
3dcc29d5a7
Bug 690227 - Back out bug 455694 (tab drag/detach animations). a=dolske a=legneato
2011-10-26 17:46:58 -07:00
Frank Yan
811d1cce54
Bug 697410 - Hide snippets container when it's empty. r=mak
2011-10-26 17:46:52 -07:00
Ed Morley
3486d03128
Merge mozilla-central and mozilla-inbound
2011-10-26 01:04:58 +01:00
Mounir Lamouri
2c0789a879
Bug 678694 - (3/7) Plug mozBattery into navigator object. r=sicking
2011-11-02 13:04:39 +01:00
Philipp von Weitershausen
ed825217da
Merge services-central with mozilla-central
2011-10-25 09:29:55 -07:00
Paul O’Shannessy
4841795637
Bug 679590 - Intermittent failure in browser_607016.js | sanity check that tab doesn't have extData. r=dietrich
2011-10-25 10:22:03 +02:00
Allison Naaktgeboren
26d0a53bc9
Bug 675822 - First sync desktop status page with upload progress bar. r=philikon CLOSED TREE
...
Part 5: fix to broken desktop to desktop set up.
2011-10-24 15:18:53 -07:00
Ehsan Akhgari
075616367f
Bug 694865 - VC11 cannot compile the IE profile migration code because pstore.h no longer ships with the SDK; r=bbondy
2011-10-24 17:04:16 -04:00
Allison Naaktgeboren
8cd3f41f05
Bug 696823 - follow-up: adjust progress bar max to account for client engine sync notification. r=philikon
2011-10-24 12:24:00 -07:00
Philipp von Weitershausen
a5b6e2ad6f
Merge m-c to s-c
2011-10-24 09:08:55 -07:00
Ed Morley
38af1a8516
Merge mozilla-central and mozilla-inbound
2011-10-23 17:16:21 +01:00
Tim Taubert
4c37cfb21a
merge the last green changeset on m-c to fx-team
2011-10-22 21:07:26 +02:00
Jonas Sicking
ac8b04fb20
Bug 687400: Kill Node.isSameNode. r=smaug
2011-10-28 19:52:27 -07:00
Ed Morley
78fb982b27
Merge mozilla-central and mozilla-inbound
2011-10-29 02:40:36 +01:00
Paul O’Shannessy
7f0e279cc7
Backout 78c921e2b56b (bug 640136) for causing bug 698162
2011-10-28 18:11:02 -07:00
Terry Long
8329c7b26d
Bug 623872 - Cmd + L is not focusing location bar in popup windows; r=dao
2011-10-28 15:05:07 +01:00
Chris Pearce
56febda55c
Bug 684625 - Display a warning when full-screen entered, or on restricted keypress. r=dao
2011-10-28 21:28:05 +13:00
Ed Morley
6c08afb7da
Merge mozilla-central and mozilla-inbound
2011-10-28 02:11:57 +01:00
