summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 8.0 alpha 1v8.0.0alpha1Frank Karlitschek2015-01-011-2/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-0134-36/+732
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-3156-34/+810
|
* jump to 8.0.0.0 The test upgrade and installation of apps realistic.Frank Karlitschek2014-12-301-1/+1
| | | | | Don´t open the champaign yet. This is obviously not the final release. ;-) The final will have the version number 8.0.0.x
* Merge pull request #13055 from owncloud/dbal25Lukas Reschke2014-12-301-0/+0
|\ | | | | update dbal to 2.5.0
| * update dbal to 2.5.0Robin Appelman2014-12-301-0/+0
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-302-0/+8
|
* Merge pull request #12854 from owncloud/add-direct-download-linkFrank Karlitschek2014-12-295-0/+58
|\ | | | | Adding foundation for the direct download url
| * adding getDirectDownload() to WrapperThomas Müller2014-12-282-2/+14
| |
| * Adding basement for the direct download urlThomas Müller2014-12-284-0/+46
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2916-8/+60
|/
* Merge pull request #13023 from owncloud/provisioning_api-2Thomas Müller2014-12-2813-0/+1680
|\ | | | | [jenkins] Add provisioning_api app
| * Add provisioning_api appTom Needham2014-12-2413-0/+1680
| | | | | | | | | | | | enable unit tests for provisioning api fix admin docu key
* | Merge pull request #13043 from owncloud/check-for-hashThomas Müller2014-12-281-1/+2
|\ \ | | | | | | Check for hash
| * | Check for hashLukas Reschke2014-12-281-1/+2
| | | | | | | | | | | | See https://github.com/owncloud/core/pull/13042
* | | Merge pull request #13035 from owncloud/new_edition_detectionLukas Reschke2014-12-282-7/+6
|\ \ \ | | | | | | | | Automatically detect the edition based on the enterprise_key app.
| * | | remove EditionFrank Karlitschek2014-12-251-2/+0
| | | |
| * | | Automatically detect the edition based on the enterprise_key app.Frank Karlitschek2014-12-252-5/+6
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-284-0/+50
| | |
* | | Merge pull request #13025 from lyonel/masterThomas Müller2014-12-272-2/+2
|\ \ \ | | | | | | | | user_ldap is too verbose by default
| * | | Be less verbose when using a paged searchLyonel Vincent2014-12-241-1/+1
| | | | | | | | | | | | Lower the priority from INFO to DEBUG
| * | | Be less verbose when disabling SSL cert validationLyonel Vincent2014-12-241-1/+1
| | |/ | |/| | | | change log level from WARN to DEBUG
* | | Merge pull request #13012 from owncloud/small_fixThomas Müller2014-12-271-11/+9
|\ \ \ | | | | | | | | only send activity if we have a valid path and the file is readable
| * | | only send activity if we have a valid path and the file is readableBjoern Schiessle2014-12-231-11/+9
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2718-14/+86
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2620-28/+166
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2518-18/+134
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2442-64/+210
| |
* | Merge pull request #12830 from owncloud/intelligent-containerThomas Müller2014-12-238-14/+586
|\ \ | | | | | | Intelligent container
| * | Intelligent containerBernhard Posselt2014-12-238-14/+586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * resolves dependencies by type hint or variable name * simpler route.php * implementation of https://github.com/owncloud/core/issues/12829 Generates and injects parameters automatically. You can now build full classes like $c->query('MyClassName') without having to register it as a service. The resolved object's instance will be saved by using registerService. If a constructor parameter is not type hinted, the parameter name will be taken. Therefore the following two implementations are identical: class Class1 { function __construct(MyClassName $class) class Class1 { function __construct($MyClassName) This makes it possible to also inject primitive values such as strings, arrays etc. In addition if the query could not be resolved, a `QueryException` is now thrown Routes can now be returned as an array from `routes.php` and an `appinfo/application.php` is optional Old commit messages: make it possible to return the routes instead of having to intialize the application try to get the controller by convention add first implementation of automatic resolve add another test just to be sure store the resolved object more tests add phpdoc to public app.php method use the same variable for the public app.php method deprecate old methods and add services for public interfaces deprecated getServer method disallow private api injection for apps other than core or settings (settings should be an app goddamnit :D) register userid because its such an often used variable fix indention and leading slash use test namespace add deprecation reasons, remove private api usage checks and remove deprecation from getServer() add additional public interfaces add public interface for rootfolder fix syntax error remove deprecation from methods where no alternative is there yet remove deprecated from method which has no alternative add timezone public service for #12881 add another deprecation hint move deprecation into separate branch remove dead comment first try to get the namespace from the info.xml, if it does not exist, just uppercase the first letter also trim the namespace name add an interface for timefactory move timefactory to public and add icontrollermethodreflector keep core interface fix copyright date in headers
* | | Merge pull request #13008 from owncloud/db-connection-test-cleanupMorris Jobke2014-12-231-0/+19
|\ \ \ | |_|/ |/| | Clean up test table in Connection Test to prevent unnecessary failures.
| * | Clean up test table in Connection Test to prevent unnecessary failures.Andreas Fischer2014-12-231-0/+19
| | |
* | | Merge pull request #10292 from owncloud/external-share-deleteMorris Jobke2014-12-232-2/+5
|\ \ \ | |_|/ |/| | Fix trashbin when deleting a file over an external share
| * | Fix trashbin when deleting a file over an external shareRobin Appelman2014-08-082-2/+5
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2350-40/+258
| | |
* | | Merge pull request #12997 from owncloud/sharing_activitiesBjörn Schießle2014-12-223-7/+44
|\ \ \ | |_|/ |/| | add activity if public shared file/folder was downloaded
| * | Make sure the path passed to the activity manager is normalizedRobin Appelman2014-12-221-1/+1
| | |
| * | add activity if public shared file/folder was downloadedBjoern Schiessle2014-12-223-6/+43
| | |
* | | Merge pull request #13003 from owncloud/remove-skip-to-contentMorris Jobke2014-12-222-4/+1
|\ \ \ | | | | | | | | remove skip to content for now, see #12999
| * | | remove skip to content for now, see #12999Jan-Christoph Borchardt2014-12-222-4/+1
|/ / /
* | | Merge pull request #12860 from owncloud/remove-apparently-unused-fileThomas Müller2014-12-221-34/+0
|\ \ \ | |/ / |/| | Remove unused file
| * | Remove unused fileLukas Reschke2014-12-151-34/+0
| | | | | | | | | | | | | | | | | | That file is apparently unused - introduced with https://github.com/owncloud/core/commit/30b58f56771aa54304069d40a62070c06f5308fc I guess we can remove it...
* | | Merge pull request #11810 from owncloud/hhvm-autotestThomas Müller2014-12-222-1/+268
|\ \ \ | | | | | | | | Adding autotest-hhvm.sh [WIP]
| * | | HHVM sets stream meta datum wrapper_type to 'File' instead of 'user-space'.Andreas Fischer2014-12-191-1/+2
| | | |
| * | | Adding autotest-hhvm.shThomas Müller2014-12-181-0/+266
| | | |
* | | | Merge pull request #12969 from owncloud/clarify-docsMorris Jobke2014-12-222-4/+4
|\ \ \ \ | | | | | | | | | | Clarify return values
| * | | | Fix typoLukas Reschke2014-12-192-2/+2
| | | | |
| * | | | Clarify return valuesLukas Reschke2014-12-192-2/+2
| | | | | | | | | | | | | | | | | | | | This function returns `null` when no user is logged-in.
* | | | | Merge pull request #12961 from owncloud/try_to_cache_keysMorris Jobke2014-12-224-19/+91
|\ \ \ \ \ | | | | | | | | | | | | cache keys to read them only once from the hard disc
| * | | | | cache keys to read them only once from the hard discBjoern Schiessle2014-12-194-19/+91
| | | | | |