summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'refs/merge-requests/186' of ↵Andrea Diamantini2010-08-237-12/+54
|\ | | | | | | git://gitorious.org/rekonq/mainline into m186
| * Add support for domain option in the ad block moduleBenjamin Poulain2010-08-227-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 Diamantini2010-08-231-20/+38
|\ \ | | | | | | | | | git://gitorious.org/rekonq/mainline into m185
| * | Forget to commit some changesYoann Laissus2010-08-211-3/+4
| | |
| * | - Fix BK toolbar drops at the extremities of the barYoann Laissus2010-08-211-22/+39
| |/ | | | | | | - A little cleanup
* | Merge commit 'refs/merge-requests/184' of ↵Andrea Diamantini2010-08-232-3/+16
|\ \ | | | | | | | | | git://gitorious.org/rekonq/mainline into m184
| * | Don't add open folder in tabs if there are only foldersYoann Laissus2010-08-212-3/+16
| |/
* | fix Messages.sh after yesterday change in extract-messages.shAlbert Astals Cid2010-08-221-1/+1
| |
* | rekonq 0.5.80 AKA 0.6 beta0.5.80Andrea Diamantini2010-08-221-1/+1
|/
* Restore bk icon on the rightAndrea Diamantini2010-08-213-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 Diamantini2010-08-212-43/+67
|\ | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m183 Conflicts: src/mainwindow.h
| * Useless includeYoann Laissus2010-08-201-1/+0
| |
| * Make a string translatableYoann Laissus2010-08-201-1/+2
| |
| * Fix the help menu and readd the bookmark bar toggle actionYoann Laissus2010-08-202-42/+66
| |
* | Merge commit 'refs/merge-requests/182' of ↵Andrea Diamantini2010-08-2117-265/+249
|\ \ | | | | | | | | | git://gitorious.org/rekonq/mainline into m182
| * | BookmarkProvider's code reorderedJon Ander Peñalba2010-08-203-88/+87
| | |
| * | Minor changes in BookmarkProvider. Searching for bookmarks should be a bit ↵Jon Ander Peñalba2010-08-202-34/+17
| | | | | | | | | | | | faster
| * | Improved the code to load the bookmarks file using KStandardDirs and other ↵Jon Ander Peñalba2010-08-202-38/+26
| | | | | | | | | | | | minor changes to BookmarkProvider.
| * | Removed unused includes in src/bookmarks/bookmarkprovider.hJon Ander Peñalba2010-08-208-44/+58
| | |
| * | Changed the name of the files src/bookmarks/bookmarksmanager.* to ↵Jon Ander Peñalba2010-08-2016-95/+95
| | | | | | | | | | | | src/bookmarks/bookmarkprovider.*
* | | Merge branch 'opensearch2'Andrea Diamantini2010-08-200-0/+0
|\ \ \ | |/ / |/| |
| * | Merge commit 'refs/merge-requests/169' of ↵Andrea Diamantini2010-08-204-8/+43
| |\ \ | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into opensearch2
* | | | rekonq 0.5.60Andrea Diamantini2010-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve bk toolbar opensearch suggestions bk panel cleanup Last before beta
* | | | Merge branch 'opensearch'Andrea Diamantini2010-08-2020-109/+1435
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/CMakeLists.txt src/urlbar/urlresolver.cpp
| * | | | Change from QByteArray to QString in the right wayAndrea Diamantini2010-08-201-1/+1
| | | | |
| * | | | Merge commit 'refs/merge-requests/169' of ↵Andrea Diamantini2010-08-204-8/+43
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / git://gitorious.org/rekonq/mainline into opensearch
| | * | fix suggestion item: use the correct search enginemegabigbug2010-08-194-8/+43
| | | |
| * | | OpenSearch reviewAndrea Diamantini2010-08-1614-284/+520
| | | | | | | | | | | | | | | | | | | | | | | | - file headers fix - clean up code - import engine files
| * | | Merge commit 'refs/merge-requests/169' of ↵Andrea Diamantini2010-08-1620-104/+1159
| |\ \ \ | | |/ / | | | | | | | | git://gitorious.org/rekonq/mainline into opensearch
| | * | working opensearch suggestionsmegabigbug2010-08-154-114/+176
| | | |
| | * | wait signalmegabigbug2010-08-154-0/+25
| | | |
| | * | introduce a new SuggestionListItemlionelc2010-08-1218-10/+978
| | | | | | | | | | | | | | | | introduce an opensearch engine
* | | | bk toolbar by default for the next rekonq.Andrea Diamantini2010-08-201-1/+0
| | | | | | | | | | | | | | | | It is really awesome :)
* | | | Merge commit 'refs/merge-requests/181' of ↵Andrea Diamantini2010-08-2012-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 Laissus2010-08-2012-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 bunchAndrea Diamantini2010-08-208-25/+30
| | | |
* | | | Add a "show main toolbar" action in the empty tabbar contextual menuAndrea Diamantini2010-08-201-0/+6
| | | | | | | | | | | | | | | | to prevent rekonq being WITHOUT any bar...
* | | | cppcheck: reduce variable scopeAndrea Diamantini2010-08-201-2/+1
|/ / /
* | | Fixed tooltip in the bookmarks panelJon Ander Peñalba2010-08-201-2/+2
| | |
* | | Bookmarks panel code reorderedJon Ander Peñalba2010-08-203-131/+132
| | |
* | | Bookmarks panel code clean-upJon Ander Peñalba2010-08-194-134/+91
| | |
* | | rekonq 0.5.57Andrea Diamantini2010-08-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probaly last before beta release We NOW DEPENDS on Qt 4.7 / KDE SC 4.5 (also if Qt 4.7 has not been officially released yet!) - fixed kget integration - History Review (The 3rd one..) - dramatically improved adblock performance - Bookmarks Management clean-up && review - Search Engine review - new features for the bookmarks toolbar - tons of fixes
* | | Merge branch 'HistoryReview3'Andrea Diamantini2010-08-196-493/+105
|\ \ \
| * | | Stupid me, QtWebKit calls addHistoryEntry itself when you let it load a page..Andrea Diamantini2010-08-191-6/+0
| | | |
| * | | HistoryManager review (the second):Andrea Diamantini2010-08-195-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
* | | | Merge branch 'master' of gitorious.org:rekonq/mainlineAndrea Diamantini2010-08-190-0/+0
|\ \ \ \ | |/ / /
| * | | Simpler than I thought, fix kget integrationAndrea Diamantini2010-08-194-5/+5
| | | |
* | | | Simpler than I thought, fix kget integrationAndrea Diamantini2010-08-194-5/+5
|/ / /
* | | Merge commit 'refs/merge-requests/179' of ↵Andrea Diamantini2010-08-1911-13/+159
|\ \ \ | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m179
| * | | Skip the hiding rules specific to domainsBenjamin Poulain2010-08-191-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.