summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc blocks for properties do not repeat the property name.Andreas Fischer2014-03-311-1/+1
|
* Use question color.Andreas Fischer2014-03-311-1/+1
|
* Remove whitespace at end of lines.Andreas Fischer2014-03-311-1/+1
|
* Merge remote-tracking branch 'owncloud/master' into db-convert-toolAndreas Fischer2014-03-312122-59192/+102947
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (663 commits) [tx-robot] updated from transifex [tx-robot] updated from transifex Sub-dir was prepended twice Sub-dir was prepended twice [tx-robot] updated from transifex Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 Emit event after setting a new expiration for a share adding @method annotation to declare methods which can be called on the wrapped statement object Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled. don't write file if opening a stream to encrypt the data fails Do not retrieve storage stats for trash bin [tx-robot] updated from transifex prevent dimmed ocdialog div from scrolling fix breadcrumbs for IE8 enable SVG->PNG fallback for 'New' menu enable SVG->PNG fallback for newly uploaded files and folders specify logo to not repeat when container is bigger fix SVG replacement for logo so it works in IE8, fix #7866 Fix swift touch operation [tx-robot] updated from transifex ... Conflicts: 3rdparty
| * Merge pull request #7939 from owncloud/wring_redirect_on_loginVincent Petry2014-03-312-6/+6
| |\ | | | | | | Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
| | * Sub-dir was prepended twiceThomas Tanghus2014-03-291-1/+1
| | |
| | * Sub-dir was prepended twiceThomas Tanghus2014-03-291-2/+1
| | |
| | * Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936Thomas Tanghus2014-03-281-4/+5
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-03-3112-12/+12
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-03-3018-53/+57
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-03-2917-110/+113
| | |
| * | Merge pull request #7845 from duritong/fix_submodule_urlThomas Müller2014-03-281-1/+1
| |\ \ | | | | | | | | use https as submodule url
| | * | use https as submodule urlmh2014-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | git:// domains might not be allowed in all environments, while cloning https through a proxy is fine. -> Make checkout in restrictive environments possible.
| * | | Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-masterMorris Jobke2014-03-281-3/+11
| |\ \ \ | | |_|/ | |/| | adding @method annotation to declare methods which can be called on the ...
| | * | adding @method annotation to declare methods which can be called on the ↵Thomas Müller2014-03-281-3/+11
| | | | | | | | | | | | | | | | wrapped statement object
| * | | Merge pull request #7934 from owncloud/addEventToExpirationDateVincent Petry2014-03-281-1/+8
| |\ \ \ | | | | | | | | | | Emit event after setting a new expiration for a share
| | * | | Emit event after setting a new expiration for a shareMorris Jobke2014-03-281-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | all credits to @frisco82 https://github.com/owncloud/core/pull/5335
| * | | | Merge pull request #7770 from jamesryanbell/masterMorris Jobke2014-03-281-2/+2
| |\ \ \ \ | | | | | | | | | | | | SVG support detection
| | * | | | SVG support detectionjamesryanbell2014-03-171-2/+2
| | | | | | | | | | | | | | | | | | The SVGSupport checkMimeType method was failing on my setup as the headers are all returned in lowercase. I have lowercase all the indexes and modified the if statement so that it doesn't matter what case the headers are returned in
| * | | | | Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_failsBjörn Schießle2014-03-281-0/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | | don't write file if opening a stream to encrypt the data fails
| | * | | | don't write file if opening a stream to encrypt the data failsBjoern Schiessle2014-03-281-0/+2
| | | | | |
| * | | | | Merge pull request #7824 from owncloud/hash-parameter-orderThomas Müller2014-03-284-19/+35
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix parameter order for Storage\Local::hash
| | * | | | | fix temporary file based common hashRobin Appelman2014-03-211-2/+1
| | | | | | |
| | * | | | | Fix parameter order for Storage\Local::hashRobin Appelman2014-03-203-17/+34
| | | | | | |
| * | | | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_apiVincent Petry2014-03-288-1706/+2026
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | sharing api cleanup, first step
| | * | | | | | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-252-3/+88
| | | | | | | |
| | * | | | | | fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-252-85/+7
| | | | | | | |
| | * | | | | | don't assign variables in if conditionBjoern Schiessle2014-03-251-18/+17
| | | | | | | |
| | * | | | | | add todoBjoern Schiessle2014-03-251-1/+1
| | | | | | | |
| | * | | | | | always return an arrayBjoern Schiessle2014-03-252-17/+10
| | | | | | | |
| | * | | | | | seperate formatResults()Bjoern Schiessle2014-03-251-18/+31
| | | | | | | |
| | * | | | | | don't assign variables in if conditionsBjoern Schiessle2014-03-251-2/+4
| | | | | | | |
| | * | | | | | use variableBjoern Schiessle2014-03-251-6/+5
| | | | | | | |
| | * | | | | | seperate transformDBResultsBjoern Schiessle2014-03-251-24/+33
| | | | | | | |
| | * | | | | | seperate creation of select statementBjoern Schiessle2014-03-251-38/+44
| | | | | | | |
| | * | | | | | remove prepFileTarget() seems that it is no longer in useBjoern Schiessle2014-03-252-27/+0
| | | | | | | |
| | * | | | | | add a "helper" and a "hooks" class. Move constants needed by multiple classesBjoern Schiessle2014-03-256-355/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a "constants" class
| | * | | | | | added private share apiBjoern Schiessle2014-03-252-1647/+1944
| | | | | | | |
| * | | | | | | Merge pull request #7613 from owncloud/fix_urlGenerator2Vincent Petry2014-03-282-4/+29
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
| | * | | | | | Fix unit testsThomas Tanghus2014-03-071-3/+27
| | | | | | | |
| | * | | | | | Add \OC:: to URLGenerator::getAbsoluteURL()Thomas Tanghus2014-03-061-1/+2
| | | | | | | |
| * | | | | | | Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction ↵Thomas Müller2014-03-281-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled. Squashed commit of the following: commit eaf4f43f687db59137a0b00bc0e12ed4eb0d0943 Merge: 1e9c5be 1e7d7bd Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Mar 28 11:49:04 2014 +0100 Merge branch 'master' of https://github.com/kev300/core into kev300-master commit 1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:11:42 2013 +0100 Update util.php commit 3f0723f054a27a506be7f26932ccb54fff6f2be9 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:09:15 2013 +0100 Update util.php commit 512176abdcfbe5b2b060b91033abc9608912d1f8 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:02:04 2013 +0100 Update util.php commit 6cbefd080188d287024e0b047b88dd4525d6c2c1 Author: kev300 <admin@gadeco.de> Date: Mon Dec 16 16:44:46 2013 +0100 Update util.php Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
| * | | | | | | Merge pull request #7829 from owncloud/cachefolderlocationVincent Petry2014-03-285-9/+111
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Cache folder is now configurable
| | * | | | | | | Remove unused setUserVars utility methodVincent Petry2014-03-261-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That method was moved to the external storage recently so isn't needed here any more.
| | * | | | | | | Added unit tests for external cache folderVincent Petry2014-03-241-0/+51
| | | | | | | | |
| | * | | | | | | Cache folder is now configurableVincent Petry2014-03-244-9/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using an external cache folder, it is automatically mounted in FileSystem::initFileSystem so that any app can use it transparently by creating a view on the "/$user/cache" directory.
| * | | | | | | | Merge pull request #7703 from rnveach/jstestThomas Müller2014-03-282-1/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixing issues found with running 'autotest-js' locally
| | * | | | | | | | added missing packages required to run "karma" and "phantomjs" insidernveach2014-03-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "autotest-js"
| | * | | | | | | | added missing ignores for files and directories created by "autotest-js"rnveach2014-03-121-0/+5
| | | | | | | | | |
| * | | | | | | | | Merge pull request #7678 from owncloud/test-bootstrap-fileproxy-cleanupVincent Petry2014-03-281-0/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | Cleanup the fileproxy proxies on test bootstrap
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-14 10:32:25 +0000