Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-02 07:05:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
450,374 Commits 615 Branches 98 Tags 6 GiB
7ab71ac771
Commit Graph

11972 Commits

Author SHA1 Message Date
Mark Banner
64c4ac3fcb Bug 1210865 - Update OpenTok library to version 2.6.8. rs=dmose 2015-10-30 08:39:31 +00:00
Mark Hammond
c3e774bb32 Bug 1199354 - add link to Firefox for iOS and fix link to Firefox for Android on Sync prefs pane. r=adw 2015-10-30 11:35:28 +11:00
Dan Mosedale
21d148248c Bug 1215322 - remove need for CSP unsafe-eval in Hello, r=Mardak 2015-10-29 15:56:48 -07:00
Gijs Kruitbosch
04b6f41448 Bug 1219707 - fix argument passing to migration.js, r=jaws 
--HG--
extra : commitid : 8GHFDaUhXA2
 2015-10-29 12:16:15 +00:00
Kit Cambridge
329da183e8 Bug 1216271 - Display a notification upon upgrade for users who currently allow notifications for at least one site. r=MattN 
--HG--
extra : commitid : CWjXajeZ0p0
extra : rebase_source : a8d46c86b13dcafe129a4cb2f8bc8aff1dca308f
 2015-10-29 08:42:01 -07:00
Matthew Noorenberghe
2ce30f58be Bug 1218908 - Add 'Learn more' link with notification preferences. r=jaws 
--HG--
extra : commitid : KCxdtIcqmfp
extra : rebase_source : 155ea1856e7d0758a6e582d4ac766554e20a8c1b
 2015-10-29 01:47:40 -07:00
Carsten "Tomcat" Book
1ee391eb20 Merge m-c to mozilla-inbound on a CLOSED TREE 2015-10-21 15:34:18 +02:00
Christoph Kerschbaumer
eee83aa5d8 Bug 1204983 - Deprecate NewTabURL and forward calls to AboutNewTabService (r=florian,olivier) 
--HG--
rename : browser/components/newtab/tests/xpcshell/test_NewTabURL.js => browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js
 2015-10-20 18:51:25 -07:00
Christoph Kerschbaumer
33fa277605 Bug 1204983 - Allow about: pages to load remote content (r=bholley,bz,florian,dragana) 2015-10-09 22:03:27 -07:00
Luca Greco
6884827a14 Bug 1213975 - fix WebExtension tabs.onUpdated cleanup on context close. r=billm 2015-10-26 04:56:00 +01:00
Luca Greco
4cc21e67d9 Bug 1213975 - filter out from WebExtension tabs.onUpdated events any location changes related to iframes. r=billm 2015-10-26 04:55:00 +01:00
Luca Greco
a9764f9ff5 Bug 1213975 - add WebExtension tabs.onUpdated test case. r=billm 2015-10-26 04:54:00 +01:00
Luca Greco
8a4dea3875 Bug 1213975 - WebExtension tab update events about location url change should contain status info. r=billm 2015-10-26 04:54:00 +01:00
Manuel Casas
9d22ecef65 Bug 1205684 - Video Window height pushes down context and covers a part of it. r=mikedeboer 2015-10-26 04:45:00 +01:00
Luca Greco
71224bbe04 Bug 1214040 - WebExtension tabs.sendMessage should not raise an exception on unexistent tabId. r=billm 2015-10-16 03:31:00 -04:00
Nathan Froyd
01583602a9 Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat 
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout.  The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.

CLOSED TREE makes big refactorings like this a piece of cake.

 # The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
    xargs perl -p -i -e '
 s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
 s/nsRefPtr ?</RefPtr</g;   # handle declarations and variables
'

 # Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h

 # Handle nsRefPtr.h itself, a couple places that define constructors
 # from nsRefPtr, and code generators specially.  We do this here, rather
 # than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
 # things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
     mfbt/nsRefPtr.h \
     xpcom/glue/nsCOMPtr.h \
     xpcom/base/OwningNonNull.h \
     ipc/ipdl/ipdl/lower.py \
     ipc/ipdl/ipdl/builtin.py \
     dom/bindings/Codegen.py \
     python/lldbutils/lldbutils/utils.py

 # In our indiscriminate substitution above, we renamed
 # nsRefPtrGetterAddRefs, the class behind getter_AddRefs.  Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
    xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'

if [ -d .git ]; then
    git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
    hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi

--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
 2015-10-18 01:24:48 -04:00
Nathan Froyd
583afa0965 Bug 1207245 - part 3 - switch all uses of mozilla::RefPtr<T> to nsRefPtr<T>; r=ehsan 
This commit was generated using the following script, executed at the
top level of a typical source code checkout.

 # Don't modify select files in mfbt/ because it's not worth trying to
 # tease out the dependencies currently.
 #
 # Don't modify anything in media/gmp-clearkey/0.1/ because those files
 # use their own RefPtr, defined in their own RefCounted.h.
find . -name '*.cpp' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
    grep -v 'mfbt/RefPtr.h' | \
    grep -v 'mfbt/nsRefPtr.h' | \
    grep -v 'mfbt/RefCounted.h' | \
    grep -v 'media/gmp-clearkey/0.1/' | \
    xargs perl -p -i -e '
 s/mozilla::RefPtr/nsRefPtr/g; # handle declarations in headers
 s/\bRefPtr</nsRefPtr</g; # handle local variables in functions
 s#mozilla/RefPtr.h#mozilla/nsRefPtr.h#; # handle #includes
 s#mfbt/RefPtr.h#mfbt/nsRefPtr.h#;       # handle strange #includes
'

 # |using mozilla::RefPtr;| is OK; |using nsRefPtr;| is invalid syntax.
find . -name '*.cpp' -o -name '*.mm' | xargs sed -i -e '/using nsRefPtr/d'

 # RefPtr.h used |byRef| for dealing with COM-style outparams.
 # nsRefPtr.h uses |getter_AddRefs|.
 # Fixup that mismatch.
find . -name '*.cpp' -o -name '*.h'| \
    xargs perl -p -i -e 's/byRef/getter_AddRefs/g'
 2015-10-18 00:40:10 -04:00
Chris Rafuse
1920e94a4f Bug 1212079 - Removed contact scripts from index, r=dmose 2015-10-16 11:03:20 -07:00
Manuel Casas
d55d4faa86 Bug 1131542 - Loop button on toolbar needs different tooltips to explain colours/state. r=Standard8 2015-10-16 17:06:48 +01:00
Mark Banner
559e525ffd Bug 1210774 - Upgrade Loop's use of eslint (to 1.6.x) and eslint-plugin-react (to 3.5.x). r=Mardak NPOTB DONTBUILD 2015-10-16 10:31:06 +01:00
David Critchley
f5f9ce8253 Bug 1209686 - Remove Standalone header from Loop, r=mardak 2015-10-13 12:18:00 +02:00
Matthew Noorenberghe
5c48ecabc8 Bug 1209140 - Open a second firstrun tab for Tracking Protection promotion. r=jaws 
--HG--
extra : commitid : 18Jp0NB0RWc
 2015-10-15 13:44:18 -07:00
Mark Banner
3539ee9023 Bug 1213855 - Remove direct call functionality from Loop's backend. r=mikedeboer 2015-10-15 19:13:08 +01:00
Mark Banner
e0db1b6b03 Bug 1213810 - Remove obsolete actions previously associated with direct calls. r=mikedeboer 2015-10-15 19:13:07 +01:00
Ed Lee
178ba2f16a Bug 1212361 - Re-arrange panel layout for user journey (put the button above the room list) [r=Standard8] 2015-10-12 23:56:23 -07:00
Alexandre Poirot
89cb263b54 Bug 1204812 - Keep Console.jsm in toolkit/modules/ r=jryans,Mossop 
--HG--
rename : devtools/shared/Console.jsm => toolkit/modules/Console.jsm
 2015-10-15 03:45:22 -07:00
Manuel Casas
e60145f89b Bug 1212340 - Move the Leave feedback option from the conversation window settings menu to the panel settings menu. r=Standard8 2015-10-15 11:42:22 +01:00
Chris Rafuse
8910f19666 Bug 1209589 - Collect Google Analytics data for users on IE 10 & 11. r=Standard8 2015-10-15 11:42:21 +01:00
Carsten "Tomcat" Book
9e9666b762 merge mozilla-inbound to mozilla-central a=merge 2015-10-15 11:52:40 +02:00
Fabrice Desré
19f432d5e2 Bug 1214021 - Move ext-bookmarks to browser/ r=billm 
--HG--
rename : toolkit/components/extensions/ext-bookmarks.js => browser/components/extensions/ext-bookmarks.js
 2015-10-14 16:31:08 -07:00
Wes Kocher
d0b3e3dc72 Merge fx-team to central, a=merge 2015-10-14 14:39:58 -07:00
Marco Bonardo
c647f9c6b1 Bug 1190350 - Bookmarks sidebar displays regular folder icons for livemarks. r=gijs 2015-10-14 18:49:23 +02:00
Carsten "Tomcat" Book
98f32fc965 Merge m-c to mozilla-inbound on a CLOSED TREE 
--HG--
extra : amend_source : a6131d577ad4418e278e9558a2845458ec0e8dc3
 2015-10-14 16:20:56 +02:00
Panos Astithas
ed7b202323 Switching the TP list should trigger a list download on next startup (bug 1214454). r=gcp 2015-10-14 14:47:36 +03:00
Carsten "Tomcat" Book
6ffd4fc09b Merge m-c to mozilla-inbound 2015-10-14 12:47:31 +02:00
Felipe Gomes
c56d3c0a1c Bug 1214052 - Remove unnecessary files from the pre-processing list. r=glandium 2015-10-13 23:50:30 -03:00
Jared Wein
b979c2d6f3 Bug 1209999 - Update string for push notification doorhanger. 2015-10-14 11:26:33 +05:30
Gijs Kruitbosch
e84c2d42a3 Bug 1207641 - keep panel open when moving items to toolbar / to palette, r=MattN 
--HG--
extra : commitid : 3o1vUEeqkKN
extra : rebase_source : d4999864661914c467e37c71f3a64a41620973bf
 2015-10-13 13:46:14 +01:00
Drew Willcoxon
dd9fbc4c71 Bug 1207246 - Add a test for creating a bookmark using the bookmark properties dialog. r=mak 2015-10-13 08:48:58 -07:00
M Hamdy
67d215f8de Bug 606655 - delete cookies UI option AskMeEveryTime and its related comments and tests. r=mak 
--HG--
extra : rebase_source : 242a074db54395e4b285110286e7692f26b57daa
 2015-10-08 09:13:00 +02:00
Manuel Casas
0a27b3ef18 Bug 1212331 - Remove the Let's talk about context addition options from the Loop panel. r=Standard8 2015-10-13 12:27:48 +01:00
Manuel Casas
ce20cdeb29 Bug 1212338 - Move the user's "availability" option to the settings menu as a "turn notifications on/off" in the Loop panel. r=Standard8 2015-10-13 12:27:48 +01:00
Carsten "Tomcat" Book
2803b80084 Merge m-c to fx-team 2015-10-13 12:43:53 +02:00
Bill McCloskey
31df91c1aa Bug 1202897 - Switch all WebExtension tests to use generated zip files rather than files (r=gabor) 2015-10-12 16:19:50 -07:00
Matthew Turnbull
e8fcc4d761 Bug 1213620 - Expose DownloadsButton to the global scope for addon-compat. r=gijs 2015-10-11 14:35:00 +02:00
Wes Kocher
78f3a19dd3 Merge m-c to inbound, a=merge 2015-10-14 15:00:43 -07:00
Ehsan Akhgari
bf33ea16ea Bug 1211314 - Use tab.toggleMuteAudio() from sessionstore instead of setting the muted attribute manually on the tab; r=jaws 2015-10-14 17:21:05 -04:00
Carsten "Tomcat" Book
a5c0ea6d4f Merge m-c to mozilla-inbound 2015-10-12 11:58:46 +02:00
Carsten "Tomcat" Book
2b1a321946 merge mozilla-inbound to mozilla-central a=merge 2015-10-12 11:57:06 +02:00
Olivier Yiptong
6702393c68 Bug 1213078 - PlacesProvider.jsm module for remote new tab page r=emtwo 
--HG--
extra : commitid : AfwNw7xKSSA
 2015-10-12 01:29:57 -04:00
Olivier Yiptong
00ae264ba9 Bug 1210936 - Remote New Tab Content Frame and AboutRedirector location r=mconley 
--HG--
extra : commitid : 8hNPe5ieQyY
 2015-10-12 01:29:32 -04:00
Olivier Yiptong
f0c297a16d Bug 1210940 - New Browser Component: Newtab r=Mardak 
--HG--
extra : commitid : Dnaq9WxbL5V
 2015-10-12 01:29:12 -04:00
Hassen ben tanfous
45492f28fb Bug 1074804 - Replace arrays .indexOf with .includes in Places. r=mak 2015-10-11 20:24:32 +02:00
Fabian Furger
b0b92ed59f Bug 1147822 - Add a format version number for sessionstore.js. r=Yoric 2015-10-11 20:24:32 +02:00
Chris Rafuse
85db519b95 Bug 1201308 - Leave / Exit conversation button always present, r=dmose 2015-10-09 14:51:35 -07:00
Vladan Djeric
ae0382b6f1 Backed out changeset 578fbd8d8b3c (bug 1179961) for Talos regressions (bug 1213364) 2015-10-10 23:54:48 -04:00
Wes Kocher
95cce1f2c9 Merge m-c to inbound, a=merge 2015-10-09 16:45:31 -07:00
Wes Kocher
7c738dee7a Backed out changeset 5f6375754b86 (bug 1210940) for xpcshell and m-e10s(bc4) bustage CLOSED TREE 2015-10-09 16:42:50 -07:00
Wes Kocher
518ef8e3c4 Backed out changeset bfab6a14cac8 (bug 1210936) 2015-10-09 16:42:37 -07:00
Wes Kocher
fb755f24c8 Backed out changeset 1d6d4011acc3 (bug 1213078) 2015-10-09 16:42:22 -07:00
Olivier Yiptong
4afadf8395 Bug 1213078 - PlacesProvider.jsm module for remote new tab page r=emtwo 
--HG--
extra : commitid : 4SGgj8rZN5F
 2015-10-09 17:16:10 -04:00
Boris Zbarsky
a63708d836 Bug 1212360. Split up the MozStorageChanged event into separate events for sessionstorage and localstorage. r=khuey 2015-10-09 16:48:10 -04:00
Olivier Yiptong
5634b62e5d Bug 1210936 - Remote New Tab Content Frame and AboutRedirector location r=mconley 
--HG--
extra : commitid : 5I9gHJn4LxX
 2015-10-09 16:39:43 -04:00
Olivier Yiptong
be3bd61d57 Bug 1210940 - New Browser Component: Newtab r=Mardak 
--HG--
extra : commitid : Il6Y1bicn26
 2015-10-09 16:39:19 -04:00
Mark Banner
4231bf31f5 Bug 1212083 - Part 2. Remove the unused files previously associated with direct calls. r=mikedeboer 2015-10-09 12:14:44 +01:00
Mark Banner
5959ef0599 Bug 1212083 - Part 1. Remove the direct calls UI from Loop. r=mikedeboer 2015-10-09 12:14:44 +01:00
Mark Banner
19d46cae06 Bug 1213213 - run-all-loop-tests.sh isn't catching all mochitest failures. r=mikedeboer 2015-10-09 12:14:44 +01:00
Gijs Kruitbosch
8711a22bcd Bug 1194692 - fix some cookie parsing issues in the IE/Edge cookie importer code, r=MattN 
--HG--
extra : commitid : 4VQBejjASGM
extra : rebase_source : 56404c6714d1fd58aaf70e9f5b642f7ebb219e24
extra : amend_source : f590924ba11139f59cce73384026ce2a50d9702c
 2015-09-28 22:30:20 +01:00
Gijs Kruitbosch
2352be03b3 Bug 1212297 - improve error handling in Chrome bookmarks migration code, r=MattN 
--HG--
extra : commitid : BEgGX9o3KPB
extra : rebase_source : e6c4de4e72db8aab771864d453409b02cdcc067e
 2015-10-07 13:24:50 +01:00
Wes Kocher
e046a644c8 Merge m-c to fx-team, a=merge 2015-10-08 14:36:57 -07:00
Wes Kocher
23e71e7990 Merge inbound to central, a=merge 2015-10-08 14:29:04 -07:00
Mark Banner
484a185c31 Bug 1212787 - Revert Loop's conversation toolbar button sizes due to bug 1209632 causing a visual regression. r=dmose 2015-10-08 21:25:19 +01:00
Mark Banner
ae5c215b52 Follow-up to bug 1212272 - use the correct cp command. r=dmose 2015-10-08 21:25:19 +01:00
J. Ryan Stinnett
408cba0158 Bug 1212153 - Clean up Cu.isModuleLoaded after migration. r=bgrins 2015-10-08 15:25:23 -05:00
Carsten "Tomcat" Book
6e07fc601b Merge m-c to fx-team 2015-10-08 16:11:56 +02:00
Carsten "Tomcat" Book
634dc488d6 merge mozilla-inbound to mozilla-central a=merge 2015-10-08 15:26:54 +02:00
Carsten "Tomcat" Book
819e5baeb9 Merge m-c to mozilla-inbound 2015-10-08 16:11:21 +02:00
Paolo Amadini
cec3e85a4e Bug 1179961 - Use a lock with a strikethrough for HTTP pages that have password fields in the Control Center. r=ttaubert,bgrins 
--HG--
extra : commitid : 9Cv8FpIQva7
extra : rebase_source : f0d10a153b1f054141fd1caaf8423049af79f04e
 2015-10-07 20:50:40 +01:00
David Critchley
310ba9b7a3 Bug 1209632 - Removing footer from Loop Standalone, moved Logo to mediaLayoutView. r=Standard8,ui-review=Sevaan 2015-10-07 19:48:28 +01:00
Wes Kocher
c23069f318 Merge m-c to fx-team a=merge 
--HG--
rename : mobile/android/config/tooltool-manifests/android/releng.manifest => mobile/android/config/tooltool-manifests/b2gdroid/releng.manifest
extra : rebase_source : 10508628a76cecbf86b54dd2e27fca8c39cfa37b
 2015-10-07 11:33:10 -07:00
Mark Banner
219eacc1d3 Bug 1212272 - 'make dist' for the Loop standalone doesn't update the css and supplementary files properly. r=dmose. NPOTB DONTBUILD 2015-10-07 19:20:03 +01:00
Wes Kocher
399a23b6c1 Merge inbound to m-c a=merge 2015-10-07 10:29:41 -07:00
Wes Kocher
92eaf64910 Backed out changeset 1f51d1614b9a (bug 1207245) 2015-10-07 10:19:31 -07:00
Wes Kocher
75ff20f5af Backed out changeset 91d4539e00ce (bug 1207245) 
--HG--
rename : mfbt/RefPtr.h => mfbt/nsRefPtr.h
 2015-10-07 10:19:19 -07:00
Wes Kocher
9d0985e9fd Merge fx-team to central, a=merge 2015-10-07 09:58:09 -07:00
Nathan Froyd
89a69c829a Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat 
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout.  The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.

 # The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
    xargs perl -p -i -e '
 s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
 s/nsRefPtr ?</RefPtr</g;   # handle declarations and variables
'

 # Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h

 # Handle nsRefPtr.h itself, a couple places that define constructors
 # from nsRefPtr, and code generators specially.  We do this here, rather
 # than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
 # things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
     mfbt/nsRefPtr.h \
     xpcom/glue/nsCOMPtr.h \
     xpcom/base/OwningNonNull.h \
     ipc/ipdl/ipdl/lower.py \
     ipc/ipdl/ipdl/builtin.py \
     dom/bindings/Codegen.py \
     python/lldbutils/lldbutils/utils.py

 # In our indiscriminate substitution above, we renamed
 # nsRefPtrGetterAddRefs, the class behind getter_AddRefs.  Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
    xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'

if [ -d .git ]; then
    git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
    hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi

--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
 2015-10-07 16:50:25 -04:00
Nathan Froyd
1f70f620da Bug 1207245 - part 3 - switch all uses of mozilla::RefPtr<T> to nsRefPtr<T>; r=ehsan 
This commit was generated using the following script, executed at the
top level of a typical source code checkout.

 # Don't modify select files in mfbt/ because it's not worth trying to
 # tease out the dependencies currently.
 #
 # Don't modify anything in media/gmp-clearkey/0.1/ because those files
 # use their own RefPtr, defined in their own RefCounted.h.
find . -name '*.cpp' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
    grep -v 'mfbt/RefPtr.h' | \
    grep -v 'mfbt/nsRefPtr.h' | \
    grep -v 'mfbt/RefCounted.h' | \
    grep -v 'media/gmp-clearkey/0.1/' | \
    xargs perl -p -i -e '
 s/mozilla::RefPtr/nsRefPtr/g; # handle declarations in headers
 s/\bRefPtr</nsRefPtr</g; # handle local variables in functions
 s#mozilla/RefPtr.h#mozilla/nsRefPtr.h#; # handle #includes
 s#mfbt/RefPtr.h#mfbt/nsRefPtr.h#;       # handle strange #includes
'

 # |using mozilla::RefPtr;| is OK; |using nsRefPtr;| is invalid syntax.
find . -name '*.cpp' -o -name '*.mm' | xargs sed -i -e '/using nsRefPtr/d'

 # RefPtr.h used |byRef| for dealing with COM-style outparams.
 # nsRefPtr.h uses |getter_AddRefs|.
 # Fixup that mismatch.
find . -name '*.cpp' | \
    xargs perl -p -i -e 's/byRef/getter_AddRefs/g'
 2015-10-07 15:05:02 -04:00
Carsten "Tomcat" Book
08997000eb Backed out 2 changesets (bug 1202902) to recking bug 1202902 to be able to reopen inbound on a CLOSED TREE 
Backed out changeset 647025383676 (bug 1202902)
Backed out changeset d70c7fe532c6 (bug 1202902)
 2015-10-07 14:03:21 +02:00
Sebastian Hengst
cdcff6d0a7 Backed out changeset c6b267589d0d (bug 1202902) for Mulet Reftest, W3C Platform Test and other failures. r=backout a=backout on a CLOSED TREE 2015-10-07 13:36:26 +02:00
Ed Lee
22dc1b2cfe Bug 1211563 - Invite buttons should be underneath "Invite a friend" text in popped-out view [r=Standard8] 2015-10-05 15:34:21 -07:00
Jed Davis
faf361396a Bug 1201935 - Allow reading from TmpD in OS X content processes. r=smichaud 
--HG--
extra : rebase_source : 68565c447e3731e9c562514e8355044cfd8c28b9
 2015-10-07 13:41:00 +02:00
Marco Bonardo
ed553c88ae Bug 1208063 - The name input field on the new bookmark dialog doesn't get focus. r=adw 2015-10-07 15:40:13 +02:00
Ed Lee
07095402be Bug 1211592 - The Copy Link and Email Link buttons show cursor:default, but the other buttons (Camera,Mic,Share Screen,Settings) show cursor:pointer [rs=jaws] 2015-10-05 15:24:32 -07:00
Mark Banner
a06648dbfd Bug 1208047 - Close the dropdown menu for sharing on Loop's conversation window as soon as an item is clicked, rather than leaving it open in a potentially confusing state. r=mikedeboer 2015-10-06 16:05:50 +01:00
Mike Conley
f29c98bfde Bug 1110511 - Move tab-crashing test helper function to BrowserTestUtils.jsm r=felipe 
--HG--
extra : commitid : 4ACRUHc4rlx
extra : source : 0eb0dda094b30354a84991e430a0e49320fde52b
extra : amend_source : 32bd586ee11bb38ddb733ced6d86179b051b7f96
 2015-09-29 16:44:50 -04:00
Carsten "Tomcat" Book
71e22d0c44 merge mozilla-inbound to mozilla-central a=merge 2015-10-06 12:01:35 +02:00
Kit Cambridge
74ef03c1a6 Bug 1192458, Part 1 - Consolidate push and desktop notification permissions. r=nsm,wchen,MattN 
--HG--
extra : commitid : 1veevVaOOYv
 2015-10-05 16:39:34 -07:00
Wes Kocher
c1121ee892 Backed out 6 changesets (bug 1110511) for automation timeouts in mochitest-bc suites 
Backed out changeset eddfd7f32a1c (bug 1110511)
Backed out changeset 0eb0dda094b3 (bug 1110511)
Backed out changeset 8e20cd68ca78 (bug 1110511)
Backed out changeset c7b983f65568 (bug 1110511)
Backed out changeset 219d86f78b6b (bug 1110511)
Backed out changeset 0e055b648e10 (bug 1110511)
 2015-10-05 16:38:03 -07:00
Matthew Noorenberghe
d1625cdffe Bug 1208295 - Open content preferences after receiving notifications-open-settings. r=jaws 
--HG--
rename : browser/base/content/test/general/browser_notification_tab_switching.js => browser/base/content/test/alerts/browser_notification_tab_switching.js
rename : browser/base/content/test/general/file_dom_notifications.html => browser/base/content/test/alerts/file_dom_notifications.html
extra : commitid : L8SBHW3urul
extra : rebase_source : 2b308872a836a6df9634e991409c008f3e72040c
 2015-09-25 13:18:29 -07:00
Gijs Kruitbosch
539d69a3dd Bug 1211456 - remove usage of getImageURLForResolution from search component, r=florian 
--HG--
extra : commitid : 8okcoGpNbUe
extra : rebase_source : f14d17cd5fe3e67b6c1b2bccbbf6260c71e6de58
 2015-10-05 15:39:16 +01:00
Mike Conley
8f9fdedf8f Bug 1110511 - Move tab-crashing test helper function to BrowserTestUtils.jsm r=felipe 
--HG--
extra : commitid : 3btc3brhudn
extra : rebase_source : 9e9cdf816b78eeeda4157a428b5d5e7fd1632b04
 2015-09-29 16:44:50 -04:00
Wes Kocher
11e1d57e15 Backed out 3 changesets (bug 1208295) for build bustage CLOSED TREE 
Backed out changeset ba930740225e (bug 1208295)
Backed out changeset 54f38580e0b8 (bug 1208295)
Backed out changeset a5907e5982a8 (bug 1208295)

--HG--
rename : browser/base/content/test/alerts/browser_notification_tab_switching.js => browser/base/content/test/general/browser_notification_tab_switching.js
rename : browser/base/content/test/alerts/file_dom_notifications.html => browser/base/content/test/general/file_dom_notifications.html
 2015-10-05 12:20:47 -07:00
Matthew Noorenberghe
222595da1d Bug 1208295 - Open content preferences after receiving notifications-open-settings. r=jaws 
--HG--
rename : browser/base/content/test/general/browser_notification_tab_switching.js => browser/base/content/test/alerts/browser_notification_tab_switching.js
rename : browser/base/content/test/general/file_dom_notifications.html => browser/base/content/test/alerts/file_dom_notifications.html
extra : commitid : 4I4XjOorZ7y
extra : rebase_source : eb354f4cc181f82f56b54451ec0ac32caef24d8e
 2015-09-25 13:18:29 -07:00
Carsten "Tomcat" Book
e7ef778c9d Backed out 1 changesets (bug 1202902) for causing merge conflicts to mozilla-central 
Backed out changeset cfc1820361f5 (bug 1202902)

--HG--
extra : rebase_source : 5d3db72337754bc7ab0ed0c30b2896100411ff92
 2015-10-07 12:13:45 +02:00
Mark Banner
93963ee2bc Bug 1212348 - Loop's RoomList view requires user profile data passed in when it doesn't need to. r=mikedeboer 2015-10-08 11:30:06 +01:00
Mark Banner
bc83c52931 Bug 1212074 - Update Mochitests for Loop now that the tabs are removed from the panel. r=mikedeboer 2015-10-08 11:30:06 +01:00
David Critchley
4e0f9302bd Bug 1212074 - Remove the tabs from Loop's panel. r=Standard8 2015-10-08 11:30:06 +01:00
Manuel Casas
d6efa38e22 Bug 1200693 - Modify aspect ratio so that top and bottom black bars are not seen when waiting alone in the conversation window. r=Standard8 2015-10-08 11:30:05 +01:00
Wes Kocher
0628e22f00 Merge m-c to inbound, a=merge CLOSED TREE 2015-10-05 13:11:26 -07:00
Gabor Krizsanits
255204ccf7 Bug 1190667 - WEAPI contextMenus. r=billm 2015-10-05 17:48:08 +02:00
Luca Greco
8c660fb1a2 Bug 1204583 - Implement WebExtension runtime.connect for background and tab. r=billm,gabor 2015-09-26 09:22:00 +02:00
Kapeel Sable
8b36eb6981 Bug 1212171 - Change for referencing a different object Component.utils. instead of Cu. r=mak 2015-10-08 06:53:00 +02:00
Jan Keromnes
18cd9e5493 Bug 1196785 - Create an about:debugging page to list debuggable devtools targets. r=jryans 2015-10-02 08:10:00 +02:00
Chris Rafuse
2236535827 Bug 1204345 - Last letter at bottom right can be cut off, r=dmose 2015-10-04 16:43:21 -07:00
Phil Ringnalda
41e2b2b6f7 Merge f-t to m-c, a=merge 2015-10-03 15:50:22 -07:00
Ehsan Akhgari
aadc453a3b Bug 1202621 - Correctly wait for both focus and the delayed startup to finish when opening a new window in private browsing tests; r=mconley 2015-10-03 11:27:07 -04:00
Jared Wein
41d3a2a4a3 Bug 1201398 - Web Notification management interface. r=MattN,dolske 2015-10-02 18:37:19 -04:00
Wes Kocher
4e73b8d067 Merge inbound to central, a=merge 2015-10-02 13:33:20 -07:00
Carsten "Tomcat" Book
e91d5a31b6 Merge m-c to mozilla-inbound 2015-10-02 13:37:27 +02:00
Carsten "Tomcat" Book
ca77b70a8d merge mozilla-inbound to mozilla-central a=merge 2015-10-02 11:52:49 +02:00
Mark Banner
6778068f21 Bug 1210513 - Loop's direct calls don't cancel properly if you click the hangup button on the toolbar. r=mikedeboer 2015-10-02 14:24:09 +01:00
Mark Banner
f9f09d33fd Bug 1209592 - Fix Loop's screenshare dropdown being misplaced on large window sizes. r=mikedeboer 2015-10-02 14:24:09 +01:00
Mark Banner
044d170346 Bug 1204343 - Loop's accept call buttons has different heights and looks strange. r=mikedeboer 2015-10-02 14:24:09 +01:00
Mark Banner
34bf33b710 Bug 1207300 - If Firefox is started offline, then Loop never initialises correctly. r=dmose 2015-10-01 19:40:50 +01:00
Ed Lee
1fb1bc7a2f Bug 1210331 - Clean up strings for conversations panel and conversation invite [r=Standard8] 2015-09-29 20:05:37 -07:00
Florian Quèze
4fd72298c0 Bug 1209920 - Drop support for <MozParam condition="defaultEngine", r=adw. 2015-10-01 15:05:59 +02:00
Carsten "Tomcat" Book
6db5f58151 Merge m-c to fx-team 
--HG--
rename : testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11.py => testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11_partner_sample1.py
rename : testing/taskcluster/tasks/builds/android_api_11.yml => testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml
extra : rebase_source : c4eedd0e67e1271c3faa6294abefbdbea6ee4fd0
 2015-10-01 14:16:12 +02:00
Carsten "Tomcat" Book
07ed19e582 merge mozilla-inbound to mozilla-central a=merge 2015-10-01 12:39:25 +02:00
Mike de Boer
41a3783d04 Bug 1184921: allow custom buttons to be added to the chatbox titlebar and implement one for Hello that closes the window when clicked. r=Standard8 2015-09-30 15:35:22 +02:00
Seth Fowler
9933832135 Bug 1118926 (Part 2) - Remove remnants of -moz-resolution in JavaScript code. r=dolske 2015-09-30 17:00:56 -07:00
Ed Lee
1e28b26a7f Bug 1184924 - Implement the refreshed design for the invitation overlay [r=Standard8] 2015-09-18 10:45:47 -07:00
Wes Kocher
296abd21ee Merge m-c to inbound a=merge 
--HG--
extra : rebase_source : 38a51b2c491658bc19cfac0d227b04ef6e5f6718
 2015-09-30 14:10:21 -07:00
Wes Kocher
7c2b0c515f Merge inbound to central, a=merge 2015-09-30 13:49:27 -07:00
Carsten "Tomcat" Book
f1919b93b2 Merge mozilla-central to mozilla-inbound 2015-09-30 13:52:57 +02:00
Andrei Oprea
8bdfaac4a4 Bug 1202265 - Add visual regression tool for Hello, r=dmose 2015-09-29 14:58:23 -07:00
David Critchley
f5edfaa7be Bug 1204101 - Fix for Loop settings menu positioning where menu gets cropped from longer text, r=dmose 2015-09-29 13:08:22 -07:00
Mark Banner
aaf1704384 Bug 1209620 - Fix intermittent failure finding the start a conversation button in Loop's functional tests. r=dmose NPOTB DONTBUILD 2015-09-29 18:35:30 +01:00
Martin Thomson
afdaddf1d7 Bug 1155923 - Removing moz prefix from RTC interfaces, r=jesup,smaug 
--HG--
extra : transplant_source : %0Adu%1E%A6j%9E%C2B%25%ECruo%F7%7Fc%EA%99%18
 2015-09-28 11:25:04 -07:00
Jared Wein
6716a82c56 Bug 1203253 - Add back/port the tests that got removed from bug 1140495. r=gijs 2015-09-24 11:03:54 -04:00
Mark Banner
d872fdcef7 Bug 1206457 - Second attempt to fix intermittent failure in browser_LoopRooms_channel.js - ensure previous states are cleared when they are used. r=mikedeboer 2015-09-29 14:50:15 +01:00
Mark Banner
85a8eff79d Bug 1209078 - Part 2. If a user attempts to open their own room within Firefox when the room is already open, provide a message to inform the user. r=mikedeboer 2015-09-29 14:50:15 +01:00
Mark Banner
218567ce2a Bug 1209078 - Part 1. When detecting if rooms are able to be handled by Firefox, also include an indication if they are already open or not. r=mikedeboer 2015-09-29 14:50:15 +01:00
Carsten "Tomcat" Book
191ce6efd0 Merge mozilla-central to fx-team 2015-09-29 12:41:12 +02:00
Carsten "Tomcat" Book
b63d7b04fc merge mozilla-inbound to mozilla-central a=merge 2015-09-29 12:00:25 +02:00
Mike de Boer
a1a700a030 Bug 1171962: introduce telemetry histogram that counts the amount of sessions that exchanged one or more chat messages. r=vladan,dmose 2015-09-29 11:50:21 +02:00
Dan Mosedale
0d7cc06e83 Bug 1208647-minify OpenTok+lodash for faster Hello standalone load time, r=Standard8 2015-09-28 14:15:21 -07:00
Dan Mosedale
1026ce2be3 Bug 1188509-Bundle Hello standalone JS for performance, r=Standard8 2015-09-28 13:18:22 -07:00
Mark Banner
81cf28c78e Bug 1208466 - Part 3. Fix display when opening room, and make the opened room text non-bold. r=mikedeboer 2015-09-28 16:08:27 +01:00
Mark Banner
aaca92e04c Bug 1208466 - Part 2. If an owner of a Loop link clicks their own link and join, make it open the conversation window. r=mikedeboer 2015-09-28 15:14:53 +01:00
Mark Banner
b082faea89 Bug 1208466 - Part 1. Create a new ToS view for Loop's standalone, ready for integration into the handled-in-Firefox views. r=mikedeboer 2015-09-28 15:14:53 +01:00
Carsten "Tomcat" Book
601264c5c1 Merge mozilla-central to fx-team 2015-09-28 14:19:22 +02:00
Carsten "Tomcat" Book
363e40e298 merge mozilla-inbound to mozilla-central a=merge 2015-09-28 14:13:24 +02:00
Mark Banner
04a19494a3 Bug 1208515 - The feedback view has the incorrect blue for the Hello icon and button. r=dmose 2015-09-26 12:20:11 +01:00
Wes Kocher
4ce68a706d Backed out 3 changesets (bug 1208295) for browser_offlineQuotaNotification.js bustage CLOSED TREE 
Backed out changeset 1c16e9f4aa2f (bug 1208295)
Backed out changeset 3242ff9a86bb (bug 1208295)
Backed out changeset 04f2a2c320a3 (bug 1208295)
 2015-09-25 18:20:35 -07:00
David Critchley
94439fdb33 Bug 1190738-Add Edit view with error to Hello ui-showcase, r=dmose 2015-09-25 16:23:29 -07:00
Matthew Noorenberghe
3508a5cb9b Bug 1200488 - browser_UITour_heartbeat.js: requestLongerTimeout(2) and add logging to see where/if the test is hanging. r=test-only 
--HG--
extra : commitid : 195MBp4E1Gm
extra : rebase_source : 6a17b5f0d77c78f387220e6b4e80c77ffc64db2f
 2015-09-25 15:50:20 -07:00
Bill McCloskey
330e587de8 Bug 1207911 - [webext] Fix races in webextension tests (r=gabor) 2015-09-27 12:29:40 -07:00
Gijs Kruitbosch
b34d2af69e Bug 1207106 - use voidptr for windows vault password ctypes code, r=dolske 
--HG--
extra : commitid : 7mTqAekDXSZ
extra : rebase_source : 1d6e1bb60d0cca22e32d1238252a3be980f404b5
 2015-09-22 23:46:11 +01:00
David Critchley
2020ebbaf9 Bug 1205206 - Move Loop Standalone Terms of Service text from footer to under Join button. r=Standard8 2015-09-30 09:38:24 +01:00
Neil Deakin
895856cf29 Bug 1199239, remove cpow usage from bookmark this page, r=mak 2015-09-25 21:14:43 -04:00
Wes Kocher
40f2f82907 Merge m-c to inbound, a=merge 2015-09-25 18:02:38 -07:00
Zachary Carter
34f8bce0ce Bug 1197323 - prevent profile images from being overwritten by an async onload callback r=markh 2015-09-25 14:02:30 -07:00
Luca Greco
9a56539df6 Bug 1204575 - Test case for fix WebExtension EventManager fireFunc registering. r=billm r=gabor 
--HG--
extra : rebase_source : f416a6f030a30e275c5331d6aff7e298785d3a1d
 2015-09-25 04:35:00 +02:00
Mark Banner
b3e8cd935f Bug 1208201 - Simplify setup flows for standalone and desktop in Loop's activeRoomStore. r=mikedeboer 2015-09-25 12:57:25 +01:00
Mark Banner
f7c532aa89 Bug 1188771 - Inform users when they can't use the Hello service due to ToS compliance. r=mikedeboer 2015-09-25 12:57:24 +01:00
Tim Taubert
c7e37ab652 Bug 1193849 - Show "Learn more" link in security subview when mixed content blocking is disabled f=tanvi r=paolo 2015-09-23 14:18:46 +02:00
Gijs Kruitbosch
267695d771 Bug 1194692 - fix fallback values at callsites of fileTimeToSecondsSinceEpoch, r=MattN 
--HG--
extra : commitid : K0lsNv1Ppkp
extra : rebase_source : 287103131b503124081470fd6549b4a1d6a4395e
extra : histedit_source : 4b12850bec32148d0713fc5fa8fff9f4a910a4d7
 2015-09-22 23:25:28 +01:00
Wes Kocher
b49a1bd566 Backed out changeset 8045d8fcbfe5 (bug 1203253) for browser_change_app_handler.js failures CLOSED TREE 2015-09-24 11:28:45 -07:00
Jared Wein
f40c529084 Bug 1203253 - Add back/port the tests that got removed from bug 1140495. r=gijs 
--HG--
extra : rebase_source : e26563247012d87a31cd59c9d448fd6afbed1c48
 2015-09-24 11:03:54 -04:00
Carsten "Tomcat" Book
2376775adf merge mozilla-inbound to mozilla-central a=merge 2015-09-24 12:03:40 +02:00
Wes Kocher
e4fc739f11 Merge m-c to fx-team, a=merge CLOSED TREE 2015-09-23 13:26:00 -07:00
Wes Kocher
46c7f8fbad Merge fx-team to central, a=merge CLOSED TREE 2015-09-23 13:22:10 -07:00
Mark Banner
e35ad56b37 Bug 1205610 - Log the string associated with OT's UNABLE_TO_PUBLISH exception to help understand where it is coming from. r=Mardak 2015-09-23 11:51:06 +01:00
Florian Quèze
239d577df1 Bug 862148 - remove the DATA_* and TYPE_* constants from nsISearchEngine, r=adw. 2015-09-23 12:05:37 +02:00
Florian Quèze
7f751627bc Bug 862148 - stop supporting installation of Sherlock plugins through Services.search.addEngine, r=adw. 2015-09-23 12:05:36 +02:00
Florian Quèze
5eee2c7669 Bug 862148 - drop support for Sherlock plugins in window.sidebar.addSearchEngine, r=adw. 2015-09-23 12:05:36 +02:00
Bill McCloskey
dd18632ad0 Bug 1202483 - [webext] Support ImageData for browser.browserAction.setIcon (r=gabor) 2015-09-23 17:18:32 -07:00
Bill McCloskey
8d6655bb1a Bug 1202482 - [webext] Implement browser.extension.getViews (r=gabor) 2015-09-23 17:18:32 -07:00
Bill McCloskey
bee599ea75 Bug 1202479 - [webext] Implement "current window" support in browser.{windows,tabs} (r=gabor) 2015-09-23 17:18:31 -07:00
Bill McCloskey
22b5c13d6a Bug 1202501 - [webext] Clean up WebExtension tests (r=gabor) 
--HG--
rename : browser/components/extensions/test/browser/browser_extensions_simple.js => browser/components/extensions/test/browser/browser_ext_simple.js
rename : toolkit/components/extensions/test/mochitest/file_contentscript_page1.html => toolkit/components/extensions/test/mochitest/file_sample.html
 2015-09-23 17:18:28 -07:00
Bill McCloskey
d8c4e2691e Bug 1190662 - [webext] Browser action popup HTML should be reloaded each time popup is opened (r=gabor) 2015-09-23 17:18:26 -07:00
Matthew Noorenberghe
8e54403e7f Bug 1208295 - Open content preferences after receiving notifications-open-settings. r=jaws 
--HG--
extra : commitid : 50AfHcXicOB
extra : rebase_source : c9ae238acf096c30b672b8a8e178c5eb13a96265
 2015-09-25 13:18:29 -07:00
Wes Kocher
38287f095c Backed out changeset ee1649a0952f (bug 1203253) for browser_cookies_exceptions.js failures 2015-09-25 11:58:55 -07:00
Mark Banner
29ef68c45a Bug 1207575 - Fix reporting of Loop's connection status if a user exits a room and then re-enters it without reloading the room. r=Mardak 2015-09-25 18:55:53 +01:00
Jared Wein
9c9a744658 Bug 1203253 - Add back/port the tests that got removed from bug 1140495. r=gijs 2015-09-24 11:03:54 -04:00
Bill McCloskey
24657932a7 Bug 967873 - Start TabView when starting tests that might lazily load it (r=Gijs) 2015-10-01 21:18:05 -07:00
Wes Kocher
331a00aba0 Merge m-c to fx-team, a=merge 2015-09-30 13:57:10 -07:00
Mark Banner
3c0a37662c No bug. Fix Loop's eslint configuration, due to fallout from bug 1203520. rs=dmose NPOTB DONTBUILD 2015-09-30 18:50:05 +01:00
Manuel Casas
7488cc8c6b Bug 1193674 - If room context/name is unavailable, the title of the standalone is displayed as "{{roomName}} - Firefox Hello". r=Standard8 2015-09-30 16:37:31 +01:00
Mark Banner
2f3bdadf1d Bug 1209029 - .settings-menu .icon classes in Loop's panel are obsolete and should be removed. r=Standard8 2015-09-30 16:37:31 +01:00
Jared Wein
38831b3384 Bug 1209521 - Re-enable browser_cookies_exceptions.js on Linux. r=Gijs 2015-09-29 17:35:00 +02:00
Dave Townsend
a22c2d1f9e Bug 1192924: Expose the update URL formatting code a new UpdateUtils module. r=rstrong 
The GMP manager uses a copy of the update service's url formatting code and has
since fallen out of sync. We'll also want to use the same formatting code for
the system add-on update checks so this just exposes it in a shared API.

I've moved the contents of UpdateChannel.jsm to UpdateUtils.jsm and exposed
formatUpdateURL there as well as a few properties that the update service still
needs access to.

UpdateUtils.UpdateChannel is intended to be a lazy getter but isn't for now
since tests expect to be able to change the update channel at runtime.

--HG--
extra : commitid : KsbH21csjH4
extra : rebase_source : bc7c08de1ec6e802261b8cd294d88ee2c4e75c2d
 2015-09-14 11:04:19 -07:00
Gijs Kruitbosch
7b8e36ae79 Bug 1183296 - feeds should display in e10s mode, r=billm 
--HG--
extra : commitid : 6Jo98qH97L6
extra : rebase_source : fcb7c57f4ff649df1a8899462367d3192cb4d0c4
extra : amend_source : 3ea64db9df55775cdba4cea1ae664bf1cbaeb42b
 2015-09-17 18:06:44 +01:00
Shu-yu Guo
d06b6030f6 Bug 1202902 - Scripted fix the world. 2015-10-06 14:00:31 -07:00
Shu-yu Guo
52e365bb7b Bug 1202902 - Fix the world. (r=ato for marionette, rs=Mossop for rest) 2015-10-06 14:00:30 -07:00
Bill McCloskey
b1e89d97be Back out bug 967873 - Start TabView when starting tests that might lazily load it 2015-10-07 11:15:11 -07:00
Wes Kocher
1c1aa1981c Merge m-c to inbound, a=merge 2015-09-28 16:31:29 -07:00
Gijs Kruitbosch
5dd3837ea4 Bug 636905 - part 3: flip prefs in tests to keep them working, r=jaws 
--HG--
extra : commitid : 5ctg1uTZzZd
extra : rebase_source : 953ba9df408b24a340074abeb1a05a2c02b2bbf6
 2015-09-26 15:01:51 +01:00
Mark Hammond
027b3c15a3 Bug 1206571 - ensure Sync UI is in correct state before Sync initialized. r=adw 2015-09-23 11:00:40 +10:00
Wes Kocher
08ffd204f8 Merge inbound to central, a=merge CLOSED TREE 2015-09-22 16:42:03 -07:00