Fixing conflicts merging master

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 56 insertions, 0 deletions

diff --git a/TODO b/TODO
new file mode 100644
index 00000000..b883b7d8
--- /dev/null
+++ b/TODO
@@ -0,0 +1,56 @@
+To 0.0.5
+DONE tabbar: fixed dimension
+DONE tabbar: hide if just one
+DONE bookmarks tabbar update
+DONE loading right bookmark file
+DONE Added Google Suggestions
+DONE notfound.html shown if rekonq doesn't load connection
+DONE improve fullscreen
+DONE QNetworkDiskCache
+DONE loading right sites as "external browser" (rekonq %u)
+DONE provide translations structure
+DONE disable BACK button when history is NULL
+DONE load just ONE site at start
+- QWebFrame
+DONE(?) definitely fix fonts!
+DONE tab-reordering
+- focus on new tab just if no site loaded
+DONE provide konqueror-like
+    - confirmation exit dialog
+    - 
+DONE import arora loading label
+
+DONE redesign settings
+DONE fix private browsing action
+DONE fix web inspector action
+
+DONE loading ONE site when calling rekonq..
+
+- fix crash on example sites..
+- improve DOCUMENTATION
+DONE fix Action on tabbar (clone ads)
+- Type "FormSubmitted" (WordPress)
+DONE check statusbar slots
+- fix fonts
+
+
++ ------------------------
+
+LONG TERM FIXES
+- cookies
+- history (io-slave)
+- file protocol view
+
+- new bookmarks system
+- check mainview signals
+
+- to 0.1alpha
+    - checking focus question
+    - bookmarks panel
+    - copyright question (ALMOST DONE)
+    - loading urlbar (DONE)
+    - fullscreen action impr (DONE)
+    - mailto KDE loading (DONE)
+    - unit tests
+    - webview Arora tmp fix (DONE)
+    - ?