Daniel Molkentin
48097467f9
CMake: fix CMake 2.6 compatibility
...
... by replacing CONFIG by NO_MODULE option in find package
From the manual: "The CONFIG option may be used to skip Module mode
explicitly and switch to Config mode. It is synonymous to using
NO_MODULE."
2015-11-30 01:05:12 +01:00
Daniel Molkentin
895f0b29aa
Merge remote-tracking branch 'origin/2.1'
2015-11-30 00:47:10 +01:00
Jenkins for ownCloud
499400916d
[tx-robot] updated from transifex
2015-11-29 02:19:01 -05:00
Jenkins for ownCloud
3f0d575df7
[tx-robot] updated from transifex
2015-11-28 02:19:04 -05:00
Roeland Douma
4cb9d6763b
Merge pull request #4213 from owncloud/fix-share-dialog-displaynames-2.1
...
show displaynames of users in share dialog instead of userid
2015-11-27 15:37:54 +01:00
Arthur Schiwon
d62c51890e
show displaynames of users in share dialog instead of userid
2015-11-27 15:19:39 +01:00
Jenkins for ownCloud
10707c8288
[tx-robot] updated from transifex
2015-11-27 02:19:17 -05:00
Klaas Freitag
b896d8aa15
ActivityWidget: Fix type ( #4204 )
2015-11-26 21:41:31 +01:00
Christian Kamm
9e66a6bec6
Settings dialog: Fix crash when deleting account #4202
2015-11-26 13:27:20 +01:00
Klaas Freitag
17566febe9
Updated Changelog
2015-11-26 13:24:36 +01:00
Jürgen Weigert
f54f48615d
Update building.rst
...
ah, and the instructions miss the 'cd client' before git submodule init.
2015-11-26 12:06:32 +01:00
Jürgen Weigert
06bb97e6d9
Update building.rst
2015-11-26 12:02:23 +01:00
Jürgen Weigert
0763f65329
improved linux build instructions.
...
I am using :: lists, as the `` versions mangle multi-line commands all in one long line.
The cmake command should just end in .., not in ../client
2015-11-26 11:55:23 +01:00
Jenkins for ownCloud
db5a86bc06
[tx-robot] updated from transifex
2015-11-26 02:19:03 -05:00
Daniel Molkentin
2d604cee25
Qt: Add Windows-specific patches OBS, also a QNAM fix
2015-11-25 22:36:37 +01:00
Klaas Freitag
e3a846bb1f
SyncJournalTest: Use valid time for the tests.
2015-11-25 22:16:29 +01:00
Klaas Freitag
aaa5c1bc5f
Test syncjournaldb: Fix comparison of two QDateTime objects.
...
Only compare full seconds as milliseconds may float.
2015-11-25 21:13:50 +01:00
Klaas Freitag
1ad8e539aa
SyncJournalFileRecord: Fix comparison operator
...
Compare only full seconds, as milliseconds can disappear during storage
of the database.
This is needed to fix the syncjournaldb test reliably. And maybe
elsewhere.
Also see
http://www.qtcentre.org/threads/13618-Problem-with-comparing-two-QDateTime-objects
2015-11-25 21:11:58 +01:00
Klaas Freitag
29e2877d35
NautilusPlugin: Fix behaviour with files with a colon in the name.
2015-11-25 15:11:12 +01:00
Klaas Freitag
a708f8d8ad
NautilusPlugin: Fix detection of the OK status
...
Consider OK+SHW also as ok, and enable the ownCloud actions.
2015-11-25 15:11:12 +01:00
Klaas Freitag
8777982629
NautilusPlugin: Fix detection of top level sync folder.
2015-11-25 15:11:12 +01:00
Roeland Douma
f1435c86ed
Merge pull request #4199 from owncloud/permission_dropdown
...
[Sharing] Permissions now in dropdown menu
2015-11-25 14:04:39 +01:00
Roeland Jago Douma
ece164f679
[Share] Use more icon
2015-11-25 14:02:45 +01:00
Christian Kamm
698f47d5ad
Blacklist: Treat all 403s the same #4071
...
We can't detect firewall errors due to error message localization.
2015-11-25 12:49:57 +01:00
Christian Kamm
1aa570326e
Tests: Add a perl test for eml checksums #3235
2015-11-25 12:48:24 +01:00
Daniel Molkentin
1cc9070a50
Qt patches: Tweak more for Qt 5.4.0
2015-11-25 12:42:58 +01:00
Daniel Molkentin
127c107094
Ensure patches apply cleanly, drop patch 14
2015-11-25 11:49:34 +01:00
Roeland Jago Douma
f1faf8745a
[Sharing] Permissions now in dropdown menu
...
As discusses with jan.
* Detailed permissions displayed in qtoolboxmenu
* Made share rows slightly smaller
Bug fix:
* Do not show delete permissions for file shares
2015-11-25 11:26:21 +01:00
Daniel Molkentin
60a51f8085
Add more Qt patches
2015-11-25 10:40:41 +01:00
Christian Kamm
df63579071
Blacklist: Firewall errors are silenced for up to 1h only #4071
2015-11-25 10:39:43 +01:00
Christian Kamm
5216648d0b
Share dialog: Work around painting bug #4189
2015-11-25 10:09:41 +01:00
Roeland Jago Douma
fcdab1e804
[Sharing] Also add sync status to SHARE_STATUS command
2015-11-25 09:40:21 +01:00
Roeland Jago Douma
9f15ba3972
[Sharing] Make sure the file is actually synced to the server
...
Before we attemt any sharing make sure the file is synced to the server.
2015-11-25 09:22:20 +01:00
Jenkins for ownCloud
c6a65c692e
[tx-robot] updated from transifex
2015-11-25 02:19:03 -05:00
Jenkins for ownCloud
b468767184
[tx-robot] updated from transifex
2015-11-25 01:15:38 -05:00
Markus Goetz
76ce9ff8c4
Activity List: Improve double click handling on filenames #4168
2015-11-24 14:25:16 +01:00
Christian Kamm
23ed68c8dd
Re-apply ee69ab2021
2015-11-24 13:45:02 +01:00
Christian Kamm
2982c79444
Settings: Fix "Choose what to sync" #4187
...
There was a duplicate connect() due to a merge problem (?) in
7e4c0bd515
2015-11-24 13:41:00 +01:00
Christian Kamm
7e56408331
SelectiveSync: Show Apply/Cancel less
...
Before the selective sync status text and apply/cancel buttons
were shown as soon as any folder was expanded. This changes it
to only show when the model is dirty (or a big folder confirmation
is needed).
This is nice because we auto-open the folder list sometimes
and having the apply/cancel buttons visible makes users think a
decision is needed.
2015-11-24 13:01:10 +01:00
Christian Kamm
bcfdcec3ee
Share dialog: Adjust layout #4119
2015-11-24 12:30:53 +01:00
Christian Kamm
f96d94f143
ShareDialog: Only link share if capabilities allow #4179
2015-11-24 11:58:10 +01:00
Christian Kamm
adea301e5b
Blacklist: Clear on successful chunk upload #3934
2015-11-24 10:09:55 +01:00
Christian Kamm
f9dc569b0a
Share dialog: Don't close on enter
...
Setting default=false was not enough.
2015-11-24 09:58:18 +01:00
Christian Kamm
f7932bb0c7
ShareDialog: Completion uses MatchContains #4123
...
For Qt 5.2.0+ only.
2015-11-24 09:10:26 +01:00
Jenkins for ownCloud
f20e052ad7
[tx-robot] updated from transifex
2015-11-24 02:19:20 -05:00
Jenkins for ownCloud
02daca9cb9
[tx-robot] updated from transifex
2015-11-24 01:15:44 -05:00
Markus Goetz
b52a3a415c
Connectivity: Improve reconnecting after network change/disconnect #4167
2015-11-23 21:48:26 +01:00
Markus Goetz
33dcb0c8d9
PropagateLocalRemove: Add debug
...
Was not in log so far
2015-11-23 21:48:25 +01:00
Markus Goetz
709da37be2
Activities: Only emit debug when actually refreshing
2015-11-23 21:48:25 +01:00
Christian Kamm
2458f07ca1
Checksums: Reuse the discovery checksum where possible
2015-11-23 14:13:10 +01:00
