Merge lp://staging/~lemonboy/midori/loginmanager into lp://staging/midori
Proposed by
The Lemon Man
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~lemonboy/midori/loginmanager | ||||
| Merge into: | lp://staging/midori | ||||
| Diff against target: |
15638 lines (+5924/-5423) (has conflicts) 88 files modified
CMakeLists.txt (+45/-12) data/error.html (+0/-30) data/logo-shade.svg (+0/-150) extensions/CMakeLists.txt (+91/-51) extensions/about.vala (+31/-33) extensions/adblock/extension.vala (+10/-25) extensions/adblock/widgets.vala (+0/-8) extensions/colorful-tabs.c (+0/-5) extensions/colorful-tabs.web.vala (+69/-0) 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/-6) extensions/donottrack.web.vala (+141/-0) extensions/external-download-manager.vala (+9/-7) extensions/feed-panel/feed-panel.c (+0/-4) extensions/feed-panel/main.c (+1/-1) extensions/formhistory/formhistory.c (+1/-1) extensions/history-list.vala (+15/-13) extensions/hsts.web.vala (+173/-0) extensions/login-manager.web.vala (+456/-0) extensions/nojs/nojs-preferences.c (+0/-18) extensions/nojs/nojs.c (+1/-1) extensions/nsplugin-manager.vala (+0/-71) extensions/open-with.vala (+0/-11) extensions/shortcuts.c (+1/-1) extensions/status-clock.c (+1/-1) extensions/statusbar-features.c (+4/-33) extensions/tabby.vala (+0/-5) extensions/transfers.vala (+8/-23) ipc/CMakeLists.txt (+47/-0) ipc/ipc-contextaction.vala (+56/-0) ipc/ipc-paths.vala (+132/-0) ipc/midori-tabproxy.vala (+29/-0) ipc/midori-webextension.vala (+40/-0) katze/gtk3-compat.h (+0/-93) katze/katze-cellrenderercomboboxtext.c (+0/-39) katze/katze-http-auth.c (+0/-464) katze/katze-http-auth.h (+0/-42) katze/katze-preferences.c (+7/-4) katze/katze-utils.c (+0/-80) katze/katze-utils.h (+0/-1) katze/katze.h (+0/-5) katze/midori-paths.vala (+22/-111) katze/midori-uri.vala (+0/-6) midori/CMakeLists.txt (+10/-12) midori/main.c (+50/-11) midori/midori-addons.vala (+415/-0) midori/midori-app.c (+7/-8) midori/midori-app.h (+5/-0) midori/midori-browser.c (+263/-702) midori/midori-contextaction.vala (+19/-13) midori/midori-download.vala (+4/-28) midori/midori-extension.c (+47/-830) midori/midori-extension.h (+2/-5) midori/midori-findbar.c (+7/-4) midori/midori-frontend.c (+19/-13) midori/midori-locationaction.c (+35/-39) midori/midori-navigationaction.vala (+237/-0) midori/midori-notebook.vala (+0/-48) midori/midori-oops.vala (+53/-0) midori/midori-panel.c (+0/-10) midori/midori-platform.h (+0/-1) midori/midori-preferences.c (+0/-15) midori/midori-privatedata.c (+1/-43) midori/midori-searchaction.c (+2/-8) midori/midori-session.c (+9/-41) midori/midori-session.h (+0/-3) midori/midori-settings.vala (+1/-0) midori/midori-tab.vala (+104/-31) midori/midori-view.c (+183/-848) midori/midori-view.h (+3/-5) midori/midori-websettings.c (+8/-202) midori/midori-window.vala (+211/-0) midori/midori.vapi (+10/-21) midori/sokoke.c (+0/-53) midori/sokoke.h (+0/-1) midori/webkit2gtk-web-extension-4.0.vapi (+2801/-0) midori/webkitgtk-3.0.deps (+0/-6) midori/webkitgtk-3.0.vapi (+0/-841) po/POTFILES.in (+15/-6) tests/CMakeLists.txt (+0/-12) tests/browser.c (+0/-33) tests/extensions.c (+0/-52) tests/hsts.vala (+0/-32) tests/magic-uri.c (+0/-2) tests/properties.c (+0/-5) tests/tab.vala (+1/-5) win32/makedist/makedist.midori (+12/-51) Text conflict in CMakeLists.txt Text conflict in extensions/CMakeLists.txt Text conflict in extensions/adblock/extension.vala Text conflict in extensions/external-download-manager.vala Text conflict in extensions/history-list.vala Text conflict in extensions/statusbar-features.c Text conflict in extensions/transfers.vala Contents conflict in katze/gtk3-compat.c Text conflict in katze/katze-preferences.c Contents conflict in katze/midori-hsts.vala Text conflict in midori/midori-app.c Text conflict in midori/midori-browser.c Text conflict in midori/midori-download.vala Text conflict in midori/midori-locationaction.c Contents conflict in midori/midori-panedaction.vala Text conflict in midori/midori-session.c Text conflict in midori/midori-tab.vala Text conflict in midori/midori-view.c Conflict adding file midori/midori-window.vala. Moved existing file to midori/midori-window.vala.moved. Text conflict in midori/midori.vapi Contents conflict in midori/webkit2gtk-4.0.vapi Conflict adding file midori/webkit2gtk-web-extension-4.0.vapi. Moved existing file to midori/webkit2gtk-web-extension-4.0.vapi.moved. Text conflict in po/POTFILES.in |
||||
| To merge this branch: | bzr merge lp://staging/~lemonboy/midori/loginmanager | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cris Dywan | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 6873. By The Lemon Man
-
Adjust some tiny bits
- 6872. By The Lemon Man
-
Prototype
- 6871. By Cris Dywan
-
Implement TabProxy.add_icon and low-level Midori.ContextItem
- 6870. By Cris Dywan
-
Reinstate unowned annotation of URIRequest.
get_http_ headers - 6869. By Cris Dywan
-
Make Midori.Database available to web extensions
- 6868. By Cris Dywan
-
Update webkit2gtk-
web-extension- 4.0.vapi from vala master https:/
/github. com/GNOME/ vala/commit/ 8d57dffdea43a9d 663e12b52722ef5 67c705bf5e - 6867. By Cris Dywan
-
Fix return_if_fail's on midori_
view_get_ source/ find_bar - 6866. By Cris Dywan
-
DoNotTrack needs to handle query keys being null
- 6865. By Cris Dywan
-
Make extension tests aware of web extensions with user data
- 6864. By Cris Dywan
-
Fallback to uri if error page really has no title
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
