Thomas Müller
|
75ff6c34ca
|
Merge pull request #20358 from owncloud/extstorage-properlythrowexception
Properly throw exception in OC_Mount_Config::getBackendStatus
|
2015-11-06 13:36:26 +01:00 |
Vincent Petry
|
51d7527595
|
Properly throw exception in OC_Mount_Config::getBackendStatus
|
2015-11-06 12:29:24 +01:00 |
|
Thomas Müller
|
dc96aa3849
|
Merge pull request #20340 from owncloud/fix-ocs-error-code
Revert OCS error code change from #20135
|
2015-11-06 11:56:34 +01:00 |
|
Thomas Müller
|
bf941032a3
|
Merge pull request #20271 from owncloud/fix-18701
LDAP: attempt to connect to backup server again, if main server is no…
|
2015-11-06 10:01:06 +01:00 |
Jenkins for ownCloud
|
f2b19333b9
|
[tx-robot] updated from transifex
|
2015-11-06 01:55:09 -05:00 |
Joas Schilling
|
960c9f386d
|
Revert OCS error code change from #20135
|
2015-11-05 17:01:47 +01:00 |
Roeland Jago Douma
|
0c566698a1
|
Use the old code for remote shares for now
|
2015-11-05 15:59:09 +01:00 |
|
Roeland Jago Douma
|
6624fa212a
|
The new sharing code now handles deletion
OCS -> ShareManager -> DefaultShareProvider
|
2015-11-05 15:59:09 +01:00 |
|
Roeland Jago Douma
|
8b5179459a
|
Prepare OCS Share endpoint
|
2015-11-05 15:59:09 +01:00 |
|
Thomas Müller
|
8bffc84766
|
Merge pull request #20301 from owncloud/fix-files_external-empty-user-mounting
[files_external] fix empty user mounts setting
|
2015-11-05 11:36:36 +01:00 |
|
Jenkins for ownCloud
|
2f4fa5b49c
|
[tx-robot] updated from transifex
|
2015-11-05 01:55:14 -05:00 |
|
Thomas Müller
|
ba02a3771b
|
Merge pull request #20053 from owncloud/getfileinfo-locking
Don't lock if we're only reading cache metadata
|
2015-11-04 22:40:17 +01:00 |
Morris Jobke
|
2a35ecb9ba
|
[files_external] fix empty user mounts setting
* fixes #19858
* if no backend is allowed to be mounted also the user mount setting should be disabled
|
2015-11-04 15:47:03 +01:00 |
Arthur Schiwon
|
8eeaf11d41
|
add port to host only, if an URL is used instead of a plain hostname
|
2015-11-04 12:34:30 +01:00 |
|
Arthur Schiwon
|
253e4bcf63
|
integration tests
|
2015-11-04 12:26:21 +01:00 |
|
Thomas Müller
|
ed0da94d3b
|
Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorage
Correct the description of function setEncryptHomeStorage
|
2015-11-04 10:27:54 +01:00 |
|
Jenkins for ownCloud
|
7fe047425f
|
[tx-robot] updated from transifex
|
2015-11-04 01:55:44 -05:00 |
Robin Appelman
|
0397871f7e
|
Split checkUpdate
|
2015-11-03 18:23:22 +01:00 |
Phil Davis
|
46261b5ff1
|
Correct the description of function setEncryptHomeStorage
|
2015-11-03 22:47:55 +05:45 |
|
Arthur Schiwon
|
6b866fa917
|
LDAP: attempt to connect to backup server again, if main server is not available. Fixes #18701
|
2015-11-03 17:17:00 +01:00 |
|
Thomas Müller
|
a8daef4280
|
Merge pull request #20223 from owncloud/fix-apply-webdav-tags
Fix TagList namespace in property map
|
2015-11-03 14:22:49 +01:00 |
Jan-Christoph Borchardt
|
fa5a15be2b
|
fix external storage wording detail, ref #19858
|
2015-11-03 08:56:15 +01:00 |
|
Jenkins for ownCloud
|
82f3590fd0
|
[tx-robot] updated from transifex
|
2015-11-03 01:58:43 -05:00 |
|
Vincent Petry
|
52e213f026
|
Fix TagList namespace in property map
|
2015-11-02 14:19:01 +01:00 |
|
blizzz
|
83d3c94590
|
Merge branch 'master' into fix-20151
|
2015-11-02 13:32:24 +01:00 |
|
Thomas Müller
|
a8641fdc95
|
Merge pull request #20192 from owncloud/fix-20090
if a user that is flag as deleted shows up again, remove that flag. F…
|
2015-11-02 11:28:28 +01:00 |
|
Thomas Müller
|
c5caebbd1f
|
Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibn
Fix scrollto= parameter in trashbin view
|
2015-11-02 11:27:49 +01:00 |
|
Joas Schilling
|
a378dc5a7b
|
Fix scrollto= parameter in trashbin view
|
2015-11-02 10:31:06 +01:00 |
|
Thomas Müller
|
01adefaf50
|
Merge pull request #20181 from owncloud/files-fixdownloadspinner
Fix file action download spinner
|
2015-11-02 10:13:58 +01:00 |
|
Jenkins for ownCloud
|
2afc14e195
|
[tx-robot] updated from transifex
|
2015-11-02 01:55:05 -05:00 |
|
Jenkins for ownCloud
|
2374a0df5d
|
[tx-robot] updated from transifex
|
2015-11-01 01:54:58 -04:00 |
|
Jenkins for ownCloud
|
d7ed353814
|
[tx-robot] updated from transifex
|
2015-10-31 01:55:07 -04:00 |
|
Thomas Müller
|
d4af369e60
|
Merge pull request #19940 from owncloud/ldap-server-wizard-tooltip
Add tooltip to ldap server wizard
|
2015-10-31 00:43:30 +01:00 |
|
Arthur Schiwon
|
a2f2ffb8db
|
if a user that is flag as deleted shows up again, remove that flag. Fixes #20090
|
2015-10-30 19:20:42 +01:00 |
|
Arthur Schiwon
|
16aa339475
|
add method to count users by loginname and use it for diagnose test, fixes #20151
|
2015-10-30 18:20:50 +01:00 |
|
Thomas Müller
|
6911d8f0a4
|
Merge pull request #20175 from owncloud/login-arrow
remove unneeded icons from input fields to not distract from submit button, fix #18940
|
2015-10-30 15:56:13 +01:00 |
|
Thomas Müller
|
27db39bd03
|
Merge pull request #20160 from owncloud/share-allowdeleteinshareoverview
Bring back delete permission in share overview
|
2015-10-30 15:30:05 +01:00 |
|
Vincent Petry
|
80cf4e84e3
|
Fix file action download spinner
|
2015-10-30 14:58:53 +01:00 |
|
Thomas Müller
|
b7f0524f2f
|
Merge pull request #20167 from owncloud/fix-docker-ip-retrieval
Use proper statement to retrieve the IP of an docker instance
|
2015-10-30 13:57:03 +01:00 |
Robin Appelman
|
3c01386a50
|
Merge pull request #20156 from owncloud/files-filter-triger-once
dont trigger the scroll event of every single item we filter in the file list
|
2015-10-30 12:52:04 +01:00 |
|
Jan-Christoph Borchardt
|
a05ea0fb1e
|
remove unneeded icons from input fields to not distract from submit button, fix #18940
|
2015-10-30 11:11:37 +01:00 |
|
Morris Jobke
|
a91572b7f3
|
Use proper statement to retrieve the IP of an docker instance
|
2015-10-30 09:28:33 +01:00 |
|
Jenkins for ownCloud
|
91b2cdc62b
|
[tx-robot] updated from transifex
|
2015-10-30 01:55:52 -04:00 |
|
Thomas Müller
|
17dc482e8f
|
Merge pull request #20051 from otetard/feature/newfilemenu_extend
Allow Owncloud apps to add new items to the “new” file menu.
|
2015-10-29 23:49:57 +01:00 |
|
Vincent Petry
|
dcfaf3afdc
|
Bring back delete permission in share overview
|
2015-10-29 17:56:54 +01:00 |
Hendrik Leppelsack
|
1e9abb4964
|
add tooltip to ldap server wizard
|
2015-10-29 17:44:46 +01:00 |
|
Thomas Müller
|
73d9699be9
|
Merge pull request #20135 from owncloud/check-if-null-subadmin
Drop OC_SubAdmin and replace usages
|
2015-10-29 17:07:45 +01:00 |
|
Robin Appelman
|
860e31a333
|
dont trigger the scroll event of every single item we filter in the file list
|
2015-10-29 16:30:56 +01:00 |
|
Thomas Müller
|
774d069ff0
|
Merge pull request #20122 from owncloud/files-consolidateiconupdate
Fix icon update to be more consistent
|
2015-10-29 15:40:15 +01:00 |
|
Vincent Petry
|
9c9158e6b7
|
Fix icon update to be more consistent
Makes the details bar show the same icon as in the list.
|
2015-10-29 12:59:51 +01:00 |