Merge lp://staging/~elementary-apps/midori/newest-things into lp://staging/midori
Proposed by
Cris Dywan
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~elementary-apps/midori/newest-things |
| Merge into: | lp://staging/midori |
| Diff against target: |
6855 lines (+6675/-0) (has conflicts) 35 files modified
CMakeLists.txt (+92/-0) cmake/FindGirCompiler.cmake (+56/-0) cmake/FindVala.cmake (+65/-0) cmake/GObjectIntrospectionMacros.cmake (+34/-0) cmake/GSettings.cmake (+42/-0) cmake/ParseArguments.cmake (+36/-0) cmake/README (+10/-0) cmake/README.Vala.rst (+173/-0) cmake/Tests.cmake (+5/-0) cmake/Translations.cmake (+76/-0) cmake/Uninstall.cmake (+23/-0) cmake/ValaPrecompile.cmake (+250/-0) cmake/ValaVersion.cmake (+96/-0) src/App.vala (+70/-0) src/BookmarksDatabase.vala (+1067/-0) src/Completion.vala (+198/-0) src/Config.vala.cmake (+11/-0) src/Database.vala (+309/-0) src/DownloadsView.vala (+13/-0) src/HistoryCompletion.vala (+65/-0) src/HistoryDatabase.vala (+148/-0) src/Paths.vala (+462/-0) src/SearchCompletion.vala (+78/-0) src/SearchEngineManager.vala (+93/-0) src/Tab.vala (+551/-0) src/TabInterfaces.vala (+125/-0) src/Uri.vala (+313/-0) src/UrlBar.vala (+116/-0) src/UrlBarCompletion.vala (+396/-0) src/Utils.vala (+195/-0) src/WebView.vala (+237/-0) src/Window.vala (+244/-0) vapi/gcr-trust.vapi (+16/-0) vapi/webkit2gtk-3.0.deps (+7/-0) vapi/webkit2gtk-3.0.vapi (+1003/-0) Conflict adding file CMakeLists.txt. Moved existing file to CMakeLists.txt.moved. Conflict adding file cmake. Moved existing file to cmake.moved. |
| To merge this branch: | bzr merge lp://staging/~elementary-apps/midori/newest-things |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Midori Devs | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 15. By Tom Beckmann
-
fix adaptive colors for header bar
- 14. By Tom Beckmann
-
grab newer vapi, prepare color auto detection
- 13. By Tom Beckmann
-
start implementing header bar colors and shortcuts
- 12. By Tom Beckmann
-
fix loading favicons, properly update when a tab is changed
- 11. By Tom Beckmann
-
but various infrastructure in place. may crash currently
- 10. By Tom Beckmann
-
copy completion engines from midori, build urlbar completion popup
- 9. By Tom Beckmann
-
prepare displaying secure connection icon and urlbar widget
- 8. By Tom Beckmann
-
add Uri.vala from midori source and port parts of sokoke
- 7. By Tom Beckmann
-
re-use the webview's navigation history stack
- 6. By Tom Beckmann
-
forgot history stack
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
