summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'refs/merge-requests/71' of git://gitorious.org/rekonq/mainline ↵Andrea Diamantini2009-12-154-26/+39
|\ \ | | | | | | | | | into m71
| * | create walletwidget only when necessarymegabigbug2009-12-144-26/+39
| |/
* | Simpler web classes (but no more friends :)Andrea Diamantini2009-12-153-23/+7
|/ | | | Moved remaining code to kdewebkit
* Fix stringAndrea Diamantini2009-12-141-1/+1
|
* clean up creation of WebView:Bernhard Beschow2009-12-143-55/+45
| | | | | | * remove pointer to messageBar in WebView, don't even hand messageBar over to WebView constructor * add WalletWidget to messageBar outside of WebView constructor * hide the walletBar, but not the whole messageBar
* move KWallet integration into WebPageBernhard Beschow2009-12-143-8/+15
|
* Moved url storing operation (add to history) in the loadUrl function,Andrea Diamantini2009-12-142-8/+8
| | | | | after uri filters. This way we stored everytime the "real" url we load :)
* Just some stupid fixesAndrea Diamantini2009-12-148-238/+352
|
* Merge commit 'refs/merge-requests/69' of git://gitorious.org/rekonq/mainline ↵Andrea Diamantini2009-12-132-6/+4
|\ | | | | | | | | | | | | into m69 Conflicts: src/walletwidget.cpp
| * fix i18n issue in wallet messagemegabigbug2009-12-132-6/+3
| | | | | | | | fix ctor warning in webview
* | Merge commit 'refs/merge-requests/68' of git://gitorious.org/rekonq/mainline ↵Andrea Diamantini2009-12-134-62/+78
|\ \ | |/ | | | | | | | | | | into m68 Conflicts: src/walletwidget.cpp
| * walletwidget on top of the webview (not over)megabigbug2009-12-134-63/+79
| | | | | | | | | | add close button add icons
* | Merge commit 'refs/merge-requests/67' of git://gitorious.org/rekonq/mainline ↵Andrea Diamantini2009-12-131-13/+65
|\ \ | | | | | | | | | into m67
| * | Further changes to the webkitsettings pagePanagiotis Papadopoulos2009-12-131-3/+3
| | |
| * | Merge branch 'master' of git://gitorious.org/rekonq/mainline into ↵Panagiotis Papadopoulos2009-12-131-1/+1
| |\ \ | | | | | | | | | | | | click-to-flash-ui
| * \ \ Merge branch 'master' of git://gitorious.org/rekonq/mainline into ↵Panagiotis Papadopoulos2009-12-126-136/+164
| |\ \ \ | | | |/ | | |/| | | | | click-to-flash-ui
| * | | Merge branch 'master' of git://gitorious.org/rekonq/mainline into ↵Panagiotis Papadopoulos2009-12-0927-151/+1047
| |\ \ \ | | | | | | | | | | | | | | | click-to-flash-ui
| * | | | Change a bit the WebKit settings UIPanagiotis Papadopoulos2009-11-291-11/+63
| | | | | | | | | | | | | | | | | | | | Not yet finished 100%
| * | | | Change string wordingPanagiotis Papadopoulos2009-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | "Load animation" to "Load Plugin"
* | | | | Load animation -> Load PluginPanagiotis Papadopoulos2009-12-131-1/+1
| | | | |
* | | | | Merge branch 'master' of git://gitorious.org/rekonq/mainline into stringsPanagiotis Papadopoulos2009-12-131-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | set a valid e-mail adress for mematgic782009-12-101-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' of git://gitorious.org/rekonq/mainline into stringsPanagiotis Papadopoulos2009-12-126-136/+164
|\ \ \ \ | |/ / /
| * | | Merge commit 'refs/merge-requests/64' of git://gitorious.org/rekonq/mainlineAndrea Diamantini2009-12-101-4/+4
| |\ \ \
| | * | | Follow Qt rebranding and use the proper names / sites.Thomas Zander2009-12-081-4/+4
| | | |/ | | |/|
| * | | Merge commit 'refs/merge-requests/66' of git://gitorious.org/rekonq/mainline ↵Andrea Diamantini2009-12-101-1/+1
| |\ \ \ | | | | | | | | | | | | | | | into r66
| | * | | do not crash when closing WebView that didn't load successfullyBernhard Beschow2009-12-091-1/+1
| | |/ /
| * | | Merge commit 'refs/merge-requests/65' of git://gitorious.org/rekonq/mainline ↵Andrea Diamantini2009-12-104-131/+159
| |\ \ \ | | |/ / | |/| | | | | | into r65
| | * | Rewrite NewTabPage to use QWebElement for page generationmatgic782009-12-094-131/+159
| | | |
* | | | String fixes for the walletwidgetPanagiotis Papadopoulos2009-12-091-4/+4
|/ / /
* | | xss attach prevention.Andrea Diamantini2009-12-086-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 integrationAndrea Diamantini2009-12-069-41/+89
| |
* | kde wallet integration.Andrea Diamantini2009-12-064-0/+149
| | | | | | | | First bits
* | Hide findBar after one minutemegabigbug2009-12-062-3/+10
| |
* | trivial change in src/CMakeLists.txtAndrea Diamantini2009-12-031-2/+1
| |
* | Merge commit 'refs/merge-requests/62' of git://gitorious.org/rekonq/mainline ↵Andrea Diamantini2009-12-035-32/+171
|\ \ | | | | | | | | | into AdFixes
| * | fix copyrightmatgic782009-12-022-3/+2
| | |
| * | Docked web inspectormatgic782009-12-025-32/+172
| | |
* | | push startup on disabled adblock (don't load filters)Andrea Diamantini2009-12-021-2/+5
| | |
* | | trade-off: speed vs mem saving.Andrea Diamantini2009-12-023-22/+9
| | | | | | | | | | | | This time I decided for speed..
* | | We have adblock! (and it works)Andrea Diamantini2009-11-308-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 APIAndrea Diamantini2009-11-3011-8/+681
| | | | | | | | | | | | adblock (KDE one) fix #1
* | | Restored QWebElementCollectionAndrea Diamantini2009-11-301-2/+2
| |/ |/| | | | | My qt copy was too old..
* | Enabled load plugin manually as default settingsAndrea Diamantini2009-11-281-1/+1
| | | | | | | | Someone worked a lot to implement it, it's right letting people seeing it..
* | Fixing clicktoflash code && licenseAndrea Diamantini2009-11-282-6/+54
| |
* | Merge commit 'refs/merge-requests/2237' of ↵Andrea Diamantini2009-11-288-29/+275
|\ \ | | | | | | | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into FLASH Conflicts: src/CMakeLists.txt
| * | clicktoflash : more cleanupmatgic782009-11-273-15/+6
| | |
| * | clicktoflash : cleanupmatgic782009-11-274-64/+36
| | |
| * | make clicktoflash optionnalmatgic782009-11-274-22/+42
| | |
| * | clicktoflash : step 2 make it work when there are more than one plugin in ↵matgic782009-11-273-9/+34
| | | | | | | | | | | | the same page