wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
174,348 Commits 1 Branch 166 Tags 1.2 GiB
1f813b9a99
Commit Graph

8047 Commits

Author SHA1 Message Date
John Schoenick
99e1d7de24 Bug 967694 - Fix tests that expect old behavior. r=bsmedberg 2014-02-11 12:14:42 -08:00
Ryan VanderMeulen
015eea37af Merge m-c to inbound. 2014-02-13 10:31:44 -05:00
Ted Mielczarek
06e04ce1b2 Bug 968837 - Move more Mochitests into manifests. r=jmaher 
--HG--
rename : toolkit/components/places/tests/browser/bug_399606/399606-history.go-0.html => toolkit/components/places/tests/browser/399606-history.go-0.html
rename : toolkit/components/places/tests/browser/bug_399606/399606-httprefresh.html => toolkit/components/places/tests/browser/399606-httprefresh.html
rename : toolkit/components/places/tests/browser/bug_399606/399606-location.reload.html => toolkit/components/places/tests/browser/399606-location.reload.html
rename : toolkit/components/places/tests/browser/bug_399606/399606-location.replace.html => toolkit/components/places/tests/browser/399606-location.replace.html
rename : toolkit/components/places/tests/browser/bug_399606/399606-window.location.href.html => toolkit/components/places/tests/browser/399606-window.location.href.html
rename : toolkit/components/places/tests/browser/bug_399606/399606-window.location.html => toolkit/components/places/tests/browser/399606-window.location.html
rename : toolkit/components/places/tests/browser/visituri/begin.html => toolkit/components/places/tests/browser/begin.html
rename : toolkit/components/places/tests/browser/visituri/final.html => toolkit/components/places/tests/browser/final.html
rename : toolkit/components/places/tests/browser/visituri/redirect_once.sjs => toolkit/components/places/tests/browser/redirect_once.sjs
rename : toolkit/components/places/tests/browser/visituri/redirect_twice.sjs => toolkit/components/places/tests/browser/redirect_twice.sjs
rename : toolkit/components/places/tests/browser/settitle/title1.html => toolkit/components/places/tests/browser/title1.html
rename : toolkit/components/places/tests/browser/settitle/title2.html => toolkit/components/places/tests/browser/title2.html
rename : toolkit/components/places/tests/mochitest/bug94514-postpage.html => toolkit/components/places/tests/bug94514-postpage.html
rename : toolkit/components/places/tests/mochitest/test_bug_411966.html => toolkit/components/places/tests/test_bug_411966.html
rename : toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html => toolkit/components/places/tests/test_bug_461710_perwindowpb.html
rename : toolkit/components/places/tests/mochitest/test_bug_94514.html => toolkit/components/places/tests/test_bug_94514.html
 2014-02-06 15:37:30 -05:00
Darren Kalck
10ea4070d4 Bug 808540 - Revert bug 724346. r=Dao 2014-02-11 17:40:34 -05:00
Gijs Kruitbosch
e3761c30ea Bug 969376 - correctly size Australis' menu button, make it hug right border on Windows and Linux, r=jaws 
--HG--
rename : browser/base/content/test/general/browser_backButtonFitts.js => browser/base/content/test/general/browser_menuButtonFitts.js
extra : rebase_source : 340dcab974bf49f1e3abfc18e0e7217bb5803411
 2014-02-11 19:31:43 +00:00
Willian Gustavo Veiga
fd8a3c8c5f Bug 644186 - Open a new window when shift-clicking the "Open a new tab" button. r=Dao 2014-02-11 13:21:58 -05:00
Sami Jaktholm
9b3ece3169 Bug 736574 - PageInfo: Fix an if-condition causing a failure to sort the media by count. r=Dao 2014-02-11 09:24:03 -05:00
Ryan VanderMeulen
9dfad8137f Merge inbound to m-c. 2014-02-11 08:39:31 -05:00
Florian Quèze
c6e8f927ea Bug 965265 - Opening a new private window shows social provider buttons which don't do anything, r=mixedpuppy. 
--HG--
extra : rebase_source : 74d3f5fd7eea7c4c146f0eba843e7d39837c406f
 2014-02-11 08:28:25 +01:00
Bill McCloskey
2a42a3c83e Bug 970276 - Don't respect <link rel=""> elements from subframes (r=felipe) 2014-02-10 16:42:18 -08:00
Ms2ger
63c5bd405a Merge m-i to m-c. 2014-02-09 10:31:55 +01:00
Jared Wein
af4de16024 Bug 966905 - [Australis] Headers and footers of subviews should be outside scrollable bits of those panels/subviews. r=Gijs 2014-02-08 18:27:56 -05:00
Gijs Kruitbosch
d98ac10470 Bug 967220 - Australis - include the tabstoolbar in things animating (with a margin), r=mconley 2014-02-08 00:27:59 +00:00
Gavin Sharp
a343be7cc9 Bug 959061 followup: remove else after return 2014-02-08 12:35:04 -08:00
Phil Ringnalda
21c8b0641d Merge m-c to m-i 2014-02-08 19:32:35 -08:00
Bill McCloskey
60ad7a2ae7 Bug 961529 - Run DOMLinkHandler in a content script (r=felipe) 2014-02-08 17:41:34 -08:00
Bill McCloskey
a34b6333d3 Bug 961529 - Add Feeds module (r=felipe) 2014-02-08 17:41:30 -08:00
Dão Gottwald
acbbcb8605 Bug 445461 - restore MRU tab order when restoring a session. r=ttaubert 2014-02-07 22:48:49 +01:00
Gijs Kruitbosch
4e6998a884 Bug 967115 - fix styling of SDK toolbar buttons in Australis, r=jaws 2014-02-07 21:36:16 +00:00
Gijs Kruitbosch
816c1cf3d9 Bug 879981 - make non-removable items fade out and non-draggable and adjust their cursor for Australis, r=mikedeboer 
--HG--
extra : rebase_source : 710421b85304f29a7a01f63d72f3963a5522f9bc
 2014-02-07 18:11:55 +00:00
Carsten "Tomcat" Book
e3aafe9e11 merge fx-team to mozilla-central 2014-02-07 09:52:32 +01:00
Blair McBride
621bbde00a Bug 952568 - [australis-measuring] Determine if Australis Update experience tab is/was active. r=mconley,MattN 2014-02-07 16:19:12 +13:00
Mark Hammond
267498a160 Bug 850721 - fix social blocklist oranges by not enabling the default update server. r=mixedpuppy 2014-02-07 12:07:04 +11:00
Dão Gottwald
1d27d75bd0 Bug 747338 - Set last-accessed timestamp when deselecting tabs rather than when selecting them. r=ttaubert 2014-02-06 17:28:54 +01:00
Gijs Kruitbosch
0b282a6b55 Bug 899530, update comment style per review request, DONTBUILD because just comments. 2014-02-06 15:27:31 +00:00
Gijs Kruitbosch
242c102747 Bug 899530 - adjust bookmarks drag code to not close the menu when over the menu button, r=mak 2014-02-05 17:56:04 +00:00
Carsten "Tomcat" Book
bc12580f7a Backed out changeset 8c4807bfdd2a (bug 965265) for browser-chrome bustage on a CLOSED TREE 2014-02-06 14:55:46 +01:00
Florian Quèze
3857bd313a Bug 965264 - Opening a new window shows original provider buttons, not updated ones, r=mixedpuppy. 2014-02-06 13:04:56 +01:00
Florian Quèze
7f9bbeef2d Bug 965265 - Opening a new private window shows social provider buttons which don't do anything, r=mixedpuppy. 2014-02-06 13:03:05 +01:00
Ryan VanderMeulen
3bf7101122 Merge m-c to fx-team. 2014-02-05 16:14:03 -05:00
Ryan VanderMeulen
ee5b33d7be Merge fx-team to m-c. 2014-02-05 15:31:20 -05:00
Gijs Kruitbosch
320536be95 Bug 968384 - make the bookmarks item not say 'undefined' in the overflow menu, r=mconley 2014-02-05 20:30:03 +00:00
Masayuki Nakano
cc7c2b4704 Bug 966612 part.2 Add tests on printpreview UI r=enndeakin 2014-02-06 00:14:36 +09:00
Carsten "Tomcat" Book
a012359c30 merge fx-team to mozilla-central 2014-02-05 13:28:00 +01:00
Carsten "Tomcat" Book
9214e38f89 merge b2g-inbound to mozilla-central 2014-02-05 13:23:25 +01:00
Gregor Wagner
3338cb1ba0 [Bug 967342] Server not found pages have '&f=regular' appended to url. r=bz 2014-02-05 07:57:16 +01:00
Mike Conley
675202bb11 Bug 930094 - [Australis] Browser windows sometimes have the nav-bar drawn in the titlebar. r=dao, Gijs. 
* * *
Fix for 930094
* * *
Fix because WTF
 2014-02-04 16:17:00 -05:00
Mike Conley
affd254b15 [Australis] Backout cbe26a93c79b (bug 930094) for test failures. 2014-02-04 18:46:38 -05:00
Ryan VanderMeulen
9bf72037e1 Merge m-c to inbound on a CLOSED TREE. 2014-02-06 16:29:41 -05:00
Alex Henrie
77822eb46b Bug 968029 - Use unprefixed box-sizing in browser/ and toolkit/. r=dao 2014-02-04 21:36:29 -07:00
Carsten "Tomcat" Book
d9128b7e43 Merge mozilla-central to fx-team on a CLOSED TREE 2014-02-05 14:54:11 +01:00
Mark Hammond
222d7dc0e4 Bug 967313 - ensure Sync is initialized before we set the fxAccounts user. r=ttaubert. 2014-02-05 16:09:54 +11:00
Mark Hammond
1c997f9375 Bug 967350 - openSignInAgainPage() now opens about:accounts?action=reauth. r=ttaubert 2014-02-05 09:11:20 +11:00
Mike Conley
c830ac085d Bug 930094 - [Australis] Browser windows sometimes have the nav-bar drawn in the titlebar. r=dao, Gijs. 2014-02-04 16:56:07 -05:00
Darrin Henein
7fae48ebd6 Bug 931343: Australis - Implement bookmarking animation. r=mak 2014-02-03 08:42:00 +00:00
Gijs Kruitbosch
3e4f81a055 Bug 966572 - Australis: always initialize itemIds and continue nullchecking this.star, r=mak 
--HG--
extra : rebase_source : 4a962cafe58bdc9d0578df35920009c89a5a86fd
 2014-02-03 14:36:00 +00:00
Gijs Kruitbosch
21287535c5 Bug 964217 - fix search item insertion in Australis customization mode, r=Unfocused 2014-02-03 10:48:21 +00:00
Phil Ringnalda
bb7caba13b Merge m-i to m-c 2014-02-02 17:43:48 -08:00
Mark Hammond
3b308ca9ed Bug 966823 - ensure checking if there is a login error doesn't initialize sync too early. r=ttaubert 2014-02-03 10:47:35 +11:00
Phil Ringnalda
b67aed301a Bug 958026 - Skip browser_aboutAccounts.js on Linux where it times out and takes out hundreds of other tests 
--HG--
extra : rebase_source : 4bbef7e2920ca68bfc5f74baff3fc0df92ff1234
 2014-02-02 11:56:34 -08:00
Gijs Kruitbosch
c6ba7f987a Bug 940116 - fix tabview button tooltip for Australis, r=jaws 2014-02-01 23:27:54 +00:00
Ryan VanderMeulen
c38fd42e3c Merge b2g-inbound to m-c. 2014-02-01 17:22:20 -05:00
Michael Henretty
985283fe8e Bug 959800 - [Offline] mozbrowser iframes don't display correct offline content. r=fabrice, bz 2014-01-30 15:06:34 -08:00
Shane Caraveo
0b4eb0c893 bug 963961 fix intermittent blocklist failure, r=felipe 2014-01-31 11:46:04 -08:00
Tim Taubert
5d977d0da8 Bug 964922 - Enable FxA Sync on Nightly r=markh 2014-01-30 12:09:12 -08:00
Zachary Carter
d48a905e54 Bug 965117 - Custom fonts on about:accounts and other visual/string tweaks. r=ttaubert 2014-01-31 16:50:55 -08:00
Gavin Sharp
7ae382f69f [Australis] portion of bug 966511: rename gFxAccount.toggle to gFxAccount.onMenuPanelCommand, r=ttaubert 
--HG--
extra : rebase_source : 999ac3977c3c6f1d397689489b8d9fe8d740c822
 2014-01-31 17:27:51 -08:00
Gavin Sharp
76c0615ab2 Bug 966511: Tweak Sync UI, r=ttaubert 
Changes:
- rename browser-fxaccounts.js "toggle" to onMenuPanelCommand
- rename openSignInPage->openSignInAgainPage and change it to point to about:accounts?signin=true
- introduce openAccountsPage and change the menu panel "signed in"'s UI to call it
- remove period at the end of "Firefox is now syncing" in the success doorhanger
- rename syncErrorPanel.title->syncErrorPanel.heading for consistency
- remove the "Preferences" button from the "you need to sign in again" doorhanger
- "manage"->"change" in the "What would you like to Sync" dialog
- change "Unlink Browser" to "Disconnect", in both the prefs button and confirmation dialog title
- adjust string in the "Disconnect" confirmation dialog
- change "Device"->"computer" in the relink verification dialog
- fix success panel heading styling (should be bold)

--HG--
extra : rebase_source : 358c93e1123e11200523b96d97ecd25421edaca4
 2014-01-31 17:20:21 -08:00
Mark Hammond
d5a0e6296a Bug 966520 - have sync prefs pane open the new "force sign in" page. r=gavin 2014-01-31 17:27:59 -08:00
Tim Taubert
1ab9fb74db Bug 966546 - [Australis] Doorhanger should slide and have the right anchor position r=gavin 2014-01-31 16:09:22 -08:00
Gijs Kruitbosch
3f060ceee8 Bug 964887 - fix menu in Australis to say 'Edit this bookmark' for pages which have already been bookmarked, r=mak 2014-01-31 23:21:41 +00:00
Mike Conley
c6ed3e6849 Bug 962677 - [Australis] Use content-deck and toolbar margins for the customize mode transition. r=jaws, Gijs (for test fix). 2014-01-31 11:28:35 -05:00
Neil Deakin
ee782b7b75 Bug 943759, [Australis], support mousethrough on panels to allow mouse events to pass through to the content behind, implemented on Windows, Mac and Linux, use this for the UI tour highlight, r=neil,jmathies,karlt 2014-01-31 08:27:43 -05:00
Gavin Sharp
6cd1afb019 Bug 966134: merge warning dialog should mention new email, not old email, and we should avoid storing the plaintext of signed-in users forever, r=markh 
--HG--
extra : rebase_source : cee71c3201ee6fffc477d2cced50e0df567a0976
 2014-01-30 19:05:24 -08:00
Tim Taubert
861c2ec442 Bug 965641 - [Australis] prompt user to sign-in again UI in the menu panel r=markh 2014-01-29 19:06:50 -08:00
Tim Taubert
790e792a5d Bug 964349 - Follow-up: use gCrashReporter instead of Services.appinfo r=bustage 2014-01-30 18:53:35 -08:00
Blair McBride
3646e61e81 Bug 958673 - [Australis] UITour: Style doorhanger menu for Australis Update Tour. r=MattN 2014-01-31 15:25:45 +13:00
Tim Taubert
2427791234 Bug 965607 - [Australis] Show FxA doorhangers only for the most recent non-popup browser window r=markh 2014-01-30 11:15:46 -08:00
Tim Taubert
16258d4246 Backed out [Australis] changeset 7560f1dfaa97 (bug 965641) 2014-01-30 17:44:58 -08:00
Tim Taubert
5fda3f6336 Backed out [Australis] changeset 1471e8762222 (bug 965607) 2014-01-30 17:44:56 -08:00
Tim Taubert
786c6dd885 Bug 964349 - Move CrashReporter.annotateCrashReport() calls out of sessionstore r=gavin 2014-01-27 08:45:28 -08:00
Wes Kocher
54215027c1 Backed out changeset 066920d21e0e (bug 964349) for breaking browser-chrome tests 2014-01-30 17:35:36 -08:00
Gijs Kruitbosch
5260d9fa22 Bug 940116 - part 3: update XUL buttons to have a dynamic tooltip that includes a shortcut (Australis), r=jaws 2014-01-31 00:16:05 +00:00
Tim Taubert
fd1749ef36 Bug 964349 - Move CrashReporter.annotateCrashReport() calls out of sessionstore r=gavin 2014-01-27 08:45:28 -08:00
Tim Taubert
06ac26ed21 Bug 965607 - [Australis] Show FxA doorhangers only for the most recent non-popup browser window r=markh 2014-01-30 11:15:46 -08:00
Tim Taubert
aacfd2cc8d Bug 965641 - [Australis] prompt user to sign-in again UI in the menu panel r=markh 2014-01-29 19:06:50 -08:00
Ryan VanderMeulen
b5a0391a64 Merge m-c to fx-team. 2014-01-30 16:40:31 -05:00
Ryan VanderMeulen
ee08d977c1 Merge fx-team to m-c. 2014-01-30 16:23:01 -05:00
Ryan VanderMeulen
798f843569 [Australis] Backed out changeset da8776bc458e (bug 962677) for mochitest-bc failures. 2014-01-30 14:22:17 -05:00
Gavin Sharp
f73f01be58 Bug 965703: bump string names after string change, r=markh 
--HG--
extra : rebase_source : 967d49f86494a94542b55563cd1440ac25980d29
 2014-01-30 10:22:14 -08:00
Tim Taubert
2fb975c0e5 Bug 965544 - Show "now syncing" doorhanger when sync actually starts, once per login r=markh 2014-01-29 12:41:07 -08:00
Francesco Lodolo (:flod)
b7f4b4c17f Bug 947353 - Use proper plural form for tabs.closeWarningMultipleTabs. r=dao 2014-01-30 13:07:15 -05:00
Drew Willcoxon
1135f0e3c4 Bug 856595 - Fix intermittent failure in test_wheel_default_action.html. r=mikedeboer 2014-01-30 09:20:37 -08:00
Mike Conley
6a24be8ae0 Bug 962677 - [Australis] Use content-deck and toolbar margins for the customize mode transition. r=jaws. 2014-01-30 12:16:19 -05:00
Henri Sivonen
bde9b85e96 Bug 959061 - Have only one "Chinese, Simplified" item in the Character Encoding menu. r=Unfocused. 2014-01-30 14:39:25 +02:00
Tim Taubert
a76ba6ae0d Bug 958026 - Fix intermittent browser_aboutAccounts.js timeouts r=zaach 2014-01-29 06:57:42 -08:00
Zachary Carter
f240275c61 Bug 965605 - Update about:accounts intro page strings to match the latest draft r=markh 2014-01-29 17:11:05 -08:00
Gijs Kruitbosch
06759240a2 Bug 936442 - part 1: refactor CharsetMenu to allow Australis code to use it, r=Unfocused 2014-01-27 11:56:04 +00:00
Gijs Kruitbosch
e3b67052fb Bug 940093 - offer UI option in Australis' customization mode to toggle titlebar, r=jaws 2014-01-29 17:19:23 +00:00
Mark Hammond
a0653cf996 Bug 958927 - XUL dialogs for sync unlink and relink confirmation dialogs. r=gavin 
Conflicts:
	browser/base/content/aboutaccounts/aboutaccounts.js

--HG--
extra : rebase_source : 2c81fe29d3b85eb8174b988cbaff516e71c39358
 2014-01-28 20:43:01 -08:00
Mark Hammond
6212174faa Bug 965016 - about:accounts should always say "Firefox Accounts", not "Nightly Accounts". r=ttaubert 
--HG--
extra : rebase_source : eebff0b5ba1b783fea1bb70fa0b848ac1c7e85e7
 2014-01-28 20:43:01 -08:00
Mike de Boer
7d32f6fc81 [Australis] Bug 963095: adjust toolbar widget panel styling. r=Gijs 2014-01-29 12:20:40 +01:00
Tim Taubert
d66d448167 Bug 964929 - [Australis] Implement doorhanger for sync errors r=gavin 2014-01-28 17:54:36 -08:00
Tim Taubert
5be3ca26a4 Bug 963384 - Implement modal "Choose What To Sync" dialog r=markh 2014-01-28 18:57:19 -08:00
Tim Taubert
2cfdeef353 Bug 963384 - [Australis] Don't show doorhanger when sync customization dialog will be shown r=markh 2014-01-28 18:54:01 -08:00
Zachary Carter
0169afb240 Bug 965024 - Fix legacy Sync URL on about:accounts intro screen. r=markh 2014-01-28 18:19:31 -08:00
Mark Hammond
32a861c076 Bug 959990 - Add Firefox Accounts specific TOS and PP prefs and have utils functions open them if appropriate. r=rnewman. 2014-01-28 17:51:08 -08:00
Bill McCloskey
ec38fdf92d Bug 967876 - [e10s] Don't access docshell from WindowIsClosing (r=dao) 2014-02-04 18:17:16 -08:00
Paolo Amadini
bf88e66889 Bug 942620 - The "quit-application-requested" notification is sent twice when closing the last tab. r=Dao 2014-02-10 15:54:10 -05:00
Bill McCloskey
9b507bfccf Bug 947908 - [e10s] Middle clicking in about:newtab should open a new tab (r=felipe) 2014-02-13 16:04:01 -08:00
Tim Taubert
5be07d68d7 Bug 957460 - [Australis] Add Firefox Accounts widget for customization panel r=gijs,markh 2014-01-10 19:32:11 +01:00
Tim Taubert
de5d44fd6f Bug 957229 - Don't show about:accounts with FxA disabled r=markh 2014-01-28 14:36:00 -08:00
Neil Deakin
9cab3a8fc4 Bug 941409, add support for an anchor attribute to menus so that the popup can be anchored to a different element than the menu itself, this is used to avoid repositioning the bookmarks toolbar button menu, also changes popups to default to vertical orientation [Australis] r=neil,mconley 2014-01-28 11:28:45 -05:00
Ed Morley
e6321baae0 Backed out changeset a4f31914bb0c (bug 957229) for browser_aboutAccounts.js timeouts; CLOSED TREE 2014-01-28 16:09:22 +00:00
Dão Gottwald
51e41d1c11 Bug 962844 - [Australis] urlbar with EV SSL overlaps searchbar in narrow window. r=jaws 
--HG--
extra : rebase_source : 019f32dd55acd325104296c77148b13e1ead5e43
 2014-01-27 17:33:27 +01:00
Tim Taubert
c20d5fafc3 Bug 957229 - Don't show about:accounts with FxA disabled r=markh 2014-01-27 15:17:29 -08:00
Manish Goregaokar
b232e86aa7 Bug 887951 - [Australis] Update panel menu button tooltip; r=dao DONTBUILD because it's just a tooltip string. 2014-01-27 18:23:07 -05:00
Mike Conley
a146de2119 Backed out changeset 39fd448f1994 for bad commit message. 2014-01-27 18:22:37 -05:00
Manish Goregaokar
38aeb4eaa5 Bug 887951 - Update panel menu button tooltip; r=dao DONTBUILD because it's just a tooltip string. 2014-01-27 18:19:03 -05:00
Bhagya
0dd9adbff5 Bug 957922 - aBrowser is null in _setPluginNotificationIcon. r=jaws 2014-01-27 15:34:35 -05:00
Mike Conley
f15f2bbb22 Bug 924050 - [Australis] Make the Downloads button have a correct icon post-indicator-load in the menu panel. r=mikedeboer. 2014-01-27 10:38:34 -05:00
Tim Taubert
580a1c88ad Bug 957436 - [Australis] Follow-up to fix leaks caused by calling uninit() without calling init() before r=bustage 2014-01-25 22:02:18 +01:00
Malintha Fernando
e7230596d0 Bug 953124 - [Australis] Remove the "Open Location" dialog (openLocation.xul). r=dao 2014-01-25 17:12:20 +01:00
Tim Taubert
340720c6ec Bug 957436 - [Australis] Show doorhanger for first fxa-based sync r=markh 2014-01-25 16:19:07 +01:00
Tim Taubert
9484bce121 Bug 962729 - Follow-up fix to fix undefined fxAccounts symbol r=me 2014-01-25 16:36:04 +01:00
Tim Taubert
d387beba5c Bug 960903 - Fix browser_bug817947.js test failure on a CLOSED TREE 
From b68e6edbb3836e79f7dcd6635b0a9327df76c89f Mon Sep 17 00:00:00 2001
 2014-01-24 21:09:47 +01:00
Ryan VanderMeulen
0a359611a1 Merge m-c to inbound. 2014-02-25 15:28:35 -05:00
Anup
009e6f9a4d Bug 921730 - "The plugin is disabled" placeholder cannot be closed. r=jaws 2014-02-25 13:57:42 -05:00
Wes Kocher
c8420570cc Backed out 5 changesets (bug 326743) for m-oth failures 
Backed out changeset d498b3fa8908 (bug 326743)
Backed out changeset 820d24250606 (bug 326743)
Backed out changeset 334ddf5ad1fb (bug 326743)
Backed out changeset becbe15a0b5d (bug 326743)
Backed out changeset dbc693bc48c5 (bug 326743)
 2014-02-20 16:30:26 -08:00
Mike de Boer
ca8b1a605f Bug 326743: update tests to know about the Find Clipboard on OSX. r=Unfocused 2014-02-20 20:49:50 +01:00
Mike de Boer
ca027df520 Bug 326743: use cmd-e to set find-in-page search term to currently selected text. r=Unfocused 2014-02-20 20:49:45 +01:00
Gijs Kruitbosch
56ec7c2bc3 Bug 970321 - Australis' UITour: make menu panel not break if tour tab is opened in new window, r=Unfocused 2014-02-20 22:42:33 +00:00
Dão Gottwald
53076c62bf Bug 965772 - [Australis] search text box changes size when opening a new tab. r=enn 2014-01-30 17:33:39 +01:00
Dão Gottwald
cf2932530f Bug 946395 - [Australis] Back out bug 881937 (panel menu keyboard access). r=Gijs ui-r=phlsa 2014-01-24 15:44:08 +01:00
Zachary Carter
55291b69dd Bug 957425 - make landing pages for sync on about:accounts. r=markh 2014-01-25 00:33:39 +11:00
Tim Taubert
9759dbe42d Bug 962729 - Sync toolbar button and menu item need to open the prefs dialog when logged in r=markh 2014-01-22 20:53:58 +01:00
Cameron McCormack
2cae22ed8a Bug 981370 - Make MousePosTracker use a Set rather than manage an array itself. r=dao 2014-03-11 10:05:29 +11:00
Boris Zbarsky
139c43ef35 Bug 980965. Stop using DOM constructors as functions in chrome code. r=bholley 2014-03-10 17:38:14 -04:00
Bill McCloskey
5a8a2d71fc Bug 862519 - [e10s] Better handling of key commands also handled by content (r=smaug) 2014-03-18 08:16:47 -07:00
Wes Kocher
5a78d43d35 Merge m-c to inbound 2014-03-18 19:48:29 -07:00
Wes Kocher
6a3f60488b Merge fx-team to m-c 2014-03-18 19:44:07 -07:00
Joel Maher
55487541ce Bug 933680 - browser_pluginCrashCommentAndURL.js hangs ubuntu ec2 slaves in conjunction with browser_bug410900.js. r=felipec 2014-03-18 03:41:00 -07:00
Ryan VanderMeulen
90b89ca7c1 Merge m-c to inbound. 2014-02-11 14:58:40 -05:00
Bill McCloskey
817fc83d9d Bug 960783 - Support "new out-of-process window" menu item in nightly (r=felipe,bsmedberg,trevor,ted) 2014-02-11 09:01:08 -08:00
Tom Schuster
a5e93dd067 Bug 947895 - [e10s] Null check browser.docShell in context-menu Open in new tab. r=gavin 2014-02-24 23:10:18 +01:00
Tom Schuster
7f76819a13 Bug 973195 - [e10s] Change Copy Link in context-menu to use JS instead of cmd_copyLink. r=felipe 2014-02-24 23:10:12 +01:00
Mike de Boer
87f712ef11 [Australis] Bug 963085: add header to Subscribe menu. r=Gijs 2014-01-23 17:04:27 +01:00
Matthew Noorenberghe
2785e19c53 Bug 956162 - Implement @flip="none" for popups to allow them to appear off-screen without flipping or resizing. r=Enn 
[Australis]
 2014-01-22 20:09:03 +00:00
Mike de Boer
b072bd765c [Australis] Bug 878546: refresh the styling of sub-views. r=Gijs 2014-01-23 14:06:17 +01:00
Tim Taubert
079f8fe835 Bug 957421 - Keep FxA pref names consistent r=markh,rnewman,nalexander 2014-01-21 14:13:45 +01:00
Florian Quèze
c3a1c7ce25 Bug 958071 - PopupNotification consumers should have a way to replace the "Not Now" item, r=dolske. 2014-01-23 11:48:33 +01:00
Carsten "Tomcat" Book
cd9d04e1a2 merge fx-team to mozilla-central 2014-01-23 10:19:26 +01:00
Wes Kocher
68f3b8b40d Backed out 2 changesets (bug 956162) for m-oth failures on a CLOSED TREE 
Backed out changeset 026dc3ee0654 (bug 956162)
Backed out changeset 0a7e5eeafed6 (bug 956162)
 2014-01-22 14:23:57 -08:00
Blake Winton
b44c186e2a Bug 925681 - Show identity block and reload icon in awesomebar in Australis' customization mode. ui-r=shorlander, r=Gijs 
--HG--
extra : rebase_source : 10b62db55227e317a1bd5c45914619e2f75c94b6
 2014-01-22 20:12:22 +00:00
Matthew Noorenberghe
ca1bc3e84b Bug 956162 - Implement @flip="none" for popups to allow them to appear off-screen without flipping or resizing. r=Enn 
--HG--
extra : rebase_source : f5ddca505eb8a3b234718df1ae01c9a49a02a361
 2014-01-22 20:09:03 +00:00
Ryan VanderMeulen
dc73bab6f5 Merge m-c to inbound. 2014-01-22 15:55:49 -05:00
Bill McCloskey
5ec2160ccd Bug 938904 - [e10s] Make tooltips work (r=smaug,enn) 2014-01-22 12:27:23 -08:00
Mike de Boer
4af8d9e398 [Australis] Bug 916953: Bookmarks star button caption in overflow panel follow-up no. 2. r=Gijs 2014-01-22 17:50:45 +01:00
Matteo Ferretti
cf80e27d9a Bug 882910 - "Australis - toolbarbutton's icon doesn't have a max height", r=gijs 
--HG--
extra : rebase_source : 225827f1288780e1db00c2c16b4e0f0490e844ec
 2014-01-22 07:40:00 +00:00
Mike de Boer
5faf7d61b4 [Australis] Bug 916953: Bookmarks star button caption in overflow panel follow-up. r=Gijs 2014-01-22 15:22:07 +01:00
Gijs Kruitbosch
de3084f069 Bug 944947 - update bookmarks toolbar button styling some more for Australis, r=jaws 2014-01-18 01:43:21 +01:00
Mike de Boer
f1287248e6 [Australis] Bug 916953: introduce separator in overflow panel buttons and bookmark star button gets different label when inside overflow panel. r=Gijs 2014-01-22 13:31:09 +01:00
Marco Bonardo
ad3becb5b2 Bug 958413 - [Australis] Bookmarks menu button dropdown icon has the wrong aspect ratio when placed in the Bookmarks Toolbar. r=Gijs 2014-01-22 10:42:51 +01:00
Wes Kocher
a28ac0737a Merge fx-team to m-c 2014-01-21 17:27:53 -08:00
Bill McCloskey
60070765ab Bug 961868 - [e10s] Fix pinned tabs (r=felipe) 2014-01-21 09:53:37 -08:00
Bill McCloskey
7a7373a94b Bug 961863 - [e10s] Update browser remoteness attribute when restoring a tab (r=ttaubert,felipe) 2014-01-21 09:53:33 -08:00
Gijs Kruitbosch
040e5a8926 Bug 941109 - use closemenu instead of noautoclose attribute in Australis menupanel, r=mconley 
--HG--
extra : rebase_source : 89c32805249cebe4c29e135b1d27b7679eb1fbd8
 2014-01-21 19:01:16 +00:00
Bill McCloskey
7a5055ecd6 Bug 959531 - More about:home testing (r=felipe) 2014-01-20 15:13:35 -08:00
Mike de Boer
646f92aec2 [Australis] Bug 956285: update zoom controls percentage label upon navigation. r=Gijs 2014-01-20 11:25:00 +01:00
AK
f8cdc97bed Bug 960997 - Change the DOMWebNotificationClicked handler to use window.focus() instead of focusManager.activeWindow = window. r=dao 2014-01-18 14:30:56 +01:00
Gijs Kruitbosch
4b29623e1d Bug 889120 - Australis' customize tab gets mixed up with other tab, r=jaws 2014-01-10 15:54:48 +00:00
Tim Taubert
615bf488a0 Bug 961016 - Fix icon and label for pending tabs with async restore r=billm,dao 
From 6028548aa44e6d289c0fb5e756a4004451ea882b Mon Sep 17 00:00:00 2001
 2014-01-17 17:17:14 +01:00
Tom Schuster
85fab7a62f Bug 691614 - Make content zooming work with e10s Firefox. r=felipe 2014-01-13 18:36:26 +01:00
Ryan VanderMeulen
7bb3418dbe [Australis] Backed out changesets 7c74e99d80c1 and 14e817fe25e1 (bug 956285) for mochitest-bc failures. 2014-01-17 10:30:28 -05:00
Drew Willcoxon
37c9ef9b1c Bug 960941 - Base gBrowserThumbnails's expiration filter on top sites, not open pages. r=markh 2014-01-17 14:57:04 +01:00
Mike de Boer
e7eb71857f [Australis] Bug 956285: update zoom controls percentage label upon navigation. r=Gijs 2014-01-17 14:04:15 +01:00
Jared Wein
8c388c3825 Bug 960045 - [Australis] Bottom-left corner on the customize button in the menu panel should have a rounded corner. r=gijs DONTBUILD 2014-01-17 13:38:09 +01:00
Jared Wein
79f4dc6e34 Backed out changeset a2da63ec58c7 (bug 960045) for bad commit message. 2014-01-17 14:05:51 +01:00
Jared Wein
867d82bd44 Bug 960045 - Bottom-left corner on the customize button in the menu panel should have a rounded corner. r=gijs 2014-01-17 13:38:09 +01:00
Gijs Kruitbosch
ae1d887aaa Bug 940669 - add button menu to toggle toolbars in Australis' customize mode, r=mconley 
--HG--
extra : rebase_source : 096d92876f4827251fd534f7ea76b8dbfd81a691
 2013-11-21 22:59:49 +01:00
Jared Wein
cc4ebd5f1e Bug 853972 - Clicking on a notification should select the originating tab. r=felipe,wchen 
--HG--
extra : rebase_source : e8f794ff0e474d669489eff7e82b3b0eccf4db0e
 2014-01-13 13:56:28 +01:00
Carsten "Tomcat" Book
364671235d Backed out changeset d614fa6b53b2 (bug 889120) [australis] for suspicion of pgo perma-orange 2014-01-16 09:44:49 +01:00
Ryan VanderMeulen
b6f0a2657c Merge inbound to m-c. 2014-01-15 14:34:05 -05:00
Gijs Kruitbosch
2c8aa5cfd7 Bug 889120 - Australis' customize tab gets mixed up with other tab, r=jaws 
--HG--
extra : rebase_source : 12ef7ad03ece347dccd1e193a24e4e74b7b20b82
 2014-01-10 15:54:48 +00:00
Dão Gottwald
0661fdb510 Bug 827084 - A tab being moved to a different window shouldn't prevent the page from opening dialogs. r=enndeakin 2014-01-15 15:53:20 +01:00
Blair McBride
b79077d551 Bug 935815 - [Australis] UITour: Allow adding a button with an action to the info panel. r=MattN 2014-01-06 12:27:25 +13:00
Wes Kocher
7c7e7a16a2 Merge m-c to fx-team 2014-01-14 16:15:24 -08:00
Wes Kocher
4feb8dd8e3 Merge b2g-inbound to m-c 2014-01-14 15:44:06 -08:00
Wes Kocher
ac83e0314a Merge inbound to m-c 2014-01-14 15:24:45 -08:00
Ed Morley
f14299e3f3 Backed out changeset 194dc8f8f9fe (bug 947535) since the socialapi tests appear to rely on each other :-/ 
CLOSED TREE
 2014-01-14 19:18:14 +00:00
Ed Morley
8b9747eb92 Bug 951680 - Disable browser_alltabslistener.js on Linux for intermittent failures 2014-01-14 16:39:04 +00:00
Ed Morley
f0d3e575d1 Bug 947535 - Disable social/browser_blocklist.js for intermittent failures 2014-01-14 16:39:03 +00:00
Ed Morley
1625ea613f Bug 925225 - Disable browser_bug676619.js on OS X for intermittent failures 2014-01-14 16:39:03 +00:00
Ed Morley
ab80d8427c Bug 917535 - Disable browser_locationBarCommand.js on Linux for intermittent failures 2014-01-14 16:38:26 +00:00
Ed Morley
6881be49b6 Bug 898317 - Disable browser_newtab_bug735987.js on OS X for intermittent failures 2014-01-14 16:38:26 +00:00
Florian Quèze
75672b073a Bug 911981 - Chat panels are lost while detaching/attaching, r=mixedpuppy. 2014-01-14 23:08:20 +01:00
Gijs Kruitbosch
cc0f3db794 Bug 941211 - use px sizes for Australis' panel/palette icons, and incorporate into height, r=jaws 2014-01-09 16:22:10 +00:00
Sachin Hosmani
4ce169f118 Bug 897735 - Support regular expression filters for name and creator in extension blocks. r=Unfocused 
CLOSED TREE
 2014-01-06 14:16:32 +05:30
Ryan VanderMeulen
9d42f4f467 Backed out changeset 933bf791b773 (bug 897735) for Windows test bustage. 
CLOSED TREE
 2014-01-14 11:10:33 -05:00
Sachin Hosmani
b4de6399fb Bug 897735 - Support regular expression filters for name and creator in extension blocks. r=Unfocused 2014-01-06 14:16:32 +05:30
Dão Gottwald
12a409a8c3 Bug 951928 - [Australis] Reduce the browser window's minimum size. r=jaws 2014-01-14 09:12:49 +01:00
Ryan VanderMeulen
321303479c Backed out changesets e8b0b4daa733 and d89066cb6f59 (bug 853972) for mochitest-bc timeouts. 2014-01-13 11:37:19 -05:00
Matthew Noorenberghe
78299a5c49 Bug 937415 - UITour: Add ability to highlight the selected tab's icon in Australis. r=Unfocused 2014-01-13 16:28:18 +01:00
Jared Wein
579b708209 Bug 853972 - Followup, add a return in the case that alertWindow is null. r=me 
--HG--
extra : rebase_source : bc17b22e1764e72904df6bc4c482b6d238d7f589
 2014-01-13 15:46:23 +01:00
Jared Wein
9b861c3cac Bug 853972 - Clicking on a notification should select the originating tab. r=felipe,wchen 
--HG--
extra : rebase_source : bfbf92b91d7562404b54b87f25f879881be7643a
 2014-01-13 13:56:28 +01:00
Fernando Jiménez
9158242d47 Bug 958546 - s/isVerified/verified in all FxAccounts related code. r=markh 2014-01-14 17:00:36 +01:00
Carsten "Tomcat" Book
71fdbc4f4e Merge mozilla-central to mozilla-inbound 2014-01-14 16:11:37 +01:00
Ehsan Akhgari
16d1db5d25 Bug 958985 - Fix the variable names (pushed the wrong patch) 2014-01-14 08:44:11 -05:00
Ehsan Akhgari
e2344d6399 Bug 958985 - Make isBidiEnabled check the intl.uidirection.<locale> pref; r=smontagu 2014-01-14 08:41:41 -05:00
Christian Legnitto
170d2cae88 Bug 935377 - Firefox should fix common scheme typos, r=dolske 2014-01-12 12:02:27 -08:00
Francois Marier
6de9b02415 Bug 948881 - Remove inline JavaScript in body events. r=ttaubert 2014-01-15 09:50:04 -05:00
Majda Nafissa Rahal
a8993d4cc3 Bug 884355 - Warn about closing multiple tabs when "Never remember history" is enabled" r=gavin 2013-06-23 05:03:00 -04:00
Trevor Saunders
64d5d5a8ed bug 331376 - merge nsIDocShellTreeNode into nsIDocShellTreeItem r=smaug 2014-01-06 17:34:15 -05:00
Ryan VanderMeulen
3b526ca45c Merge inbound to m-c. 2014-01-10 14:46:40 -05:00
Shane Caraveo
0f07b0df73 bug 935773 Australis fix mark icon on windows, r=gijs 2014-01-09 15:49:08 -08:00
Gijs Kruitbosch
3dc0d4bc52 Backed out Australis changeset 5e2752c9cf2b (bug 941211) which totally shouldn't have made it into the tree, rs=stupid-me 2014-01-09 22:15:37 +00:00
Gijs Kruitbosch
c5aa6552b3 Bug 941211 - use px sizes for Australis' panel/palette icons, and incorporate into height, r?jaws 
--HG--
extra : rebase_source : 5b2253ada8f70032bc31f5416a8f94d45b07416c
 2014-01-09 16:22:10 +00:00
Drew Willcoxon
92707ba130 Bug 809056 - Reduce thumbnailing impact by capturing and storing only top sites. r=markh 2014-01-07 12:59:18 -08:00
Patrick Brosset
86bb72d38c Bug 916443 - part 1 - Toolbox level remote highlighter [Australis], r=paul 2014-01-09 12:36:01 +01:00
Wes Kocher
834297bc12 Backed out changeset f552ce04bc36 (bug 809056) for m-bc orange 2014-01-08 22:02:28 -08:00
Drew Willcoxon
25458bec50 Bug 809056 - Reduce thumbnailing impact by capturing and storing only top sites. r=markh 2014-01-07 12:59:18 -08:00
Steven MacLeod
c0902ae1b2 Bug 945667 - Disable failing portion of browser_aboutHome.js and enable the dependent tests. r=gavin 2014-01-08 15:58:47 -05:00
Olli Pettay
e0b9b7d268 Bug 857427 - Try to load the page again if not yet loaded. r=ehsan 2014-01-10 10:20:09 -05:00
Carsten "Tomcat" Book
c5a86da212 Merge mozilla-central to mozilla-inbound 2014-01-08 13:25:28 +01:00
Shane Caraveo
b8082a6ce6 bug 956910 Australis fix gear icon in social sidebar for win/lin, r=markh 2014-01-07 16:06:56 -08:00
Shane Caraveo
f6573ce268 bug 956956 fix permissions anchor for social sidebar, r=markh 2014-01-07 15:40:46 -08:00
Wes Kocher
c3fd1d2c74 Backed out changeset 194f941f2064 (bug 809056) for mochitest-bc bustage 2014-01-07 14:53:04 -08:00
Ryan VanderMeulen
9f2392fe97 Merge m-c to fx-team. 2014-01-07 16:31:30 -05:00
Drew Willcoxon
5814ec2ee9 Bug 809056 - Reduce thumbnailing impact by capturing and storing only top sites. r=markh 2014-01-07 12:59:18 -08:00
Tomer Cohen
2f2f12e30f Bug 744659 - [about:home][rtl] Use dir=auto in search box to change direction if query is RTL, r=ehsan 2014-01-07 23:36:39 -08:00
Carsten "Tomcat" Book
5f3c6322a2 Backed out australis changeset 5a8d6a009942 (bug 935815) for frequent oranges on a CLOSED TREE 2014-01-07 09:35:50 +01:00
Ed Morley
f2c3dd2277 Merge latest green inbound changeset and mozilla-central 2014-01-06 12:51:38 +00:00
Neil Rashbrook
925b28d422 Bug 940907 Re-introduce the Character Encoding menu to the View Source window r=Unfocused 
--HG--
rename : browser/locales/en-US/chrome/browser/charsetMenu.dtd => toolkit/locales/en-US/chrome/global/charsetMenu.dtd
rename : browser/locales/en-US/chrome/browser/charsetMenu.properties => toolkit/locales/en-US/chrome/global/charsetMenu.properties
rename : browser/modules/CharsetMenu.jsm => toolkit/modules/CharsetMenu.jsm
 2014-01-06 08:44:19 +00:00
Mark Hammond
9dd1bdde86 Bug 907689 - use example.org as the blocklist URL. r=mixedpuppy 2014-01-06 14:19:09 +11:00
Blair McBride
58643e2ab2 Bug 935815 - [Australis] UITour: Allow adding a button with an action to the info panel. r=MattN 2014-01-06 12:27:25 +13:00
Jared Wein
fdfb165666 Bug 946320 - [Australis] history widget missing a "Tabs From Other Devices" entry. r=Gijs 2014-01-03 14:57:19 -05:00
Francesco Lodolo (:flod)
a3faf5ace7 Bug 952742 - [Australis] "Move to menu" label is using the wrong entity for accesskey; r=dolske 2014-01-03 15:04:56 +01:00
Georg Fritzsche
6c81e90760 Bug 950435 - Move click-to-play notification bar tests out of browser_pluginnotification.js. r=jaws 
--HG--
rename : browser/base/content/test/general/browser_CTP_hideBar.js => browser/base/content/test/general/browser_CTP_notificationBar.js
 2013-12-20 14:20:32 +01:00
Jared Wein
e3579754fe Bug 940107 - [Australis] Home icon not shown when moved to Bookmarks toolbar, only text. r=mconley 
--HG--
extra : rebase_source : 0514eeda6abfc319d6316898a65bcb99c287ff6e
 2014-01-02 15:32:09 -05:00
Magnus Melin
03cb911e3d Bug 331772 - tooltiptext fails on XUL button in HTML page. r=enndeakin 2013-12-18 22:44:34 +02:00
Wes Kocher
70babb0726 Merge m-c to inbound 2013-12-24 15:25:23 -08:00
Georgiana Chelu
6956ed9628 Bug 948889 - Move the inline script in aboutTabCrashed.xhtml into a separate file; r=ttaubert 2013-12-24 15:32:55 +01:00
Emma Sajic
6dbf20feee Bug 387849 - [Australis] Remove the "Open Location..." menu item as it's no longer needed. The Location bar is now not removable so it will always be present. Hence no need for a menu item that does the same thing as the bar. r=dao 2013-12-23 11:27:16 +01:00
Jared Wein
80055144a3 Bug 940052 - [Australis] Customize tab gets truncated after entering customization mode. r=mconley 2013-12-21 01:17:02 -05:00
Tim Taubert
c5ecbf72a9 merge m-c to elm 2013-12-20 15:05:28 +01:00
Tim Taubert
6f4002d450 merge m-c to elm 2013-12-19 15:52:32 +01:00
Mark Hammond
c8e0341c3c Have the sync setup dialog do the right thing if identity.fxaccounts.enabled=true 2013-12-19 16:38:35 +11:00
Tim Taubert
9f685f4d29 Bug 951857 - Bring back UI entry points and the setup dialog for old sync r=markh 
From 046c19dae155a175cf6fa5e480f1fa1882f7d51f Mon Sep 17 00:00:00 2001
 2013-12-18 23:10:11 +01:00
Tim Taubert
46e29d4462 merge m-c to elm 2013-12-18 17:54:23 +01:00
Brian Warner
aca417b105 Leave the fxa jelly up after signin/signup. r=ckarlof 
The UX is still pretty bad, but this is marginally better, because
the instructions to "go check your email" remain on the screen.
Related to Bug 949699.
 2013-12-17 17:59:55 -08:00
Wes Kocher
e365f41e60 merge inbound to m-c 2013-12-17 21:00:02 -08:00
Nick Alexander
bd12407b3a Merge m-c to elm 2013-12-17 13:31:03 -08:00
Ryan VanderMeulen
b9ea898a47 Merge m-c to fx-team. 2013-12-17 16:23:55 -05:00
Justin Dolske
76814b4c2f Bug 951364 - [Australis] button context menu should offer to "move", not "add". r=jaws 2013-12-17 13:21:37 -08:00
Brian Warner
51e317799a Bug 949699 - switch fxa jelly to "moar_native". 2013-12-17 15:45:03 +11:00
Mark Hammond
807f960170 Get browser-aboutAccounts test working. 2013-12-17 15:45:02 +11:00
Ryan VanderMeulen
0e2134394f Bug 945667 - Disable browser_aboutHome.js on Linux due to intermittent failures. 
--HG--
extra : rebase_source : 3c51923054c83821feeff9a81e265409ace454d8
 2013-12-17 16:25:48 -05:00
Justin Dolske
1f02646fea Bug 946549 - Remove dead code obsoleted by bug 355063 for filling passwords on load. r=MattN 2013-12-16 13:27:47 -08:00
Jared Wein
32e7a01ddf Bug 950014 - [Australis] Ctrl-K no longer goes to home page of default search engine (when search toolbar hidden). r=mconley,gijs 
--HG--
extra : rebase_source : 011ff25a2a6ed81e93c45f041ead35d5cf2be82b
 2013-12-17 13:45:00 -05:00
Gijs Kruitbosch
ac7ba8c9b9 Bug 700363 - [Australis] Hide conditional forward button permanently when not in use to prevent accidental glitches. r=Unfocused,jaws 
--HG--
extra : rebase_source : 981cf692f5e7df0b4dc59a4eb926915363de1fec
 2013-12-17 13:43:50 -05:00