Olivier Goffart
29fecb029e
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
src/gui/accountsettings.cpp
src/gui/accountsettings.h
2015-06-25 12:30:52 +02:00
Jenkins for ownCloud
13a15a6256
[tx-robot] updated from transifex
2015-06-25 02:18:56 -04:00
Olivier Goffart
494f08de8c
Theme: add a non-inline destructor
...
That way we do not need to include QIcon in theme.h
So the header can be included (indirrectly) from cmd.cpp
which is not compiled with the QtGui include paths
2015-06-24 10:14:55 +02:00
Jenkins for ownCloud
678b6affa2
[tx-robot] updated from transifex
2015-06-24 02:18:58 -04:00
Klaas Freitag
1fa5fa91a8
Added removal of *.tmp to Changelog.
2015-06-23 14:31:06 +02:00
Klaas Freitag
fc99070b54
Revert "Exclude *.tmp (as requested in #2424 )"
...
Too many people complained about that the entry can not be removed
if this should be synced. Users that want that one be synced please
add it to the user exclude list.
This reverts commit 5860e5a46b
2015-06-23 14:08:46 +02:00
Markus Goetz
4d21800a05
Merge pull request #3365 from owncloud/LukasReschke-patch-1
...
Add CI job state
2015-06-23 11:26:39 +02:00
Lukas Reschke
e3278c8312
Add CI job state
2015-06-23 11:07:27 +02:00
Jenkins for ownCloud
eca3d48510
[tx-robot] updated from transifex
2015-06-23 02:19:02 -04:00
Olivier Goffart
c56cb2235c
Missing EXPORT macro
2015-06-23 00:53:32 +02:00
Daniel Molkentin
bf9bb26d19
Bump to 1.8.3 final
2015-06-22 16:28:35 +02:00
Daniel Molkentin
01efba99af
Bump to 1.8.3rc3, update ChangeLog
2015-06-22 08:44:29 +02:00
Jenkins for ownCloud
6e469662d3
[tx-robot] updated from transifex
2015-06-22 02:18:53 -04:00
Jenkins for ownCloud
4bc94c17ea
[tx-robot] updated from transifex
2015-06-21 02:18:54 -04:00
Jenkins for ownCloud
1820d4018e
[tx-robot] updated from transifex
2015-06-20 02:19:01 -04:00
Christian Kamm
f130a2716e
Update: Check exclusion when reading from db. #3172
2015-06-19 14:58:47 +02:00
Christian Kamm
deb5e68e15
Ignores: Force a remote discovery after ignore list change #3172
...
The problem was that the modified ignore pattern was not applied
to the parts of the remote tree we simply retrieve from the db
because the folder etag didn't change.
Even worse, if one removed an ignore pattern, the un-ignored
files would not be synced correctly.
With this change, a modification to the ignore list always results
in a full remote discovery. This guarantees that we find un-ignored
files.
2015-06-19 14:58:47 +02:00
Jocelyn Turcotte
9a9897ea1e
Shibboleth: Let the webview use its own QNAM #3359
...
Since we periodically recreatet the QNAM owned by the Account,
the web view could end up holding a dangling pointer to it.
Let the web view use its own QNAM, but make sure that the cookie
jars are shared so that we can grab the session token given
by the server.
2015-06-19 12:33:11 +02:00
Olivier Goffart
bb85db6cc5
Fix windows build
2015-06-18 10:24:40 +02:00
Jenkins for ownCloud
deea902c4f
[tx-robot] updated from transifex
2015-06-18 02:18:59 -04:00
Olivier Goffart
dd5ddf2166
AbstractNetworkJob: move to its own file
2015-06-17 17:29:11 +02:00
Daniel Molkentin
42513af536
Bump to rc2
2015-06-17 17:13:22 +02:00
Klaas Freitag
79cc902673
FolderMan: Save migratated folder definitions to Configfile.
2015-06-17 14:54:51 +02:00
Klaas Freitag
214bc6b29b
Folder: Simplify Folder constructor: No need for AccountState.
...
Do not pass AccountState in constructor of Folder, set with a
new method called setAccountState after creation. Thus the
parameter does not need to be passed through all over.
2015-06-17 14:54:51 +02:00
Christian Kamm
84bae92264
AccountSettings: Fix initial visibility of sel sync panel #3355
2015-06-17 14:43:38 +02:00
Christian Kamm
191d66fc6f
Propagator: Add entry with dummy etag on local mkdir. #2761
2015-06-17 14:38:51 +02:00
Olivier Goffart
c11358219a
FolderStatusModel: fix a coverity warning
2015-06-17 12:46:49 +02:00
Christian Kamm
28d6d0dc1e
Download: Gracefully skip files with 404. #2227
2015-06-17 12:24:21 +02:00
Christian Kamm
5f44218727
Reconcile: Update db entry for new dirs. #2761
...
Previously a EVAL_RENAME that was changed to NEW could end up
being propagated but not added to the database.
2015-06-17 11:53:38 +02:00
Jenkins for ownCloud
676a2ff8ca
[tx-robot] updated from transifex
2015-06-17 02:18:55 -04:00
Olivier Goffart
d902a37dfd
Fix Qt4 compilation
...
This header is not included in Qt4's QAbstractItemModel header
2015-06-16 12:14:04 +02:00
Olivier Goffart
0cfc518c33
Fix coverity build which does not support nsdmi
2015-06-16 09:30:29 +02:00
Jenkins for ownCloud
1e56349838
[tx-robot] updated from transifex
2015-06-16 02:19:00 -04:00
Olivier Goffart
f8cbed34c2
Should fix coverity build
...
Issue #3346
2015-06-15 17:59:08 +02:00
Olivier Goffart
2e177590a6
libsync: Remove some Theme dependency
...
Theme will eventually be moved to the GUI
Theme::appNameGUI and QApplicaiton::applicationName are the same, it is currently
set in the constructor of ConfigFile
2015-06-15 17:39:28 +02:00
Olivier Goffart
7f0735a955
Account: don't use the Theme from the account
...
The Theme will be moved to GUI
The server URL is anyway overriden by the wizard or the accountmanager
2015-06-15 17:39:28 +02:00
Olivier Goffart
ce0a0e3f0d
Credential: move the implementation to the gui
2015-06-15 17:39:28 +02:00
Olivier Goffart
6e337ad242
Move Account::settings to AccountState::settings
...
It is only used by the GUI. Also return a unique_ptr to make the ownership clearer
2015-06-15 17:39:28 +02:00
Klaas Freitag
758a820b0c
csync: only define S_ defines if they are undefined.
2015-06-15 14:55:02 +02:00
Olivier Goffart
e321280eae
AccountManager: remove export macro
2015-06-15 14:53:36 +02:00
Olivier Goffart
3c8409ee69
CMakeList: change the message to indicate that newer versions of Qt are good too
...
The current message sounds like you need 5.4, but 5.5 would work too
2015-06-15 14:28:11 +02:00
Olivier Goffart
a3c543a627
Move FolderStatusDelegate to its own file
2015-06-15 14:16:21 +02:00
Olivier Goffart
8bcd0261dc
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
2015-06-15 14:03:46 +02:00
Jenkins for ownCloud
33b8064042
[tx-robot] updated from transifex
2015-06-15 02:18:42 -04:00
Olivier Goffart
bea8896012
Merge remote-tracking branch 'origin/master' into new-ui
2015-06-14 10:39:30 +02:00
Jenkins for ownCloud
1f5170253c
[tx-robot] updated from transifex
2015-06-14 02:18:42 -04:00
Olivier Goffart
1dabdc7df1
discoveryphase: initialize DiscoveryMainThread::_currentGetSizeResult
2015-06-12 14:43:18 +02:00
Olivier Goffart
11c8415cd6
Coverity do not support non-static data initializer
...
Fixes #3337
2015-06-12 13:57:17 +02:00
Lukas Reschke
bc0f1f131f
Cleanup travis build file
2015-06-12 13:22:08 +02:00
Olivier Goffart
81c10da8dc
Accountsettings: Show a notification when there are new unconfirmed folders
2015-06-12 12:19:24 +02:00
