summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add provisioning_api appTom Needham2014-12-2413-0/+1680
| | | | | | enable unit tests for provisioning api fix admin docu key
* [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
| | | | | |
* | | | | | Merge pull request #12983 from owncloud/root-ifaceMorris Jobke2014-12-222-1/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add an interface for the root folder so apps have an interface to deal with storage
| * | | | | | add an interface for the root folder so apps have an interface to deal with ↵Bernhard Posselt2014-12-212-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage fix comments and newline add newline
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2244-14/+852
| | | | | | |
* | | | | | | Merge pull request #12978 from owncloud/fix-support-claimThomas Müller2014-12-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change support message to be more explicit about the enterprise edition
| * | | | | | | Change support message to be more explicit about the enterprise editionMorris Jobke2014-12-201-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #12981 from owncloud/MDB2SchemaManager-tearDown-OracleThomas Müller2014-12-211-3/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Properly call parent::tearDown() in MDB2SchemaManager::tearDown().
| * | | | | | | | Properly call parent::tearDown() in MDB2SchemaManager::tearDown().Andreas Fischer2014-12-201-3/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The early return introduced by 04c982a96e19f2254739c24ee8c6b568edcb4190 prevents parent::tearDown() being called on Oracle.
* | | | | | | | Merge pull request #12982 from owncloud/timefac-ifaceThomas Müller2014-12-212-1/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add an interface for the timefactory class
| * | | | | | | | add an interface for the timefactory classBernhard Posselt2014-12-202-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix indention
* | | | | | | | | Merge pull request #12942 from owncloud/favs-missingsharedsubdirsMorris Jobke2014-12-212-13/+78
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix issues with searchByTag in shared storage
| * | | | | | | | | Fix issues with searchByTag in shared storageVincent Petry2014-12-182-13/+78
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2174-18/+398
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #12974 from owncloud/documents-typefaceMorris Jobke2014-12-201-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | change Documents default typeface from serif to sans-serif
| * | | | | | | | change Documents default typeface from serif to sans-serifJan-Christoph Borchardt2014-12-191-0/+0
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-20448-610/+794
| | | | | | | | |
* | | | | | | | | Merge pull request #12972 from owncloud/use-https-where-possibleTom Needham2014-12-191-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Link to HTTPS page
| * | | | | | | | Link to HTTPS pageLukas Reschke2014-12-191-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Those domains are now accessible via HTTPS
* | | | | | | | Fix Undefined variable: result at tags.php#231derkostka2014-12-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix app":"PHP","message":"Undefined variable: result at \/var\/www\/owncloud\/lib\/private\/tags.php#231" by moving the function call into the respective loop Adjust indentation Do it right - indentation sorry, this is my first one
* | | | | | | | Merge pull request #12749 from owncloud/server2server-sharing-ngBjörn Schießle2014-12-1930-247/+948
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | server to server sharing next generation
| * | | | | | | | Next step in server-to-server sharing next generation, see #12285Bjoern Schiessle2014-12-1930-247/+948
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Beside some small improvements and bug fixes this will probably the final state for OC8. To test this you need to set up two ownCloud instances. Let's say: URL: myPC/firstOwnCloud user: user1 URL: myPC/secondOwnCloud user: user2 Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud". The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined. If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
* | | | | | | | Merge pull request #12101 from owncloud/ldap_split_mappingblizzz2014-12-1915-282/+573
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Ldap split mapping from Access superclass
| * | | | | | | Split mapping from Access and Helper classes into it's own. Fully test them, ↵Arthur Schiwon2014-12-1915-282/+573
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | too. remove unused methods split mapping methods off from Access class fix DB query handling move 'clear mapping' methods from static helper to new mapping class add tests test directly with DB finishing tests and fix return value from setDNbyUUID add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class. add missing info to PHPDoc add unmap method fix namespaces fix test inheritance PHPDoc and a small code restructure for scrutinizer, no effective changes PostgreSQL does not accept LIMIT in DELETE queries phpdoc fixes, no code changes
* | | | | | | | Merge pull request #12923 from owncloud/ultra-slim-version-of-incognito-modeLukas Reschke2014-12-192-0/+12
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Add ultra-slim hack for incognito mode
| * | | | | | | Add ultra-slim hack for incognito modeLukas Reschke2014-12-172-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed at https://github.com/owncloud/core/pull/12912#issuecomment-67391155
* | | | | | | | Merge pull request #12956 from owncloud/jenkins-user-backend-namesThomas Müller2014-12-1911-11/+105
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [jenkins only] introduce names for user backends - IUserBackend
| * | | | | | | | introduce names for user backends - IUserBackendMorris Jobke2014-12-1911-11/+105
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * LDAP with multiple servers also proved backendName