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

21895 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
1362c0b67a Merge pull request #12452 from owncloud/server2server-ng-ocs 
OCS API for server-to-server sharing
 2014-12-08 14:12:03 +01:00
LEDfan
94a176d4e8 Remove config file 2014-12-08 13:19:26 +01:00
LEDfan
3d11e091d9 Mock interface 2014-12-08 13:18:00 +01:00
Morris Jobke
2ec4ca38d2 Merge pull request #12691 from owncloud/i-shall-improve-my-grep-skills 
Remove unexisting `htAccessWorkinght`
 2014-12-08 12:52:54 +01:00
Lukas Reschke
fe7d9a7ca0 Add REST route for user & group management 
First step of a somewhat testable user management. - I know, the JSON returns are in an ugly format but the JS expects it that way. So let's keep it that way until we have time to fix the JS in the future.
 2014-12-08 12:11:01 +01:00
Lukas Reschke
d3188159d2 Merge pull request #12394 from owncloud/files-fileactionsimprovements 
Improve FileActions JS to allow for custom rendering
 2014-12-08 11:30:21 +01:00
Lukas Reschke
8b9cc5c25b Remove unexisting htAccessWorkinght 
Partially fixes https://github.com/owncloud/core/issues/12690 - remark to myself: improve grep skills.
 2014-12-08 11:25:32 +01:00
Morris Jobke
e6908f8b89 Merge pull request #12657 from owncloud/ajaxify-htaccess-check 
Check for working .htaccess via AJAX
 2014-12-08 10:37:06 +01:00
Jenkins for ownCloud
2784d580bd [tx-robot] updated from transifex 2014-12-08 01:54:57 -05:00
Olivier Paroz
7917d3b068 Remove changes which were inadvertently pushed to master 2014-12-08 04:03:02 +01:00
Olivier Paroz
d9c0be8785 Dump Arrays, Objects and Exceptions to the log 
This is a first draft. It has only been tested with the ownlcloud logger.
Some internal fields are JSON encoded several times which makes it harder to read.

Most of the normalizer is borrowed from Monolog
https://github.com/Seldaek/monolog/blob/master/src/Monolog/Formatter/NormalizerFormatter.php
 2014-12-08 03:53:07 +01:00
Lukas Reschke
e4255e9d54 Merge pull request #12644 from owncloud/add-hack-for-config 
Create config if it does not exists
 2014-12-07 22:33:16 +01:00
LEDfan
c05ff09651 Use PHPUnit mocks 2014-12-07 14:10:41 +01:00
Thomas Müller
d571f42860 Merge pull request #12668 from owncloud/keepspace 
Keep spaces out of the string
 2014-12-07 13:15:37 +01:00
LEDfan
88ad095cc7 Add unit test for contactsmanager 2014-12-07 08:39:15 +01:00
Jenkins for ownCloud
8ee9ee29ea [tx-robot] updated from transifex 2014-12-07 01:54:32 -05:00
Volkan Gezer
57452a3641 Keep spaces out of the string 
Otherwise translators cannot notice them on Transifex.
 2014-12-07 01:57:34 +01:00
Victor Dubiniuk
2a3f5ccae3 Test OC\Updater::check 2014-12-06 20:17:59 +03:00
Victor Dubiniuk
303fce44f4 Use httphelper and cache response even when it empty 2014-12-06 20:17:47 +03:00
Lukas Reschke
2b76227180 Check for working .htaccess via AJAX 
Fixes https://github.com/owncloud/core/issues/12650
 2014-12-06 15:34:53 +01:00
Lukas Reschke
bd520d2e53 Create config if it does not exists 
The codepath that is executed when executing ownCloud via CLI is different than via browser. Specifically, the config is created by the user session already in `OC_Util::getInstanceId()` by a call to `setValue`. That said, this seems to be quite a bad side-effect, but for the sake of "not breaking whatever might break if we touch this" let's keep it that way for now.

When executing the autoconfig via `php -f index.php` the said session was not setup and thus no `config/config.php` file was created resulting in an installation error.

To reproduce this try to setup ownCloud via `php -f index.php` with and without that patch. (ensure to delete all existing configs before and don't access ownCloud with a browser in the meantime)

Fixes itself.
 2014-12-06 14:00:14 +01:00
LEDfan
b412e59c26 Fix permissions 2014-12-06 13:58:10 +01:00
Jenkins for ownCloud
94eb2e782f [tx-robot] updated from transifex 2014-12-06 01:54:56 -05:00
Raghu Nayyar
bfb519cced Merge pull request #12636 from owncloud/fix-ie9-placeholder 
fix placeholder fake in IE8 & 9 that brokes group listing in user manage...
 2014-12-06 11:54:31 +05:30
Lukas Reschke
be19e78e69 Add requesttoken to base template 
Potentially fixes https://github.com/owncloud/core/issues/12580
 2014-12-05 22:23:55 +01:00
Robin Appelman
e47f4758f2 Merge pull request #12646 from owncloud/remove-safe-magic-quotes 
Remove checks for safe mode and magic quotes
 2014-12-05 21:17:40 +01:00
Lukas Reschke
1be5a3ca89 Merge pull request #12166 from helmutschneider/aws-2.7.5 
Upgrade AWS sdk to 2.7.5. Fixes #12023
 2014-12-05 20:12:53 +01:00
Lukas Reschke
116a1b366a Merge pull request #11485 from brumsoel/master 
Fix timestamp comparator return value
 2014-12-05 19:53:09 +01:00
Lukas Reschke
941a983d09 Merge pull request #12477 from rjaeckel/master 
restrict access to public files only
 2014-12-05 19:51:19 +01:00
Lukas Reschke
ddcf2b84ec Remove checks for safe mode and magic quotes 
Both are removed from 5.4.0

Safe Mode: http://php.net/manual/en/features.safe-mode.php
> This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.

Magic Quotes: http://php.net/manual/en/security.magicquotes.php
> This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.
 2014-12-05 19:14:47 +01:00
Vincent Petry
89db2a0277 Merge pull request #12523 from owncloud/port-11747 
Only store user credentials when SMB_OC storage is enabled
 2014-12-05 18:04:06 +01:00
Morris Jobke
5f66cb3250 Merge pull request #12561 from oparoz/vectoricon 
Improve the bitmap and vector mime icons
 2014-12-05 14:51:03 +01:00
Morris Jobke
23e09be65f fix placeholder fake in IE8 & 9 that brokes group listing in user management - fixes #12525 2014-12-05 12:16:22 +01:00
Morris Jobke
4ec1da3014 Merge pull request #12583 from owncloud/trim-port 
Trim port from domain
 2014-12-05 11:27:20 +01:00
Joas Schilling
e81c2a49d1 Merge pull request #12622 from owncloud/disable-for-all 
Disable when no sendmail is available
 2014-12-05 10:10:43 +01:00
Jenkins for ownCloud
4d53f163fd [tx-robot] updated from transifex 2014-12-05 01:55:52 -05:00
Olivier Paroz
ab3381d386 PNG and SVG have been compressed 2014-12-05 01:47:44 +01:00
Arthur Schiwon
1c369093e5 cache total user count 
Conflicts:
	apps/user_ldap/user_ldap.php
 2014-12-04 19:09:13 +01:00
Arthur Schiwon
ee168a121d Forward port of #12493 
add ldap-search command to occ

Conflicts:
	apps/user_ldap/appinfo/register_command.php

LDAP search filter creation changes:

1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar"  when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.

trim search string before passing it on
 2014-12-04 19:02:09 +01:00
Vincent Petry
bf887eca8b Remove obsoleted filelist prototype backup in tests 2014-12-04 18:39:20 +01:00
Morris Jobke
b6975143ff Merge pull request #12619 from owncloud/use-also-original-hea 
Merge headers
 2014-12-04 16:59:42 +01:00
Robin Appelman
a369d78124 Use the mount config api for files_external 2014-12-04 16:47:30 +01:00
Robin Appelman
f4701d7721 Add public api for mount configurations 2014-12-04 16:47:27 +01:00
Morris Jobke
f3213571bb Merge pull request #12616 from owncloud/node-fileinfo 
make \OC\Files\Node\Node implement the FileInfo interface
 2014-12-04 16:34:30 +01:00
Clark Tomlinson
b8a2fdaa21 Merge pull request #12607 from owncloud/this-is-an-awesome-day 
PHP 5.4 is now required for master
 2014-12-04 10:33:04 -05:00
Lukas Reschke
e1e8031798 Disable when no sendmail is available 2014-12-04 16:22:44 +01:00
Lukas Reschke
15be763d46 Add right margin to codestyle file 
Defaults to 120, we want 80 apparently
 2014-12-04 16:09:30 +01:00
Morris Jobke
a0488453ac Merge pull request #12596 from owncloud/remove-travis-traces 
Remove last traces of travis integration
 2014-12-04 16:04:15 +01:00
Lukas Reschke
d2e8358da2 Fix unit test 2014-12-04 15:54:32 +01:00
Lukas Reschke
db9765b4d5 Merge headers 
Otherwise the headers from `JSONResponse` are gone and the Content-Type of the response would be `text/html` instead of `application/json; charset=utf-8`. This leads to broken scripts since we set the `nosniff` tag, furthermore this is very bad from a security PoV.
 2014-12-04 14:45:15 +01:00