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

30997 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
750ec93394 Merge pull request #23080 from owncloud/use-non-localized-birthday-title 
Use a birthday title which does not require translation because we ha…
 2016-03-11 11:49:13 +01:00
Jenkins for ownCloud
1ed831564e [tx-robot] updated from transifex 2016-03-11 01:55:49 -05:00
Thomas Müller
866de3c174 Merge pull request #23086 from owncloud/ldap-sort-deprecated 
remove deprecated ldap_sort
 2016-03-11 00:23:13 +01:00
Thomas Müller
7587fe8ad5 Merge pull request #23129 from SteKoe/add-jpg-to-htaccess 
Allow jpg files to be statically served
 2016-03-10 23:15:23 +01:00
Thomas Müller
07a1313114 Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-master 
getOwner is not available on FileHome
 2016-03-10 23:12:51 +01:00
Stephan Köninger
73a7c45dd4 Allow jpg files to be statically served 
When using an background image in themes of type JPG, the current setting of owncloud's htaccess file does not allow to deliver these kinds of images as static content. Adding the file extensions as done in this commit, it works flawlessly.
 2016-03-10 23:08:56 +01:00
Thomas Müller
e0210058ef Merge pull request #23094 from owncloud/fake-lock-for-windows-7-8-10 
Fake LOCK statement for Windows 7, 8 and 10 network mounts
 2016-03-10 23:07:45 +01:00
Thomas Müller
d8ba3a8944 Merge pull request #23027 from owncloud/bump_symfony_console 
[3rdparty] Bump symfony/console to 2.8.3
 2016-03-10 22:29:34 +01:00
Thomas Müller
b502667f3a Merge pull request #23121 from owncloud/scrutinizer_share_fixes 
Fix some scrutinizer warning in the sharing code
 2016-03-10 22:17:06 +01:00
Thomas Müller
a146499902 Merge pull request #23120 from owncloud/do_not_analyze_composer 
Scrutinizer should not check generated composer files
 2016-03-10 21:40:14 +01:00
Roeland Jago Douma
e6712c47a6 Fix some scrutinizer warning in the sharing code 
* Better phpdoc
* Promper use statements
* Unused parameter
 2016-03-10 21:35:22 +01:00
Thomas Müller
8e51634e6d Merge pull request #23056 from owncloud/fix_23044 
Add mimetype to OCS Share API output
 2016-03-10 21:18:19 +01:00
Roeland Jago Douma
cac92730ac Scrutinizer should not check generated composer files 2016-03-10 21:17:34 +01:00
Thomas Müller
3cec5f7f6c Merge pull request #23100 from owncloud/DeepDiver1975-patch-1 
Execute travis test on stable branches as well
 2016-03-10 21:16:06 +01:00
Thomas Müller
b7adf371c6 getOwner is not available on FileHome - fixes #23116 2016-03-10 20:53:56 +01:00
Roeland Jago Douma
7430db79c5 [3rdparty] Bump symfony/console to 2.8.3 2016-03-10 20:14:39 +01:00
Roeland Jago Douma
ca2a24d286 Add intergration tests 2016-03-10 20:12:58 +01:00
Thomas Müller
7f16aaefc8 Merge pull request #23048 from owncloud/no-fatal-error-if-DSTART-is-not-set 
No fatal error if dstart is not set
 2016-03-10 17:58:01 +01:00
Thomas Müller
ad61c552ea Merge pull request #23087 from owncloud/allow-migrating-all-calendars 
Allow to migrate calendars of all users
 2016-03-10 17:44:23 +01:00
Thomas Müller
c8c9cd36dd Merge pull request #23079 from owncloud/readonly-birthday-cal 
The birthday_calendar is read-only
 2016-03-10 16:04:10 +01:00
Thomas Müller
207f6f8203 Execute travis test on stable branches as well 2016-03-10 15:53:26 +01:00
Roeland Jago Douma
517ef52560 Add mimetype to OCS Share API output 
Fixes #23044
 2016-03-10 15:41:17 +01:00
Thomas Müller
b3c1379b8c Merge pull request #23084 from owncloud/fix_23067 
Fix MKCOL for IE11 as well
 2016-03-10 15:32:27 +01:00
Morris Jobke
48e03e0c49 Fake LOCK statement for Windows 7, 8 and 10 network mounts 
* fixes #22596
 2016-03-10 15:02:37 +01:00
Joas Schilling
94915e39db Allow to migrate calendars of all users 2016-03-10 13:42:09 +01:00
Roeland Jago Douma
19347187d8 Fix MKCOL for IE11 as well 
Using https://github.com/owncloud/core/pull/22274 we have to patch the
iedavclient.js as well.
 2016-03-10 13:36:26 +01:00
Arthur Schiwon
fe2a506e56 remove deprecated ldap_sort 2016-03-10 13:13:38 +01:00
Thomas Müller
85521879cd The birthday_calendar is read-only 2016-03-10 12:50:07 +01:00
Thomas Müller
fe7103506b Use a birthday title which does not require translation because we have no idea about the target device language and forcing English upon all users is kind of bad 2016-03-10 12:41:37 +01:00
Thomas Müller
51072f742e Merge pull request #21582 from owncloud/core_composer 
Composers PSR-4 autoloader in core
 2016-03-10 12:06:44 +01:00
Thomas Müller
262ec35d50 Merge pull request #23017 from owncloud/first-stop-the-dockers 
docker containers should be stopped before being removed - refs https…
 2016-03-10 10:58:20 +01:00
Thomas Müller
41aae971a9 Merge pull request #23050 from owncloud/href-target-blank 
make sure links open in new tabs
 2016-03-10 10:54:53 +01:00
Thomas Müller
6133253a2c fixes #23004 2016-03-10 09:20:53 +01:00
Thomas Müller
308c99f1fd Merge pull request #23029 from owncloud/add-rewrite-rules-after-setup 
Add base rewrite rule only when RewriteBase is defined
 2016-03-10 08:25:18 +01:00
Thomas Müller
845a45ae4a Merge pull request #23064 from owncloud/typo-comments-app-desc 
fix typo in comments app meta data
 2016-03-10 08:24:40 +01:00
Jenkins for ownCloud
96d70aa270 [tx-robot] updated from transifex 2016-03-10 01:55:35 -05:00
Arthur Schiwon
6aefc8fba7 fix typo 2016-03-09 22:31:30 +01:00
Jan-Christoph Borchardt
ecbe4aea31 make sure links open in new tabs 2016-03-09 18:49:46 +01:00
Thomas Müller
bc434b252c fixes #23020 2016-03-09 18:12:39 +01:00
Roeland Jago Douma
d16b371e38 POC for PSR-4 autoloader server.php => Server.php 2016-03-09 16:53:39 +01:00
Roeland Jago Douma
f7729cdc40 Add composers default autoloader to core 
This introduces the defacto standard PSR-4 autoloader from composer into
core. This will allow proper PSR-4 naming of our classes.

Since our original autoloader is still available we can slowly switch
over classes to PSR-4.
 2016-03-09 16:53:27 +01:00
Thomas Müller
822541b689 Merge pull request #23035 from owncloud/fix-syncing-of-all-birthday-calendars 
Fix syncing of all birthday calendars in one go
 2016-03-09 16:44:19 +01:00
Thomas Müller
f00d30d777 Merge pull request #22967 from Aeyoun/master 
Change rel="shortcut icon" to the standard rel="icon"
 2016-03-09 16:43:45 +01:00
Thomas Müller
fe3ffcbfc3 Merge pull request #23026 from stweil/master 
apps/files: Fix typos in comments (found and fixed by codespell)
 2016-03-09 16:43:05 +01:00
Thomas Müller
2098573614 Merge pull request #23032 from owncloud/basephp-showclierror 
Do not set response status in CLI in case of error
 2016-03-09 16:42:51 +01:00
Joas Schilling
8c4af74ce7 Fix syncing of all birthday calendars in one go 2016-03-09 16:14:33 +01:00
Vincent Petry
12b2192038 Do not set response status in CLI in case of error 2016-03-09 15:40:34 +01:00
Stefan Weil
692f312513 apps/files: Fix typos in comments (found and fixed by codespell) 
This contribution is AGPL and MIT licensed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-03-09 15:14:05 +01:00
Lukas Reschke
bc4a043a76 Add base rewrite rule only when RewriteBase is defined 
In case Apache is configured with an `Alias` such as with the ownCloud packages the rewrite rules will fail when no valid RewriteBase is configured.
 2016-03-09 15:13:07 +01:00
Thomas Müller
0cc53ee06d Merge pull request #22602 from owncloud/fix_slow_chunkcheck 
Do not check all chunks of a chunked upload if we do not need to
 2016-03-09 15:06:44 +01:00