summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add provisioning_api appTom Needham2014-12-2413-0/+1680
* [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 containerBernhard Posselt2014-12-238-14/+586
* | 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.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 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
|\ \ \ | |_|/ |/| |
| * | 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 #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 fileLukas Reschke2014-12-151-34/+0
* | | Merge pull request #11810 from owncloud/hhvm-autotestThomas Müller2014-12-222-1/+268
|\ \ \
| * | | 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
|\ \ \ \
| * | | | Fix typoLukas Reschke2014-12-192-2/+2
| * | | | Clarify return valuesLukas Reschke2014-12-192-2/+2
* | | | | 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 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 s...Bernhard Posselt2014-12-212-1/+35
* | | | | | | [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 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().Andreas Fischer2014-12-201-3/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #12982 from owncloud/timefac-ifaceThomas Müller2014-12-212-1/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | add an interface for the timefactory classBernhard Posselt2014-12-202-1/+41
* | | | | | | | | Merge pull request #12942 from owncloud/favs-missingsharedsubdirsMorris Jobke2014-12-212-13/+78
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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-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 pageLukas Reschke2014-12-191-2/+2
| |/ / / / / / /
* | | | | | | | Fix Undefined variable: result at tags.php#231derkostka2014-12-191-4/+4
* | | | | | | | Merge pull request #12749 from owncloud/server2server-sharing-ngBjörn Schießle2014-12-1930-247/+948
|\ \ \ \ \ \ \ \
| * | | | | | | | Next step in server-to-server sharing next generation, see #12285Bjoern Schiessle2014-12-1930-247/+948
| |/ / / / / / /
* | | | | | | | Merge pull request #12101 from owncloud/ldap_split_mappingblizzz2014-12-1915-282/+573
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Split mapping from Access and Helper classes into it's own. Fully test them, ...Arthur Schiwon2014-12-1915-282/+573
* | | | | | | | Merge pull request #12923 from owncloud/ultra-slim-version-of-incognito-modeLukas Reschke2014-12-192-0/+12
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add ultra-slim hack for incognito modeLukas Reschke2014-12-172-0/+12
* | | | | | | | Merge pull request #12956 from owncloud/jenkins-user-backend-namesThomas Müller2014-12-1911-11/+105
|\ \ \ \ \ \ \ \
| * | | | | | | | introduce names for user backends - IUserBackendMorris Jobke2014-12-1911-11/+105
| | |_|_|_|/ / / | |/| | | | | |