Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'refs/merge-requests/186' of ↵ | Andrea Diamantini | 2010-08-23 | 7 | -12/+54 |
|\ | | | | | | | git://gitorious.org/rekonq/mainline into m186 | ||||
| * | Add support for domain option in the ad block module | Benjamin Poulain | 2010-08-22 | 7 | -12/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some ads were not filtered because they were incorrectly matched by the whitelist. This is because we ignore options, including the domain restrictions. For example, the white filter: @@||pagead2.googlesyndication.com/pagead/show_ads.js$domain=kde.org would match any page regardless of the domain restriction. So no ads from pagead2.googlesyndication.com were filtered. This patch adds support for "domain" options in the fallback rules (the other AdBlockRuleImpl rejects options). The domain of the frame making the request is now compared to the option to take the right decision. This patch requires Qt 4.7 with a recent QtWebKit 2.0. | ||||
* | | Merge commit 'refs/merge-requests/185' of ↵ | Andrea Diamantini | 2010-08-23 | 1 | -20/+38 |
|\ \ | | | | | | | | | | git://gitorious.org/rekonq/mainline into m185 | ||||
| * | | Forget to commit some changes | Yoann Laissus | 2010-08-21 | 1 | -3/+4 |
| | | | |||||
| * | | - Fix BK toolbar drops at the extremities of the bar | Yoann Laissus | 2010-08-21 | 1 | -22/+39 |
| |/ | | | | | | | - A little cleanup | ||||
* | | Merge commit 'refs/merge-requests/184' of ↵ | Andrea Diamantini | 2010-08-23 | 2 | -3/+16 |
|\ \ | | | | | | | | | | git://gitorious.org/rekonq/mainline into m184 | ||||
| * | | Don't add open folder in tabs if there are only folders | Yoann Laissus | 2010-08-21 | 2 | -3/+16 |
| |/ | |||||
* | | fix Messages.sh after yesterday change in extract-messages.sh | Albert Astals Cid | 2010-08-22 | 1 | -1/+1 |
|/ | |||||
* | Restore bk icon on the right | Andrea Diamantini | 2010-08-21 | 3 | -16/+16 |
| | | | | | | | This commit intends to revert manually commits de9abc72 && bd27f60d, restoring bk positions on the right. This because most of the developers prefer so. Anyway, if things will change again we can revert the "revertion" :D | ||||
* | Merge commit 'refs/merge-requests/183' of ↵ | Andrea Diamantini | 2010-08-21 | 2 | -43/+67 |
|\ | | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m183 Conflicts: src/mainwindow.h | ||||
| * | Useless include | Yoann Laissus | 2010-08-20 | 1 | -1/+0 |
| | | |||||
| * | Make a string translatable | Yoann Laissus | 2010-08-20 | 1 | -1/+2 |
| | | |||||
| * | Fix the help menu and readd the bookmark bar toggle action | Yoann Laissus | 2010-08-20 | 2 | -42/+66 |
| | | |||||
* | | BookmarkProvider's code reordered | Jon Ander Peñalba | 2010-08-20 | 3 | -88/+87 |
| | | |||||
* | | Minor changes in BookmarkProvider. Searching for bookmarks should be a bit ↵ | Jon Ander Peñalba | 2010-08-20 | 2 | -34/+17 |
| | | | | | | | | faster | ||||
* | | Improved the code to load the bookmarks file using KStandardDirs and other ↵ | Jon Ander Peñalba | 2010-08-20 | 2 | -38/+26 |
| | | | | | | | | minor changes to BookmarkProvider. | ||||
* | | Removed unused includes in src/bookmarks/bookmarkprovider.h | Jon Ander Peñalba | 2010-08-20 | 8 | -44/+58 |
| | | |||||
* | | Changed the name of the files src/bookmarks/bookmarksmanager.* to ↵ | Jon Ander Peñalba | 2010-08-20 | 16 | -95/+95 |
| | | | | | | | | src/bookmarks/bookmarkprovider.* | ||||
* | | Merge branch 'opensearch' | Andrea Diamantini | 2010-08-20 | 20 | -109/+1435 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: src/CMakeLists.txt src/urlbar/urlresolver.cpp | ||||
| * | | Change from QByteArray to QString in the right way | Andrea Diamantini | 2010-08-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge commit 'refs/merge-requests/169' of ↵ | Andrea Diamantini | 2010-08-20 | 4 | -8/+43 |
| |\ \ | | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into opensearch | ||||
| | * | | fix suggestion item: use the correct search engine | megabigbug | 2010-08-19 | 4 | -8/+43 |
| | | | | |||||
| * | | | OpenSearch review | Andrea Diamantini | 2010-08-16 | 14 | -284/+520 |
| | | | | | | | | | | | | | | | | | | | | | | | | - file headers fix - clean up code - import engine files | ||||
| * | | | Merge commit 'refs/merge-requests/169' of ↵ | Andrea Diamantini | 2010-08-16 | 20 | -104/+1159 |
| |\ \ \ | | |/ / | | | | | | | | | git://gitorious.org/rekonq/mainline into opensearch | ||||
| | * | | working opensearch suggestions | megabigbug | 2010-08-15 | 4 | -114/+176 |
| | | | | |||||
| | * | | wait signal | megabigbug | 2010-08-15 | 4 | -0/+25 |
| | | | | |||||
| | * | | introduce a new SuggestionListItem | lionelc | 2010-08-12 | 18 | -10/+978 |
| | | | | | | | | | | | | | | | | introduce an opensearch engine | ||||
* | | | | bk toolbar by default for the next rekonq. | Andrea Diamantini | 2010-08-20 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | It is really awesome :) | ||||
* | | | | Merge commit 'refs/merge-requests/181' of ↵ | Andrea Diamantini | 2010-08-20 | 12 | -255/+271 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m181 Conflicts: src/bookmarks/bookmarkstoolbar.h | ||||
| * | | | - The bookmark toolbar is now a real toolbar, not an action. | Yoann Laissus | 2010-08-20 | 12 | -262/+270 |
| | | | | | | | | | | | | | | | | | | | | | | | | It fixes the problem of the submenu if there are too much items to fit on the bar - Improve a bit the new redesign of BookmarkOwner - Reenable the bookmark menu by default (because the icon in the bar is on the left) | ||||
* | | | | Krazy fixes, first bunch | Andrea Diamantini | 2010-08-20 | 8 | -25/+30 |
| | | | | |||||
* | | | | Add a "show main toolbar" action in the empty tabbar contextual menu | Andrea Diamantini | 2010-08-20 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | to prevent rekonq being WITHOUT any bar... | ||||
* | | | | cppcheck: reduce variable scope | Andrea Diamantini | 2010-08-20 | 1 | -2/+1 |
|/ / / | |||||
* | | | Fixed tooltip in the bookmarks panel | Jon Ander Peñalba | 2010-08-20 | 1 | -2/+2 |
| | | | |||||
* | | | Bookmarks panel code reordered | Jon Ander Peñalba | 2010-08-20 | 3 | -131/+132 |
| | | | |||||
* | | | Bookmarks panel code clean-up | Jon Ander Peñalba | 2010-08-19 | 4 | -134/+91 |
| | | | |||||
* | | | Stupid me, QtWebKit calls addHistoryEntry itself when you let it load a page.. | Andrea Diamantini | 2010-08-19 | 1 | -6/+0 |
| | | | |||||
* | | | HistoryManager review (the second): | Andrea Diamantini | 2010-08-19 | 5 | -487/+105 |
| | | | | | | | | | | | | | | | | | | | | | - impressive cleanup of the code - removed unneeded classes - one List to manage the items in the historyManager, one easier Hash in the HistoryFilterModel to speed up searches - better HistoryItem updates | ||||
* | | | Simpler than I thought, fix kget integration | Andrea Diamantini | 2010-08-19 | 4 | -5/+5 |
| | | | |||||
* | | | Merge commit 'refs/merge-requests/179' of ↵ | Andrea Diamantini | 2010-08-19 | 11 | -13/+159 |
|\ \ \ | | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m179 | ||||
| * | | | Skip the hiding rules specific to domains | Benjamin Poulain | 2010-08-19 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rules to hide elements for a specific domains were interpreted as regular RegExp rules, which grows the list of filter to test. Those rules are not working with the current implementation, we should just skip them for efficiency. | ||||
| * | | | Add a special matcher for ad block filters for host name | Benjamin Poulain | 2010-08-19 | 5 | -1/+133 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quite a few rules of ad block are just matching domains. Those are of the form: ||trolltech.com^$options This patch add a new class to deal with this kind of filter, AdBlockHostMatcher. Matching a host address is much faster (O(1)) than going through the entire list of rules. | ||||
| * | | | Improve the performance of AdBlockRuleTextMatchImpl | Benjamin Poulain | 2010-08-19 | 7 | -12/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparing unicode string without case sensitive is rather expensive because each codepoint must be converted, which is non trivial for unicode. This patch introduce a new argument of ::match() taking the encoded url in lowercase. This way, the conversion can be done only once for a lot of rules. | ||||
* | | | | BookmarkOwner class clean-up | Jon Ander Peñalba | 2010-08-19 | 2 | -154/+128 |
| | | | | |||||
* | | | | BookmarkOwner class moved to it's own file | Jon Ander Peñalba | 2010-08-19 | 10 | -546/+612 |
| | | | | |||||
* | | | | The bookmark actions in BookmarkOwner are now working and being used | Jon Ander Peñalba | 2010-08-19 | 7 | -265/+174 |
| | | | | |||||
* | | | | Create and store all bookmark actions in BookmarkOwner | Jon Ander Peñalba | 2010-08-19 | 2 | -0/+71 |
| | | | | |||||
* | | | | Minor improvements in the insertion and deletion of bookmarks code | Jon Ander Peñalba | 2010-08-19 | 1 | -13/+14 |
| | | | | |||||
* | | | | All insertion and deletion of bookmarks code moved to the same place ↵ | Jon Ander Peñalba | 2010-08-19 | 4 | -86/+132 |
| | | | | | | | | | | | | | | | | (BookmarkOwner) | ||||
* | | | | Merge branch 'master' of gitorious.org:rekonq/mainline | Andrea Diamantini | 2010-08-19 | 1 | -0/+1 |
|\ \ \ \ |