Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'refs/merge-requests/68' of git://gitorious.org/rekonq/mainline ↵ | Andrea Diamantini | 2009-12-13 | 4 | -62/+78 |
|\ | | | | | | | | | | | | | into m68 Conflicts: src/walletwidget.cpp | ||||
| * | walletwidget on top of the webview (not over) | megabigbug | 2009-12-13 | 4 | -63/+79 |
| | | | | | | | | | | add close button add icons | ||||
* | | Merge commit 'refs/merge-requests/67' of git://gitorious.org/rekonq/mainline ↵ | Andrea Diamantini | 2009-12-13 | 1 | -13/+65 |
|\ \ | | | | | | | | | | into m67 | ||||
| * | | Further changes to the webkitsettings page | Panagiotis Papadopoulos | 2009-12-13 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' of git://gitorious.org/rekonq/mainline into ↵ | Panagiotis Papadopoulos | 2009-12-13 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | click-to-flash-ui | ||||
| * \ \ | Merge branch 'master' of git://gitorious.org/rekonq/mainline into ↵ | Panagiotis Papadopoulos | 2009-12-12 | 6 | -136/+164 |
| |\ \ \ | | | |/ | | |/| | | | | | click-to-flash-ui | ||||
| * | | | Merge branch 'master' of git://gitorious.org/rekonq/mainline into ↵ | Panagiotis Papadopoulos | 2009-12-09 | 27 | -151/+1047 |
| |\ \ \ | | | | | | | | | | | | | | | | click-to-flash-ui | ||||
| * | | | | Change a bit the WebKit settings UI | Panagiotis Papadopoulos | 2009-11-29 | 1 | -11/+63 |
| | | | | | | | | | | | | | | | | | | | | Not yet finished 100% | ||||
| * | | | | Change string wording | Panagiotis Papadopoulos | 2009-11-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | "Load animation" to "Load Plugin" | ||||
* | | | | | Load animation -> Load Plugin | Panagiotis Papadopoulos | 2009-12-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' of git://gitorious.org/rekonq/mainline into strings | Panagiotis Papadopoulos | 2009-12-13 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | set a valid e-mail adress for me | matgic78 | 2009-12-10 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' of git://gitorious.org/rekonq/mainline into strings | Panagiotis Papadopoulos | 2009-12-12 | 6 | -136/+164 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge commit 'refs/merge-requests/64' of git://gitorious.org/rekonq/mainline | Andrea Diamantini | 2009-12-10 | 1 | -4/+4 |
| |\ \ \ | |||||
| | * | | | Follow Qt rebranding and use the proper names / sites. | Thomas Zander | 2009-12-08 | 1 | -4/+4 |
| | | |/ | | |/| | |||||
| * | | | Merge commit 'refs/merge-requests/66' of git://gitorious.org/rekonq/mainline ↵ | Andrea Diamantini | 2009-12-10 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | into r66 | ||||
| | * | | | do not crash when closing WebView that didn't load successfully | Bernhard Beschow | 2009-12-09 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge commit 'refs/merge-requests/65' of git://gitorious.org/rekonq/mainline ↵ | Andrea Diamantini | 2009-12-10 | 4 | -131/+159 |
| |\ \ \ | | |/ / | |/| | | | | | | into r65 | ||||
| | * | | Rewrite NewTabPage to use QWebElement for page generation | matgic78 | 2009-12-09 | 4 | -131/+159 |
| | | | | |||||
* | | | | String fixes for the walletwidget | Panagiotis Papadopoulos | 2009-12-09 | 1 | -4/+4 |
|/ / / | |||||
* | | | xss attach prevention. | Andrea Diamantini | 2009-12-08 | 6 | -85/+49 |
|/ / | | | | | | | | | | | | | | | | | | | | | I have to say, BRUTE prevention :) Hope this works. Also some fixes in Urlbar class to ensure that a KUrl is a KUrl and a QString is a QString. Removed the annoying "restore url on focus out" feature. No other browsers have it and I really cannot understand gain | ||||
* | | KWebWallet integration | Andrea Diamantini | 2009-12-06 | 9 | -41/+89 |
| | | |||||
* | | kde wallet integration. | Andrea Diamantini | 2009-12-06 | 4 | -0/+149 |
| | | | | | | | | First bits | ||||
* | | Hide findBar after one minute | megabigbug | 2009-12-06 | 2 | -3/+10 |
| | | |||||
* | | trivial change in src/CMakeLists.txt | Andrea Diamantini | 2009-12-03 | 1 | -2/+1 |
| | | |||||
* | | Merge commit 'refs/merge-requests/62' of git://gitorious.org/rekonq/mainline ↵ | Andrea Diamantini | 2009-12-03 | 5 | -32/+171 |
|\ \ | | | | | | | | | | into AdFixes | ||||
| * | | fix copyright | matgic78 | 2009-12-02 | 2 | -3/+2 |
| | | | |||||
| * | | Docked web inspector | matgic78 | 2009-12-02 | 5 | -32/+172 |
| | | | |||||
* | | | push startup on disabled adblock (don't load filters) | Andrea Diamantini | 2009-12-02 | 1 | -2/+5 |
| | | | |||||
* | | | trade-off: speed vs mem saving. | Andrea Diamantini | 2009-12-02 | 3 | -22/+9 |
| | | | | | | | | | | | | This time I decided for speed.. | ||||
* | | | We have adblock! (and it works) | Andrea Diamantini | 2009-11-30 | 8 | -364/+291 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had a lot of problems implementing it because I started working on assuming 2 things: 1) konqueror implementation works (it's not true, I found a bug! To guess what, try loading current rekonq vs current konqueror against kde-apps.org) 2) Arora's implementation can be easily ported to kcm technology. Another wrong assumption, based on MVP implementation. Sorry for spamming master branch, guys. | ||||
* | | | Porting rekonq to last Qt/KDE API | Andrea Diamantini | 2009-11-30 | 11 | -8/+681 |
| | | | | | | | | | | | | adblock (KDE one) fix #1 | ||||
* | | | Restored QWebElementCollection | Andrea Diamantini | 2009-11-30 | 1 | -2/+2 |
| |/ |/| | | | | | My qt copy was too old.. | ||||
* | | Enabled load plugin manually as default settings | Andrea Diamantini | 2009-11-28 | 1 | -1/+1 |
| | | | | | | | | Someone worked a lot to implement it, it's right letting people seeing it.. | ||||
* | | Fixing clicktoflash code && license | Andrea Diamantini | 2009-11-28 | 2 | -6/+54 |
| | | |||||
* | | Merge commit 'refs/merge-requests/2237' of ↵ | Andrea Diamantini | 2009-11-28 | 8 | -29/+275 |
|\ \ | | | | | | | | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into FLASH Conflicts: src/CMakeLists.txt | ||||
| * | | clicktoflash : more cleanup | matgic78 | 2009-11-27 | 3 | -15/+6 |
| | | | |||||
| * | | clicktoflash : cleanup | matgic78 | 2009-11-27 | 4 | -64/+36 |
| | | | |||||
| * | | make clicktoflash optionnal | matgic78 | 2009-11-27 | 4 | -22/+42 |
| | | | |||||
| * | | clicktoflash : step 2 make it work when there are more than one plugin in ↵ | matgic78 | 2009-11-27 | 3 | -9/+34 |
| | | | | | | | | | | | | the same page | ||||
| * | | ClickToFlash : first step | matgic78 | 2009-11-27 | 5 | -27/+266 |
| |/ | | | | | | | For now, no config and only working when there is only one flash in the page | ||||
* | | removed current bugged adblock implementation. | Andrea Diamantini | 2009-11-28 | 9 | -657/+1 |
|/ | | | | Sorry about that :( | ||||
* | src/CMakeLists.txt fix | Andrea Diamantini | 2009-11-27 | 1 | -1/+0 |
| | |||||
* | Last structure change, promised! | Andrea Diamantini | 2009-11-27 | 27 | -30/+34 |
| | | | | | | | Anyway, this moving/renaming helped me finding lots of strange circulary dependencies and easily solve them :) We have also a more organized structure, hopefully letting people work on different areas altogether. | ||||
* | Moving (back?) to konqueror adblock support. | Andrea Diamantini | 2009-11-25 | 11 | -436/+379 |
| | | | | | This will be useful (if someone is interested) in pushing our patches directly on khtml filter engine. | ||||
* | Last history fixes | Andrea Diamantini | 2009-11-25 | 7 | -338/+1 |
| | |||||
* | Fix headers | Andrea Diamantini | 2009-11-24 | 1 | -1/+0 |
| | |||||
* | Created a new history dir and changed "panelhistory" terms in | Andrea Diamantini | 2009-11-24 | 9 | -26/+26 |
| | | | | the more English "HistoryPanel" ones | ||||
* | Merge branch 'devAdBlock' | Andrea Diamantini | 2009-11-23 | 17 | -37/+886 |
|\ | |||||
| * | Saving 4 bytes per tab :) | Andrea Diamantini | 2009-11-23 | 3 | -20/+16 |
| | |