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

23008 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bernhard Posselt
8176032176 Merge pull request #14427 from owncloud/fix-some-php-docs 
Fix some PHPDocs
 2015-02-23 14:04:35 +01:00
Thomas Müller
df3c73de72 Merge pull request #14403 from owncloud/update-license-headers 
Update license headers
 2015-02-23 13:53:16 +01:00
Lukas Reschke
c06a94ecc2 Fix some PHPDocs 2015-02-23 12:19:52 +01:00
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Thomas Müller
f693d439e2 Merge pull request #14422 from owncloud/use-off-and-off 
Use "off" and "off" instead of true booleans
 2015-02-23 11:12:53 +01:00
Lukas Reschke
9a08c7ecb9 Merge pull request #14275 from chris-se/master 
DAV authentication: use Owncloud's internal user instead of HTTP auth one
 2015-02-23 10:25:13 +01:00
Lukas Reschke
43641d917b Use "off" and "off" instead of true booleans 
Apparently a boolean in php.ini is according to the documentation "on" or "off"…

Fixes itself.
 2015-02-23 09:40:15 +01:00
Jenkins for ownCloud
f63b09faca [tx-robot] updated from transifex 2015-02-23 01:55:10 -05:00
Thomas Müller
fd6d56290e Adding .mailmap - helps to add unified authors to the license header 2015-02-22 20:36:36 +00:00
Thomas Müller
b868914354 php script which updates the license header in all php file in the repo 2015-02-22 20:36:36 +00:00
Thomas Müller
0751ee087f Merge pull request #14414 from owncloud/add-ini-helper 
Add helper to check for `ini` values in `OC_Util::checkServer`
 2015-02-22 20:44:02 +01:00
Thomas Müller
61b00ac821 Merge pull request #14413 from owncloud/verify-php-before-running-tests-2 
Check for PHP configuration before executing unit tests
 2015-02-22 20:36:07 +01:00
Jenkins for ownCloud
ef09e5d395 [tx-robot] updated from transifex 2015-02-22 01:54:42 -05:00
Lukas Reschke
9b46e3b3d5 Add expected values to default config as well 2015-02-21 12:17:59 +01:00
Lukas Reschke
2f0f38761d Add helper to check for ini values in OC_Util::checkServer 
This allows to check for specific values in the PHP.ini that ownCloud requires for full compatibility.

`mbstring.func_overload`: https://github.com/owncloud/core/issues/14372
`output_buffering`: http://doc.owncloud.org/server/8.0/admin_manual/configuration/big_file_upload_configuration.html#configuring-php

Fixes https://github.com/owncloud/core/issues/14372 and https://github.com/owncloud/core/issues/14412
 2015-02-21 12:12:34 +01:00
Thomas Müller
9aeeb2605b Check for PHP configuration before executing unit tests 2015-02-21 11:51:52 +01:00
Jenkins for ownCloud
906c0e7798 [tx-robot] updated from transifex 2015-02-21 01:54:38 -05:00
Lukas Reschke
fcc5f5a4f4 Merge pull request #13777 from owncloud/close-cursor 
Close cursor for appframework and manipulation queries if applicable
 2015-02-20 20:15:22 +01:00
Thomas Müller
3a6b11d018 Merge pull request #13767 from owncloud/issue/13764-mimetype-racecondition 
Use insertIfNotExists() and reload mimetypes after inserting one
 2015-02-20 17:39:17 +01:00
Lukas Reschke
df2e712a8e Merge pull request #14325 from owncloud/fix-plurals-with-quotes 
Correctly create the expected key for plurals with quotes
 2015-02-20 16:35:53 +01:00
Lukas Reschke
6e9a2515ea Merge pull request #14278 from owncloud/fix-index 
Check if the offset exists before accessing
 2015-02-20 14:56:13 +01:00
Lukas Reschke
50208308e3 Merge pull request #14359 from owncloud/add-satisfy-all 
Add `Satisfy All`
 2015-02-20 14:55:43 +01:00
Morris Jobke
7cb25149c8 Merge pull request #13645 from owncloud/fix-breadcrumb-backslash 
Parse backslash as directory separator in breadcrumb
 2015-02-20 13:36:38 +01:00
Jenkins for ownCloud
79ef5eda96 [tx-robot] updated from transifex 2015-02-20 01:55:01 -05:00
Lukas Reschke
602e563d99 Merge pull request #14366 from owncloud/remove-old-l10n-files 
Remove some old l10n files they arent loaded anymore
 2015-02-19 23:31:21 +01:00
Thomas Müller
b7ff0d44d8 apply backslash fix to _setCurrentDir 2015-02-19 20:20:33 +01:00
Morris Jobke
75a7bcb10c Merge pull request #14199 from owncloud/cast-type-manually 
Manually type-cast all AJAX files
 2015-02-19 17:19:54 +01:00
Thomas Müller
df58eea93f Merge pull request #13505 from owncloud/streamline-scanning-code 
Streamline auth and CSRF check in scan.php
 2015-02-19 16:35:05 +01:00
Thomas Müller
767dd4bde7 Merge pull request #14267 from owncloud/encode-eventsource 
Encode requesttoken
 2015-02-19 16:21:12 +01:00
Thomas Müller
bdc503b03d Merge pull request #14295 from owncloud/encode-request-token-for-avatars 
Encode Requesttoken for avatars
 2015-02-19 16:20:41 +01:00
Thomas Müller
7cd3f17d9c Merge pull request #14311 from raimund-schluessler/Fix#14310 
Fix #14310
 2015-02-19 16:17:19 +01:00
Thomas Müller
6e4fa80fe6 Merge pull request #14377 from owncloud/port-14041 
Port of #14041 to master
 2015-02-19 15:49:30 +01:00
Arthur Schiwon
7ada41259c Port of #14041 to master 
on ownCloud upgrade: upgrade all apps in order, load important ones

Fix "other" app update stack
 2015-02-19 14:38:22 +01:00
Morris Jobke
0e47d1fcca Merge pull request #14338 from owncloud/fix-nav-heigt 
If no link text has been set for the navigation show the link nonetheless
 2015-02-19 13:11:53 +01:00
Joas Schilling
e52a63eccb Remove some old l10n files they arent loaded anymore 2015-02-19 11:58:40 +01:00
Thomas Müller
84eb00e428 Merge pull request #14342 from owncloud/disallow-path-traversals-in-file-view 
Disallow path traversals in file view
 2015-02-19 10:27:04 +01:00
Jenkins for ownCloud
294137dda6 [tx-robot] updated from transifex 2015-02-19 01:55:43 -05:00
Lukas Reschke
4decbc2efa Add Satisfy All 
Fixes https://github.com/owncloud/core/issues/14356
 2015-02-19 02:16:44 +01:00
Thomas Müller
b32d31a2f1 Merge pull request #13836 from owncloud/part-no-cache-update 
Dont update the cache when working with part files
 2015-02-19 00:08:10 +01:00
Thomas Müller
88126498a0 Merge pull request #14349 from owncloud/contributetrackerupdate 
add documentation issue trackers and use https everywhere
 2015-02-18 20:43:16 +01:00
Jan-Christoph Borchardt
83bc951630 Merge pull request #12213 from sebomoto/add-loadfeedback 
Add loadfeedback
 2015-02-18 19:42:18 +01:00
Volkan Gezer
74ed727b5f add documentation issue trackers and use https everywhere 2015-02-18 19:13:49 +01:00
Lukas Reschke
46ca0fa481 Add some basic PHPDoc to functions 2015-02-18 18:17:33 +01:00
Lukas Reschke
41e5850450 Prevent directory traversals in ctr of \OC\Files\View 
This prevents a misusage of \OC\Files\View by calling it with user-supplied input. In such cases an exception is now thrown.
 2015-02-18 18:17:33 +01:00
Clark Tomlinson
8d09cc3b91 Merge pull request #13989 from owncloud/enhancment/security/11857 
Allow AppFramework applications to specify a custom CSP header
 2015-02-18 10:27:29 -05:00
Clark Tomlinson
84cc90a0ee Merge pull request #14335 from owncloud/enable-strict-mode-per-deafult 
Fix invalid `ini_set` directives
 2015-02-18 10:06:12 -05:00
Lukas Reschke
e4bf3fcb53 Merge pull request #14330 from owncloud/revert-13879-add_debug_log_for_memcache_instantiation 
Revert "add debug log for memcache instantiation"
 2015-02-18 15:45:38 +01:00
Clark Tomlinson
c4fdb9cc24 Merge pull request #14324 from owncloud/fix/14320 
Check if instance is not yet installed
 2015-02-18 09:40:32 -05:00
Bernhard Posselt
a5074fa629 if no link text has been set for the navigation show the link nonetheless 2015-02-18 15:34:31 +01:00
Lukas Reschke
593681a4a9 Fix invalid ini_set directives 
Somehow they got messed up. Because PHP does automatic type juggling this has worked before as well however it's not guaranteed that this might work in the future as well.
 2015-02-18 15:18:27 +01:00