Merge lp://qastaging/~midori/midori/clippyEditor into lp://qastaging/midori
Proposed by
Cris Dywan
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~midori/midori/clippyEditor |
Merge into: | lp://qastaging/midori |
Diff against target: |
9802 lines (+651/-6324) 70 files modified
CMakeLists.txt (+16/-75) HACKING (+1/-1) extensions/CMakeLists.txt (+11/-12) extensions/about.vala (+1/-5) extensions/adblock/extension.vala (+0/-33) extensions/adblock/widgets.vala (+0/-8) extensions/clippy.vala (+312/-0) extensions/colorful-tabs.c (+0/-5) extensions/cookie-manager/cookie-manager.c (+0/-6) extensions/cookie-permissions/cookie-permission-manager-preferences-window.c (+0/-22) extensions/cookie-permissions/cookie-permission-manager.c (+0/-17) extensions/external-download-manager.vala (+0/-17) extensions/feed-panel/feed-panel.c (+2/-6) extensions/feed-panel/main.c (+1/-1) extensions/formhistory/formhistory.c (+1/-1) extensions/history-list.vala (+0/-14) extensions/nojs/nojs-preferences.c (+0/-18) extensions/open-with.vala (+0/-14) extensions/shortcuts.c (+1/-1) extensions/tabby.vala (+0/-4) extensions/transfers.vala (+1/-15) katze/gtk3-compat.c (+0/-243) katze/gtk3-compat.h (+0/-93) katze/katze-cellrenderercomboboxtext.c (+0/-39) katze/katze-http-auth.c (+1/-2) katze/katze-item.c (+1/-1) katze/katze-preferences.c (+10/-25) katze/katze-utils.c (+0/-80) katze/katze-utils.h (+0/-1) katze/katze.h (+1/-5) katze/katze.vapi (+6/-0) katze/midori-paths.vala (+1/-25) katze/midori-uri.vala (+0/-2) midori/main.c (+0/-11) midori/midori-app.c (+1/-35) midori/midori-bookmarks-db.c (+215/-0) midori/midori-bookmarks-db.h (+4/-0) midori/midori-browser.c (+26/-840) midori/midori-browser.h (+0/-4) midori/midori-download.vala (+0/-38) midori/midori-extension.c (+2/-0) midori/midori-frontend.c (+1/-6) midori/midori-locationaction.c (+1/-87) midori/midori-notebook.vala (+0/-54) midori/midori-panel.c (+0/-10) midori/midori-platform.h (+0/-1) midori/midori-privatedata.c (+1/-1) midori/midori-searchaction.c (+2/-8) midori/midori-session.c (+1/-46) midori/midori-settings.vala (+0/-18) midori/midori-tab.vala (+0/-25) midori/midori-view.c (+15/-425) midori/midori-websettings.c (+1/-154) midori/midori-window.vala (+1/-8) midori/midori.vapi (+11/-0) midori/sokoke.c (+0/-53) midori/sokoke.h (+0/-1) midori/webkit2gtk-web-extension-4.0.vapi (+0/-2801) midori/webkitgtk-3.0.deps (+0/-6) midori/webkitgtk-3.0.vapi (+0/-841) panels/midori-bookmarks.c (+1/-1) panels/midori-history.c (+1/-1) snap/snapcraft.yaml (+0/-1) tests/actions.vala (+0/-3) tests/browser.c (+0/-2) tests/download.vala (+0/-26) tests/extensions.c (+0/-4) tests/magic-uri.c (+0/-2) tests/properties.c (+0/-5) tests/tab.vala (+0/-15) |
To merge this branch: | bzr merge lp://qastaging/~midori/midori/clippyEditor |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Midori Devs | Pending | ||
Review via email:
|
Commit message
Move bookmark editor into clippy
To post a comment you must log in.
Unmerged revisions
- 7175. By Cris Dywan
-
Move bookmark editor into clippy
- 7174. By Cris Dywan
-
Move bookmarkbar into clippy extension
- 7173. By Cris Dywan
-
Drop pass-through-
console flag - 7172. By Cris Dywan
-
Unconditionally include WebKit2 headers
- 7171. By Cris Dywan
-
Drop non-WebKit2 website saving code path
- 7170. By Cris Dywan
-
Non-conditional skipping of non-WebKit2 extensions
- 7169. By Cris Dywan
-
Drop non-WebKit2/ non-libnotify code paths