summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-09288-862/+36
|
* Merge pull request #12577 from owncloud/public-mount-apiLukas Reschke2014-12-0826-90/+346
|\ | | | | Add a public api for apps to add mounts
| * Use the mount config api for files_externalRobin Appelman2014-12-044-18/+48
| |
| * Add public api for mount configurationsRobin Appelman2014-12-0422-72/+298
| |
* | Merge pull request #12618 from owncloud/initial-work-migrate-to-appframeworkLukas Reschke2014-12-0826-397/+1332
|\ \ | | | | | | Add REST route for managing groups and users
| * | React on other statuscodes than 200Lukas Reschke2014-12-086-89/+54
| | |
| * | Merge branch 'initial-work-migrate-to-appframework' of ↵Lukas Reschke2014-12-081-7/+5
| |\ \ | | | | | | | | | | | | https://github.com/owncloud/core into initial-work-migrate-to-appframework
| | * | fix updated URL schema in JS unit testsMorris Jobke2014-12-081-7/+5
| | | |
| * | | Add statuscodesLukas Reschke2014-12-084-23/+113
| | | |
| * | | Fix urlLukas Reschke2014-12-081-1/+1
| |/ /
| * | Add REST route for user & group managementLukas Reschke2014-12-0825-340/+1222
| | | | | | | | | | | | 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.
* | | Merge pull request #12704 from owncloud/fix-12647-2Lukas Reschke2014-12-082-3/+9
|\ \ \ | | | | | | | | preserve an asterisk at the start when escaping a search term
| * | | add docArthur Schiwon2014-12-081-0/+1
| | | |
| * | | preserve an asterisk at the start when escaping a search termArthur Schiwon2014-12-082-3/+8
| | | |
* | | | Merge pull request #12621 from owncloud/add-right-marginJoas Schilling2014-12-081-3/+2
|\ \ \ \ | | | | | | | | | | Add right margin to codestyle file
| * | | | Add right margin to codestyle fileLukas Reschke2014-12-041-3/+2
| | | | | | | | | | | | | | | | | | | | Defaults to 120, we want 80 apparently
* | | | | Merge pull request #12696 from owncloud/trashbin-selected-deleteRobin Appelman2014-12-081-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Fix deleting selected files in the trashbin
| * | | | Fix deleting selected files in the trashbinRobin Appelman2014-12-081-0/+4
| | |/ / | |/| |
* | | | Merge pull request #12452 from owncloud/server2server-ng-ocsMorris Jobke2014-12-0814-55/+612
|\ \ \ \ | | | | | | | | | | OCS API for server-to-server sharing
| * | | | OCS API for server-to-server sharingBjoern Schiessle2014-12-0414-55/+612
| | | | |
* | | | | Merge pull request #12691 from owncloud/i-shall-improve-my-grep-skillsMorris Jobke2014-12-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove unexisting `htAccessWorkinght`
| * | | | | Remove unexisting `htAccessWorkinght`Lukas Reschke2014-12-081-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Partially fixes https://github.com/owncloud/core/issues/12690 - remark to myself: improve grep skills.
* | | | | Merge pull request #12394 from owncloud/files-fileactionsimprovementsLukas Reschke2014-12-083-128/+314
|\ \ \ \ \ | |/ / / / |/| | | | Improve FileActions JS to allow for custom rendering
| * | | | Improve FileActions JS to allow for custom renderingVincent Petry2014-11-243-128/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the OCA.Files.FileActions class to support passing a "render" function in the action object. The default function "_defaultRenderFunction" is used by default and renders actions in the usual actions container. Moved "Rename" and "Delete" to custom render functions.
* | | | | Merge pull request #12657 from owncloud/ajaxify-htaccess-checkMorris Jobke2014-12-084-20/+10
|\ \ \ \ \ | | | | | | | | | | | | Check for working .htaccess via AJAX
| * | | | | Check for working .htaccess via AJAXLukas Reschke2014-12-064-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12650
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0880-68/+18
| | | | | |
* | | | | | Remove changes which were inadvertently pushed to masterOlivier Paroz2014-12-081-78/+0
| | | | | |
* | | | | | Dump Arrays, Objects and Exceptions to the logOlivier Paroz2014-12-081-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge pull request #12644 from owncloud/add-hack-for-configLukas Reschke2014-12-071-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Create config if it does not exists
| * | | | | | Create config if it does not existsLukas Reschke2014-12-061-1/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #12668 from owncloud/keepspaceThomas Müller2014-12-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Keep spaces out of the string
| * | | | | | Keep spaces out of the stringVolkan Gezer2014-12-071-1/+1
| |/ / / / / | | | | | | | | | | | | Otherwise translators cannot notice them on Transifex.
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-12-0732-4/+40
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0694-252/+62
| | | | |
* | | | | Merge pull request #12636 from owncloud/fix-ie9-placeholderRaghu Nayyar2014-12-061-1/+8
|\ \ \ \ \ | | | | | | | | | | | | fix placeholder fake in IE8 & 9 that brokes group listing in user manage...
| * | | | | fix placeholder fake in IE8 & 9 that brokes group listing in user management ↵Morris Jobke2014-12-051-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | - fixes #12525
* | | | | | Merge pull request #12646 from owncloud/remove-safe-magic-quotesRobin Appelman2014-12-053-25/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove checks for safe mode and magic quotes
| * | | | | | Remove checks for safe mode and magic quotesLukas Reschke2014-12-053-25/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge pull request #12166 from helmutschneider/aws-2.7.5Lukas Reschke2014-12-0551-254/+710
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Upgrade AWS sdk to 2.7.5. Fixes #12023
| * | | | | | | Upgrade AWS sdk to 2.7.5Johan Björk2014-11-1351-254/+710
| | | | | | | |
* | | | | | | | Merge pull request #11485 from brumsoel/masterLukas Reschke2014-12-052-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix timestamp comparator return value
| * | | | | | | | Modified filesort test cases to test for large sizes & timestampsbrumsel2014-12-031-2/+2
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master'brumsel2014-12-033887-91956/+151926
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix timestamp comparator return valuebrumsoel2014-10-081-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #12477 from rjaeckel/masterLukas Reschke2014-12-051-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | restrict access to public files only
| * | | | | | | | | | blocked 3rdparty instead of l10nRobert Jäckel2014-11-271-1/+1
| | | | | | | | | | |
| * | | | | | | | | | restrict access to public files onlyRobert Jäckel2014-11-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use mod_rewrite to pretend theese files are not existend for security purposes
* | | | | | | | | | | Merge pull request #12523 from owncloud/port-11747Vincent Petry2014-12-051-3/+28
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | Only store user credentials when SMB_OC storage is enabled
| * | | | | | | | | | Only store user credentials when SMB_OC storage is enabledLukas Reschke2014-12-011-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/lib/smb_oc.php
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 17:36:21 +0000