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

29300 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
427dbdabba Merge pull request #21215 from owncloud/files_external-db-set-mountpoint 
fix setting mountpoint and auth backend of external storages
 2016-01-08 13:36:30 +01:00
Thomas Müller
0f5132552c Merge pull request #21292 from owncloud/checkAppEnabled-not-needed-anymore 
core will handle invalid URLs and redirects properly
 2016-01-08 13:36:11 +01:00
Thomas Müller
5380215dca Merge pull request #21536 from owncloud/avatar_verify_posted_path 
Verify the path is a file on avatar update
 2016-01-08 13:35:46 +01:00
Thomas Müller
074a7fd475 Merge pull request #21027 from owncloud/fix-undefined-behaviour 
Fix PHPDoc + Add handling for error cases
 2016-01-08 12:35:26 +01:00
Thomas Müller
71999ef820 Merge pull request #21139 from owncloud/makeswifturltypeconfigurable 
make url type configurable
 2016-01-08 12:34:58 +01:00
Thomas Müller
70b58cf367 Merge pull request #17924 from owncloud/ldap-fix-appending-port 
ensure an LDAP URL is used, append the port to the host URL when necessary, and just in one place
 2016-01-08 12:34:15 +01:00
Thomas Müller
2c76b77c76 Merge pull request #21510 from owncloud/sabre-dav-3.0.6 
[3rdparty] Bump sabre/dav to 3.0.6
 2016-01-08 12:20:43 +01:00
Robin Appelman
68bd003e4b correctly set applicables when updating user storage 2016-01-08 11:54:32 +01:00
Robin Appelman
8da3c3f125 update tests 2016-01-08 11:54:32 +01:00
Robin Appelman
3895ab8451 improve setting applicable for personal mounts 2016-01-08 11:54:31 +01:00
Robin Appelman
ab549970ca fix setting mountpoint and auth backend of external storages 2016-01-08 11:54:31 +01:00
Roeland Jago Douma
791c7a6dcc Bump vobject version in carddav unittest 2016-01-08 11:30:28 +01:00
Roeland Jago Douma
5969d41890 [3rdparty] Bump sabre/dav to 3.0.6 2016-01-08 11:30:24 +01:00
Lukas Reschke
48ae3997d4 Merge pull request #21220 from owncloud/remove-to-make-apache24-happy 
Use setifempty to please incompatible httpd versions
 2016-01-08 11:19:38 +01:00
Jörn Friedrich Dreyer
047008e9e3 always check if the csp is empty 2016-01-08 11:08:38 +01:00
Lukas Reschke
1ae30d1d9c Use setifempty to please incompatible httpd versions 
Some httpd versions have problem with the old logic leading to resourced served with multiple headers.
 2016-01-08 11:08:37 +01:00
Morris Jobke
99cf90c8a4 fix warning box size for avatar change 2016-01-08 10:27:55 +01:00
Thomas Müller
a0345b9465 Merge pull request #21032 from owncloud/router-error-handling 
Router error handling + Base.php
 2016-01-08 10:06:54 +01:00
Roeland Jago Douma
186e35d954 Verify the path is a file on avatar update 
Fixes #21533

Before we just assumed that the passed path was a file. This does not
have to be the case. Thus check if it actually is a file before doing
any more tests.
 2016-01-08 10:03:49 +01:00
Thomas Müller
a1a8a06042 Merge pull request #21527 from owncloud/remove_all_avatars 
Remove all cache avatars on avatar deletion
 2016-01-08 09:41:25 +01:00
Jenkins for ownCloud
88c4cba1f5 [tx-robot] updated from transifex 2016-01-08 01:56:39 -05:00
Lukas Reschke
0654d37da8 Remove undefined variable 2016-01-07 21:30:44 +01:00
Lukas Reschke
00a01a8de2 Fix PHPDoc + Add handling for error cases 
Makes static code analyzers happier.
 2016-01-07 21:30:44 +01:00
Roeland Jago Douma
34c8249799 Deprecate remaining function and entire class 2016-01-07 21:29:51 +01:00
Lukas Reschke
9bf01283e7 Cleanup router code 
- Some functions are entirely broken
- PHPDoc etc...
 2016-01-07 21:29:51 +01:00
Lukas Reschke
0e561afe79 Check if app does exists 2016-01-07 21:29:45 +01:00
Roeland Jago Douma
4e6f6518ff Remove all cache avatars on avatar deletion 
Fixes #21513

Since we cache the generated avatars. We should also delete the
generated sizes when we remove the avatar.
 2016-01-07 20:51:18 +01:00
Thomas Müller
1cc6fddead Merge pull request #21498 from owncloud/cleanup-OC_DB 
Cleanup OC_DB methods
 2016-01-07 20:13:16 +01:00
Thomas Müller
e307406486 Merge pull request #20966 from knox/master 
Do not rewrite letsencrypt .well-known URI
 2016-01-07 17:16:51 +01:00
Thomas Müller
6a796ff3cc Merge pull request #21066 from owncloud/behat_capabilities_changing_server_configuration 
Added new capabilities test with changes in server configuration
 2016-01-07 17:07:29 +01:00
Thomas Müller
46107f82d4 Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-warning 
Issue 20218 min max owncloud version warning
 2016-01-07 16:51:00 +01:00
Thomas Müller
5b22ee4c05 Merge pull request #21512 from owncloud/allow-searching-by-app-id 
Allow searching apps by ID
 2016-01-07 16:43:47 +01:00
Joas Schilling
3a494033d2 Allow searching apps by ID 2016-01-07 16:33:25 +01:00
Thomas Müller
629061d00a Merge pull request #21481 from owncloud/ext-smb-dependencies 
Check libsmbclient-php as well as smbclient binary
 2016-01-07 16:19:20 +01:00
Thomas Müller
f6f492ba4e Merge pull request #21502 from owncloud/di_mimetypedetector 
Add 'OCP\Files\IMimeTypeDetector' to DI container
 2016-01-07 16:18:55 +01:00
Thomas Müller
5a5803f414 Merge pull request #21507 from owncloud/users-dropdownscroll 
Fix users list dropdown position after scroll
 2016-01-07 16:18:29 +01:00
Thomas Müller
fddbdbd0e6 Merge pull request #21455 from owncloud/fix-method-signature 
Fix method call + undefined variable
 2016-01-07 16:18:02 +01:00
Thomas Müller
9ca670f94f Merge pull request #21505 from owncloud/allow-downgrades-for-brave-developers 
Allow downgrades for our brave developers, that switch between branches
 2016-01-07 16:03:36 +01:00
Vincent Petry
112ccd00a3 Fix users list dropdown position after scroll 
When scrolling, the position calculation of the multiselect dropdown was
wrong. Adding "position: relative" to the list container makes the
button calculation relative to it instead of the whole page. In this
case the dropdown is properly aligned with the field regardless of
scrolling.
 2016-01-07 15:25:04 +01:00
Joas Schilling
ae285c0654 Remove deprecated shipped flag from info.xml which has no use anymore 2016-01-07 15:15:58 +01:00
Joas Schilling
40f786060e Add ownCloud min and max version for shipped apps 2016-01-07 15:11:49 +01:00
Joas Schilling
c55da1fc8d Add a warning to the app:check-code if the version is missing 2016-01-07 15:04:36 +01:00
Joas Schilling
83855c073b Add a warning on the apps list when the version is missing 2016-01-07 15:03:55 +01:00
Thomas Müller
601457d221 Merge pull request #20773 from owncloud/share2.0_create 
[Sharing 2.0] create share
 2016-01-07 14:57:05 +01:00
Morris Jobke
190cc2bb67 Remove OC_DB::getConnection 2016-01-07 14:54:55 +01:00
Morris Jobke
fddece9552 Remove OC_DB::insertid 2016-01-07 14:54:55 +01:00
Morris Jobke
0a41cfefe3 Remove beginTransaction, commit, rollback from OC_DB 2016-01-07 14:54:55 +01:00
Morris Jobke
3917d888bd Remove OC_DB::isError 2016-01-07 14:54:55 +01:00
Morris Jobke
547fbfdb76 Remove OC_DB::dropTable 2016-01-07 14:54:54 +01:00
Thomas Müller
9d3c14c7dd Merge pull request #21495 from owncloud/polyfill 
[3rdparty] Bump symfony/polyfill-php
 2016-01-07 14:23:03 +01:00