Commit graph

9010 commits

Author SHA1 Message Date
Albert Astals Cid
c9a896543a Remove my debug stuff, need to talk to ben before carrying on 2013-03-07 02:14:41 +01:00
Albert Astals Cid
19c61d53fa Try to find out why jenkins thinks has sessions to restore 2013-03-07 02:03:09 +01:00
Albert Astals Cid
b2c20a7b20 More debugging of where the unit test hangs
I have a hunch is because of askUserToRestoreAutosavedAbandonedSessions
2013-03-07 01:43:36 +01:00
Albert Astals Cid
dd0068a5aa Add some debugs to try to find where the test in jenkins dies 2013-03-07 01:22:46 +01:00
Script Kiddy
f90fc94304 SVN_SILENT made messages (.desktop file) 2013-02-24 13:53:42 +01:00
Script Kiddy
d24c6fea78 SVN_SILENT made messages (.desktop file) 2013-02-24 08:13:35 +01:00
Script Kiddy
6ab5d58f27 SVN_SILENT made messages (.desktop file) 2013-02-22 17:54:48 +01:00
Script Kiddy
a4092f2aa2 SVN_SILENT made messages (.desktop file) 2013-02-22 06:41:23 +01:00
Thiago Macieira
81f7f6ac23 Make sure we find X11 libraries.
Both Konqueror and the folderview applet use X11 functions directly so
we need to make sure CMake is finding it. Right now, this works
because Qt4ConfigDependentSettings.cmake that is distributed with KDE
does an indirect find_package. The one in upstream CMake does not, so
it's a ticking time bomb and depends on installation configuration.
2013-02-18 08:59:10 -08:00
Frank Reininghaus
3cd883c1b0 Merge remote-tracking branch 'origin/KDE/4.10' 2013-02-17 12:17:01 +01:00
Dawit Alemayehu
1cdbf2e53f Connect to the returnPressed signal if completionMode == CompletionNone.
BUG: 314736
FIXED-IN: 4.10.1
REVIEW: 108983
2013-02-16 11:59:02 -05:00
Script Kiddy
5a869844be SVN_SILENT made messages (.desktop file) 2013-02-13 00:30:21 +01:00
Script Kiddy
74909c91d3 SVN_SILENT made messages (.desktop file) 2013-02-12 01:23:16 +01:00
Script Kiddy
f88994cf6d SVN_SILENT made messages (.desktop file) 2013-02-11 11:22:32 +01:00
Frank Reininghaus
601a9909cd Merge remote-tracking branch 'origin/KDE/4.10' 2013-02-10 19:27:21 +01:00
Script Kiddy
3cb65083a9 SVN_SILENT made messages (.desktop file) 2013-02-09 13:38:25 +01:00
Script Kiddy
03e0c3066b SVN_SILENT made messages (.desktop file) 2013-02-09 09:01:22 +01:00
Script Kiddy
4a9e2a30be SVN_SILENT made messages (.desktop file) 2013-02-08 13:01:31 +01:00
Script Kiddy
92859e8806 SVN_SILENT made messages (.desktop file) 2013-02-08 08:24:30 +01:00
Script Kiddy
39d262fd63 SVN_SILENT made messages (.desktop file) 2013-02-07 13:25:42 +01:00
Script Kiddy
2169cd904a SVN_SILENT made messages (.desktop file) 2013-02-07 08:52:03 +01:00
Script Kiddy
6ec3cd628f SVN_SILENT made messages (.desktop file) 2013-02-06 12:55:26 +01:00
Script Kiddy
038b6f2949 SVN_SILENT made messages (.desktop file) 2013-02-06 08:13:36 +01:00
Script Kiddy
615d1cc161 SVN_SILENT made messages (.desktop file) 2013-02-05 21:24:47 +01:00
Script Kiddy
9f6f992b41 SVN_SILENT made messages (.desktop file) 2013-02-05 16:51:05 +01:00
Script Kiddy
eb29c17215 SVN_SILENT made messages (.desktop file) 2013-02-04 13:43:06 +01:00
Script Kiddy
6ffd4d85ab SVN_SILENT made messages (.desktop file) 2013-02-01 08:45:36 +01:00
Script Kiddy
df5cccebb6 SVN_SILENT made messages (.desktop file) 2013-01-31 16:26:13 +01:00
Script Kiddy
d3b4f6bc19 SVN_SILENT made messages (.desktop file) 2013-01-31 11:52:42 +01:00
Frank Reininghaus
3e90a20ba9 Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	dolphin/src/tests/kfileitemmodeltest.cpp
2013-01-30 21:06:34 +01:00
Script Kiddy
298cb62728 SVN_SILENT made messages (.desktop file) 2013-01-30 16:21:26 +01:00
Script Kiddy
42f9401ca9 SVN_SILENT made messages (.desktop file) 2013-01-30 11:58:13 +01:00
Script Kiddy
ec68887d4b SVN_SILENT made messages (.desktop file) 2013-01-29 21:08:34 +01:00
Script Kiddy
cf4b84a8f6 SVN_SILENT made messages (.desktop file) 2013-01-28 08:44:17 +01:00
Frank Reininghaus
cf8a08fcd2 Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	dolphin/src/tests/kfileitemmodeltest.cpp
2013-01-27 15:25:47 +01:00
Script Kiddy
435bc19c0e SVN_SILENT made messages (.desktop file) 2013-01-27 12:59:07 +01:00
Script Kiddy
a19d4cdd4f SVN_SILENT made messages (.desktop file) 2013-01-21 12:43:59 +01:00
Script Kiddy
d9c87da1eb SVN_SILENT made messages (.desktop file) 2013-01-21 08:16:28 +01:00
Script Kiddy
e62bf400b5 SVN_SILENT made messages (.desktop file) 2013-01-20 11:55:12 +01:00
Script Kiddy
c0784ee3f9 SVN_SILENT made messages (.desktop file) 2013-01-20 07:49:24 +01:00
Script Kiddy
e8260ebc81 SVN_SILENT made messages (.desktop file) 2013-01-18 08:05:47 +01:00
Script Kiddy
b273d42c4f SVN_SILENT made messages (.desktop file) 2013-01-17 12:48:56 +01:00
Script Kiddy
3c26839222 SVN_SILENT made messages (.desktop file) 2013-01-17 08:10:20 +01:00
Luca Beltrame
bd9de960b0 Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-16 23:42:25 +01:00
Script Kiddy
98bcd3af23 SVN_SILENT made messages (.desktop file) 2013-01-16 12:34:10 +01:00
André Marcelo Alvarenga
bd12613bac Remove extra spaces 2013-01-15 23:05:26 -02:00
Script Kiddy
e914b384d4 SVN_SILENT made messages (.desktop file) 2013-01-15 16:08:59 +01:00
Script Kiddy
3d989309d2 SVN_SILENT made messages (.desktop file) 2013-01-14 08:25:57 +01:00
Script Kiddy
4328fcd754 SVN_SILENT made messages (.desktop file) 2013-01-13 08:03:32 +01:00
Script Kiddy
5ccc6c70ed SVN_SILENT made messages (.desktop file) 2013-01-11 12:32:38 +01:00
Script Kiddy
90caebf153 SVN_SILENT made messages (.desktop file) 2013-01-11 08:13:08 +01:00
Script Kiddy
d8ab9f5c43 SVN_SILENT made messages (.desktop file) 2013-01-10 12:19:18 +01:00
Script Kiddy
a7c28fd739 SVN_SILENT made messages (.desktop file) 2013-01-10 07:53:58 +01:00
Script Kiddy
7745911c7b SVN_SILENT made messages (.desktop file) 2013-01-09 09:31:50 +01:00
Script Kiddy
08db5c0060 SVN_SILENT made messages (.desktop file) 2013-01-08 17:15:07 +01:00
Christophe Giboudeaux
8aafe88505 Merge branch 'KDE/4.10'
Conflicts:
	dolphin/src/CMakeLists.txt
2013-01-07 18:22:28 +01:00
Script Kiddy
94d2db8d00 SVN_SILENT made messages (.desktop file) 2013-01-06 07:28:57 +01:00
David Faure
907cefa164 autoupdate is on by default, remove unnecessary calls 2013-01-04 22:11:31 +01:00
Dawit Alemayehu
506874cee8 Properly address the activation problem of tabs opened in the background.
BUG: 306417
FIXED-IN: 4.10 RC2 (4.9.97)
REVIEW: 107048
2013-01-03 01:30:53 -05:00
Christophe Giboudeaux
28a918ae57 Merge branch 'KDE/4.10'
Conflicts:
	dolphin/src/CMakeLists.txt
2013-01-02 15:28:43 +01:00
Guillaume de Bure
a77ff2d7cb Add some more usar agents files for browser identity spoofing 2012-12-31 16:22:38 +01:00
Script Kiddy
b3d90a1ca5 SVN_SILENT made messages (.desktop file) 2012-12-29 07:52:44 +01:00
Frank Reininghaus
4df98b6487 Merge remote-tracking branch 'origin/KDE/4.10' 2012-12-27 22:21:45 +01:00
Script Kiddy
acc1b231e9 SVN_SILENT made messages (.desktop file) 2012-12-27 07:40:57 +01:00
Script Kiddy
a8c475eefa SVN_SILENT made messages (.desktop file) 2012-12-24 08:54:15 +01:00
Jekyll Wu
40b049728d Make the "Sesion name" lineedit get input focus by defaut
It felt awkward to press TAB first to make the lineedit get input focus.
2012-12-23 22:40:59 +08:00
Script Kiddy
1a3fc37886 SVN_SILENT made messages (.desktop file) 2012-12-23 07:50:02 +01:00
Script Kiddy
a0330ee72b SVN_SILENT made messages (.desktop file) 2012-12-22 08:05:56 +01:00
Frank Reininghaus
523d857996 Merge remote-tracking branch 'origin/KDE/4.9' 2012-12-13 22:34:38 +01:00
Script Kiddy
2ec0a675d7 SVN_SILENT made messages (.desktop file) 2012-12-10 11:27:21 +01:00
Script Kiddy
6f2a295092 SVN_SILENT made messages (.desktop file) 2012-12-10 07:32:47 +01:00
Dawit Alemayehu
3ddc66ab8d Do not crash if the system configuration cache (syscoca) is corrupt and the user
launched to the preferences window.

BUG: 310653
FIXED-IN: 4.9.5
REVIEW: 107642
2012-12-10 00:01:14 -05:00
Jekyll Wu
eb05cf9ddd Remove two oudated kconf_update scripts
The two are from more than 10 years ago. No need to keep them any
more.
2012-12-07 04:46:29 +08:00
Script Kiddy
9ed42383ac SVN_SILENT made messages (.desktop file) 2012-11-30 07:36:32 +01:00
David Faure
14cb9e87f7 Merge remote-tracking branch 'origin/KDE/4.9' 2012-11-28 16:40:07 +01:00
David Faure
8c3c7e537d Fix konqueror 'nepomuksearch:/?query=Coldplay', the query was stripped.
The code in nameFilter was confusing this with /tmp/?foo which can be used
as a name filter (for "afoo"). If the typed URL does exist, then we don't
want to strip the query, only if it gets turned into a name filter.
2012-11-28 16:24:34 +01:00
Luca Beltrame
c025154bce Merge branch 'KDE/4.9'
Conflicts:
	konqueror/settings/kio/kcookiespolicies.cpp [master only changes]
	konqueror/settings/kio/kcookiespolicies.h [ditto]
2012-11-20 07:44:59 +01:00
Dawit Alemayehu
f1180645da Prevent activation of tabs that were opened in the background.
BUG: 306417
FIXED-IN: 4.9.3
REVIEW:107048
2012-11-15 11:09:31 -05:00
Dawit Alemayehu
71f411a4ee Do not crash when global policy is changed and the Apply button is pressed.
BUG: 307831
FIXED-IN: 4.9.4
2012-11-10 16:37:15 -05:00
Pino Toscano
277452e01b konq: include the kactivities include dir, if found 2012-10-18 20:50:04 +02:00
Ivan Čukić
ff21d2c529 Konqueror reports the open/close document events to activity manager daemon.
By knowing which window contains which documents and which one is in
focus, we can do the following:

- collect the statistics about visited pages. Further, this provides a
score for each document visited, that depends on the number of times it
was open, the time the user spent on that location, and the time passed
since the last visit.
- availability of a global/workspace applet that allows sharing the
current document via e-mail, social networks; bookmarking and rating the
link, or connecting it to the current activity. (advantage of this is a
        unified UI for sharing/rating/linking that works with any
        application)
- jump-lists (not impl. yet in plasma) to list top rated documents on a
launcher icon or in the task manager applet
- krunner can sort the documents based on the score
- more things that I haven't thought of yet

There is no need to *use* ativities to have these benefits. Activities
just serve as manual data clustering to provide more useful scores
compared to the one-activity approach.

REVIEW:106908
2012-10-18 12:54:45 +02:00
Dawit Alemayehu
a469cd9847 Merge remote-tracking branch 'origin/KDE/4.9' 2012-10-16 00:38:13 -04:00
Dawit Alemayehu
04c8abf5bb Changed #ifdef to #if in previous commit, rf8309be. 2012-10-16 00:02:11 -04:00
Pino Toscano
59eee05a15 Merge remote-tracking branch 'origin/KDE/4.9' 2012-10-13 09:27:54 +02:00
Dawit Alemayehu
f8309bec73 If the "Middle click on tab to close" option is checked, do not select the
tab when the MMB is clicked on it. Instead simply close the tab.

BUG: 264058
FIXED-IN: 4.9.3
REVIEW: 106615
2012-10-12 17:55:39 -04:00
Pino Toscano
ac70302ee0 Revert "In the session restore dialog, allow the user to select which sessions should"
Not meant for 4.9.
CCBUG: 260282

This reverts commit a78c6a50dc.
2012-10-12 13:12:28 +02:00
Dawit Alemayehu
a78c6a50dc In the session restore dialog, allow the user to select which sessions should
be restored.

BUG: 260282
FIXED-IN: 4.10
REVIEW: 106503
GUI: new strings
DIGEST: Ability to select the session(s) to be restored in Konqueror.
(cherry picked from commit 0142a8ca11)
2012-10-11 22:08:29 -04:00
Dawit Alemayehu
0142a8ca11 In the session restore dialog, allow the user to select which sessions should
be restored.

BUG: 260282
FIXED-IN: 4.10
REVIEW: 106503
GUI: new strings
DIGEST: Ability to select the session(s) to be restored in Konqueror.
2012-10-09 19:02:17 -04:00
Dawit Alemayehu
a6d9370e01 Removed Q_ASSERT because apparently item can be null.
BUG: 307890
FIXED-IN: 4.10
2012-10-05 09:07:31 -04:00
Dawit Alemayehu
2e6aa88630 Make it compile 2012-10-04 22:22:00 -04:00
Dawit Alemayehu
61d0fe391b - Renamed a button text from "Change Policy" to "Configure Policy" because it
allows you to either add or modify a new policy from the management dialog.

- Enable/disable the policy domain edit and ok button as needed. The user will
  no longer be allowed to change the domain of existing policies.

- Renamed a couple of UI variable name to refelect their actual purpose.
2012-10-04 20:18:37 -04:00
Dawit Alemayehu
a791edd3d4 Do not crash when global policy is changed and the Apply button is pressed.
BUG: 307831
FIXED-IN: 4.10
2012-10-04 20:18:37 -04:00
Christoph Feck
66ddefe615 SVN_SILENT compile
Thanks for the fast fixes, had to correct this one, please check.
CCMAIL: adawit@kde.org
2012-10-05 01:58:09 +02:00
Dawit Alemayehu
f1ef7f10cd Make the per domain cookie policy configuration dialog refelect any current policy
set for the selected domain.

BUG: 307835
FIXED-IN: 4.10
2012-10-04 18:15:00 -04:00
Dawit Alemayehu
643a84000f Enable change policy button only when the domain entry is clicked.
BUG: 307834
FIXED-IN:4.10
2012-10-04 18:14:59 -04:00
Dawit Alemayehu
d5ec286aa0 Merge branch '4.9' 2012-10-03 15:09:58 -04:00
Dawit Alemayehu
930e19b9a7 Added configuration option for accepting cookies until end of session per
globally (default) or per domain. This is the configuration part of the change
that was made to the cookiejar with the following commit:

http://commits.kde.org/kdelibs/ef269fdee33113354776693089c26f73093658a5

BUG:54300
FIXED-IN:4.10
REVIEW:106619
2012-09-30 13:20:29 -04:00
Script Kiddy
15c66cafb7 SVN_SILENT made messages (.desktop file) 2012-09-29 11:32:51 +02:00
Dawit Alemayehu
bf9448c422 Make the reset button work 2012-09-28 00:55:43 -04:00
Dawit Alemayehu
3eabe8703f Merge branch '4.9' 2012-09-27 17:48:56 -04:00