wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
32749 commits 157 branches 562 tags 714 MiB
Commit graph

32749 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
bac1a3a623 Add option to occ files_external:list to show all configured mounts 2016-06-23 13:12:03 +02:00
Jenkins for ownCloud
1e1903e4fe [tx-robot] updated from transifex 2016-06-23 02:09:38 -04:00
Morris Jobke
d47262ea46 Merge pull request #25233 from owncloud/iedavclient-nullheaders 
Init the headers in iedavclient.js
 2016-06-22 22:13:12 +02:00
Vincent Petry
4a2fb1b4cb
Init the headers in iedavclient.js 2016-06-22 16:58:06 +02:00
Vincent Petry
ae50e7236f Merge pull request #25225 from owncloud/enc-revertversionsize 
Rollback version must also adjust cached size
 2016-06-22 16:39:49 +02:00
Vincent Petry
d5f4328842 Merge pull request #25223 from owncloud/external-list-default-options 
Hide more default options in occ files_external:list
 2016-06-22 15:53:20 +02:00
Vincent Petry
963d8a8565 Merge pull request #25123 from owncloud/issue-23005-broken-remote-shares 
Add timeouts to make the UI usable again when a remote share is unrea…
 2016-06-22 15:52:44 +02:00
Vincent Petry
fa3dc909a4
Rollback version must also adjust cached size 2016-06-22 14:16:16 +02:00
Vincent Petry
3db5de95bd Merge pull request #25172 from owncloud/token-login-validation 
Token login validation
 2016-06-22 13:58:56 +02:00
Vincent Petry
293ae8a8cf Merge pull request #25134 from owncloud/app-passwords 
app passwords/device tokens wording
 2016-06-22 13:50:11 +02:00
Robin Appelman
eed1c52aec Hide more default options in occ files_external:list 2016-06-22 13:34:55 +02:00
VicDeo
854352d9a0 occ web executor (#24957) 
* Initial web executor

* Fix PHPDoc

Fix broken integration test

OccControllerTests do not require database access - moch them all!

Kill unused sprintf
 2016-06-22 13:12:36 +02:00
Vincent Petry
ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests 2016-06-22 10:29:40 +02:00
Joas Schilling
3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable 2016-06-22 10:29:40 +02:00
Vincent Petry
c49ff83f18 Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparents 
Fire hooks for mkdir for folder upload
 2016-06-22 10:21:00 +02:00
Jenkins for ownCloud
b85bcccc09 [tx-robot] updated from transifex 2016-06-22 01:54:55 -04:00
karakayasemi
c8b7a059b4
Fire hooks for mkdir for folder upload 
fromTmpFile function, usual mkdir call is only working for file's parent
directory. Does not care upper parent folders. I added a recursive
function that creates parent non-existing folders with usual mkdir.
 2016-06-21 17:10:52 +02:00
Christoph Wurst
178fa11ec1
use theme name instead of hard-coded 'ownCloud' 2016-06-21 16:39:51 +02:00
Christoph Wurst
2c1db51e7c
fix tranlations 2016-06-21 16:39:51 +02:00
Christoph Wurst
31f3aaa36b
app passwords/device tokens wording 2016-06-21 16:39:51 +02:00
Jörn Friedrich Dreyer
704a993e37 Fix null pointer exception in user_ldap (#25062) 2016-06-21 16:30:48 +02:00
Vincent Petry
755c86e3a2 Merge pull request #24505 from owncloud/ceph-wait-for-http 
Don't rely on the notify socket but on the service responding
 2016-06-21 16:21:11 +02:00
Christoph Wurst
7f22aeb5d6 redirect to new login route (#25099) 
* redirect to new login route

* encode anchor in url and restore it client-side
 2016-06-21 16:14:51 +02:00
Christoph Wurst
195fc5b048 Merge pull request #25196 from owncloud/update-session-token-password 
update session token password on user password change
 2016-06-21 15:39:01 +02:00
Georg Ehrke
1452b74de7 Contacts API: replace raw image data with url (#25081) 
* add uri to AddressBookImpl array

* Introduce ImageExportPlugin for CardDav

* add plugin to v1 routes

* replace binary contact photo with link

* update tests

* Adding unit tests
 2016-06-21 15:25:44 +02:00
Thomas Müller
f2f1eab7f4 fix broken unit test (#25198) 2016-06-21 13:55:11 +02:00
Vincent Petry
af98e3e641 Merge pull request #25042 from owncloud/session-settings-ellipsis 
add overflow ellipsis to session and device tokens list
 2016-06-21 12:15:38 +02:00
Christoph Wurst
db11c20dcb
pass new password instead of username 2016-06-21 11:54:54 +02:00
Vincent Petry
ca168265ef Filter out group shares for owner where owner is included (#25190) 2016-06-21 11:36:28 +02:00
Christoph Wurst
b805908dca
update session token password on user password change 2016-06-21 10:24:25 +02:00
Jenkins for ownCloud
0e575c7eea [tx-robot] updated from transifex 2016-06-21 03:49:50 -04:00
Robin Appelman
bb465a7ab4 Catch exceptions while creating shared mounts (#25077) 2016-06-20 22:11:05 +02:00
Vincent Petry
dcee528482 Don't send activity to non-admins when assigning invisible tags (#25192) 2016-06-20 22:06:34 +02:00
Vincent Petry
ef5217d6e8 Merge pull request #25173 from owncloud/fix_conversion_issues 
Fix conversion issues
 2016-06-20 17:15:45 +02:00
Vincent Petry
88b9f5a357 Merge pull request #25162 from owncloud/password-login-forbidden-hint 
Password login forbidden hint
 2016-06-20 17:05:20 +02:00
Juan Pablo Villafáñez
bb24e40bf4 Fix conversion issues 
Change to phpdoc type for automatic conversion
 2016-06-20 14:51:36 +02:00
Vincent Petry
c1770d746d Merge pull request #25159 from owncloud/share-app-initorder 
Delay files_sharing's registerMountProviders
 2016-06-20 13:31:36 +02:00
Thomas Müller
2951a70fcb Update ExcludeFileByNameFilterIterator.php (#25184) 
Gentoo & derivatives use a tool named webapp-config which places two files in a webapp-config manager web application:
1: .webapp    tag with more detailed info on the configuration done by webapp-config
2: .webapp-appname   with the list of files installed by the tool to be able to later only delete stuff that was installed (in case of upgrade) and updated configurations.
 2016-06-20 12:02:23 +02:00
Vincent Petry
09261fca86 Merge pull request #25010 from owncloud/gdrive-fix-tests 
Fix GDrive test rename overwrite folder
 2016-06-20 11:02:24 +02:00
Christoph Wurst
56199eba37
fix unit test warning/errors 2016-06-20 10:41:23 +02:00
Vincent Petry
fa533e72cd Merge pull request #25161 from owncloud/fixgetsharefolder 
Make getShareFolder use given view instead of static FS
 2016-06-20 10:26:03 +02:00
Vincent Petry
e3ddbeb755 Merge pull request #25120 from owncloud/settings_fix_checkbox_newline 
files_external: Keep checkbox and its label on one line
 2016-06-20 10:00:25 +02:00
Vincent Petry
e2b0a0f18f Merge pull request #25174 from owncloud/tokenmapper-close-cursor 
close cursor after loading a token
 2016-06-20 09:54:15 +02:00
Vincent Petry
01041045da Merge pull request #25168 from owncloud/capped-user-cache 
Capped cache for user config
 2016-06-20 09:53:58 +02:00
Christoph Wurst
fb36fd495b
fix DefaultTokenMapperTest 2016-06-20 09:25:15 +02:00
Christoph Wurst
5c68084823
fix default token provider tests 2016-06-20 09:17:19 +02:00
Christoph Wurst
9d74ff02a4
fix nitpick 2016-06-20 09:13:47 +02:00
Christoph Wurst
8ef5431e7a
fix user session tests 2016-06-20 09:10:11 +02:00
Jenkins for ownCloud
bd13353c4d [tx-robot] updated from transifex 2016-06-20 01:54:50 -04:00
Jenkins for ownCloud
d65c56d7de [tx-robot] updated from transifex 2016-06-18 01:58:51 -04:00