Niels van Adrichem
0bcb13f02e
Fixxed compile error on src/gui/share.h
2015-11-03 13:44:59 +01:00
Niels van Adrichem
42ef09e3bb
Updated documentation for Non Shibboleth authentication and customized WebDAV Paths
2015-11-03 13:43:26 +01:00
Niels van Adrichem
1ab44655e0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/cmd/cmd.cpp
2015-11-03 11:58:45 +01:00
Jenkins for ownCloud
89734b95c4
[tx-robot] updated from transifex
2015-11-03 02:19:04 -05:00
Niels van Adrichem
8f5658bc01
Added Non Shibboleth WebDAV authentication and Dav Path customization to owncloudcmd
2015-11-02 22:57:17 +01:00
Carla Schroder
a59c3ef278
some doc fixes & updates
2015-11-02 11:18:31 -08:00
Klaas Freitag
b600ac882a
ActivityListModel: Add method to refresh one Account (WIP)
2015-11-02 17:52:04 +01:00
Klaas Freitag
71849c4372
ActivityListModel: Add the page and pagesize parameter to ocs query.
2015-11-02 17:51:12 +01:00
Klaas Freitag
9545af0d43
JSONApiJob: Add method to add additional query parameter.
2015-11-02 17:37:23 +01:00
Klaas Freitag
6c6ee358d4
ActivityListModel: Check if the account is connected when fetching more.
2015-11-02 16:39:33 +01:00
Klaas Freitag
060f4f291b
SettingsDialog: Add a tab with the SyncProtocol to ActivityWidget.
2015-11-02 15:46:00 +01:00
Klaas Freitag
3fb43d2322
ActivityWidget UI: Remove the preconfigured tabs from the tabwidget.
...
It is better to create the tabs from the code in SettingsDialog.
2015-11-02 15:45:17 +01:00
Klaas Freitag
4895683bab
ActivityWidget: Do a proper asynchronous model to display the activity.
2015-11-02 15:44:13 +01:00
Klaas Freitag
43800e3d1c
Merge pull request #4049 from Naereen/patch-1
...
Reviewing, improved style, and a initializing message
2015-11-02 10:14:07 +01:00
Klaas Freitag
3b8e1dcd89
SettingsDialog: Make ActivityWidget a member.
2015-11-01 22:30:46 +01:00
Klaas Freitag
302d6b321e
ActivityWidget: Add a job to fetch activities, Activity object added
2015-11-01 22:30:37 +01:00
Jenkins for ownCloud
3f85694394
[tx-robot] updated from transifex
2015-11-01 02:18:55 -05:00
RealRancor
8c5ef2f1c3
Make registry key a code block in autoupdate docs.
2015-10-31 19:05:21 +01:00
Lilian Besson
aa1a2d1247
Reviewing, improved style, and a initializing message
...
- Add an "Initializing owncloud-client-nautilus extension" message
2015-10-31 13:07:18 +01:00
Olivier Goffart
3993a7f636
OwnSQL: add asserts in case of error that should not happen
2015-10-30 14:05:58 +01:00
Olivier Goffart
aaf16ff0e8
SyncJournalDB, clear all the queries before closing the database
2015-10-30 14:03:08 +01:00
Olivier Goffart
16c078963b
owncloudcmd: add --max-sync-retries #4037
...
And limit by default to 3 retries
2015-10-30 13:36:31 +01:00
Klaas Freitag
9279bcdba4
Add a tabwidget to Settings dialog for activity.
2015-10-30 13:26:27 +01:00
Olivier Goffart
0c467ef5b4
Sync engine: fix signal/slot connection
2015-10-30 13:21:34 +01:00
Olivier Goffart
49cd53ee44
FolderStatusModel: attempt to detect removed undecided files #3612
2015-10-30 12:43:33 +01:00
Olivier Goffart
0e6a463564
Discovery: Don't leak DiscoveryDirectoryResult in case of error
...
Also remove redundent Q_FUNC_INFO
2015-10-30 12:43:33 +01:00
Roeland Douma
d38b190317
Merge pull request #4033 from owncloud/share_object
...
Add share manager and the share objects
2015-10-30 11:01:03 +01:00
Klaas Freitag
29558cb7bb
Merge pull request #4040 from owncloud/phil-davis-changelog-master
...
ChangeLog typos that reverted in merge from 2.0
2015-10-30 10:36:38 +01:00
Jenkins for ownCloud
d2cd237e25
[tx-robot] updated from transifex
2015-10-30 02:19:00 -04:00
Roeland Jago Douma
c7b814337a
Use proper QFlags
...
Now the ShareTypes and Permissions are part of the Share class (which is
a bit better abstracted away).
2015-10-29 21:47:47 +01:00
Phil Davis
ced51813c7
ChangeLog typos that reverted in merge from 2.0
...
Hopefully the last place I need to submit this again :)
2015-10-29 23:35:48 +05:45
Roeland Jago Douma
dd8d02b8ef
Act properly if OCS endpoint returned an error (OCS error)
...
For now pass it on to the gui. So at least they know something is wrong.
2015-10-29 16:56:23 +01:00
Olivier Goffart
c3cf6aef7d
SyncEngine: Don't whipe the white list if the sync was aborted
...
Issue #4018
2015-10-29 16:47:39 +01:00
Olivier Goffart
38a8e5ee03
Discovery: conding style: use const references for function parameters
2015-10-29 16:47:36 +01:00
Klaas Freitag
46269dac4e
Merge branch '2.0'
...
Conflicts:
ChangeLog
2015-10-29 16:34:15 +01:00
Roeland Jago Douma
8c0297f688
Use QLatin1Char
2015-10-29 16:03:47 +01:00
Klaas Freitag
bc5890d8b5
Add version suffix git.
2015-10-29 15:46:02 +01:00
Klaas Freitag
ee65315520
Merge branch '2.0.2' into 2.0
...
Conflicts:
ChangeLog
2015-10-29 15:44:56 +01:00
Roeland Jago Douma
12f7cfde87
Shares do not have parents
...
Also some pointer cleanups
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
6d80f3d756
Proper foreach
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
b32f752d31
Properly cleanup OCS jobs
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
cf8be7de91
Proper const usage
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
30a3498c22
Fix typos
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
239603e24c
Make sure enforced passwords are properly respected
...
Fixes for old and new servers
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
390daed3de
Added getPublicUpload to LinkShare
...
so the gui does not have to know abou the internal permissions
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
918c06aba3
Add share manager and the share objects
2015-10-29 15:42:20 +01:00
Klaas Freitag
726be08917
Revert "Config: Use monochrome icons per default on MacOSX."
...
This reverts commit 546cab3f62
2015-10-29 15:37:31 +01:00
Olivier Goffart
a127debc54
Quota: handle special negative value for the quota #3940
...
Don't show a progress bar if there is an unkown or unlimited total
2015-10-29 14:33:29 +01:00
Olivier Goffart
6aa26654f6
Merge remote-tracking branch 'origin/2.0'
2015-10-29 12:44:28 +01:00
Olivier Goffart
0fde7f0e6b
Propagator: Keep a meaningfull error with old server and invalid file names
...
We changed the discovery code not to ignore files whose filename contains
charachter invalid on windows. (Because newer versions of the server
supports them)
Servers older than 8.1 will just say "Bad Request" as an error and it's a
regression against previous client version. So keep nice error even with
older server.
Relates to #3736
2015-10-29 12:44:08 +01:00
