summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Check for version before mounting a public linkMorris Jobke2015-01-052-2/+3
* Merge pull request #13099 from owncloud/fix-provisioning-apiLukas Reschke2015-01-051-5/+0
|\
| * Remove unnecessary setUp methodTom Needham2015-01-041-5/+0
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0556-38/+314
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0456-124/+194
* | Merge pull request #13091 from owncloud/fix-provisioning-apiMorris Jobke2015-01-035-4/+24
|\|
| * Add proper group setup and teardown to all provisioning_api testsTom Needham2015-01-033-0/+9
| * Create admin group before running provisioning_api testsTom Needham2015-01-031-0/+5
| * Ensure admin group is present before running testsTom Needham2015-01-034-4/+10
* | Merge pull request #13082 from mmattel/rename_text_no_external_storagesMorris Jobke2015-01-031-1/+1
|\ \
| * | adopt text "no ecternal storage configured"root2015-01-021-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-038-44/+46
| |/ |/|
* | Change array element order to fix failing testTom Needham2015-01-021-1/+1
* | Add placeholder app.php for provisioning_api so app is detectedTom Needham2015-01-021-0/+23
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0218-52/+92
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-0120-24/+224
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-3128-30/+212
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-298-4/+24
* Merge pull request #13023 from owncloud/provisioning_api-2Thomas Müller2014-12-289-0/+1674
|\
| * Add provisioning_api appTom Needham2014-12-249-0/+1674
* | Merge pull request #13025 from lyonel/masterThomas Müller2014-12-272-2/+2
|\ \
| * | Be less verbose when using a paged searchLyonel Vincent2014-12-241-1/+1
| * | Be less verbose when disabling SSL cert validationLyonel Vincent2014-12-241-1/+1
| |/
* | 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 readableBjoern Schiessle2014-12-231-11/+9
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2710-4/+20
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2610-0/+22
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2510-18/+102
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2424-4/+76
|/
* 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-2326-6/+98
* | 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 #12860 from owncloud/remove-apparently-unused-fileThomas Müller2014-12-221-34/+0
|\ \ \ | |/ / |/| |
| * | Remove unused fileLukas Reschke2014-12-151-34/+0
* | | 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
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2224-10/+270
* | | | 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-2130-12/+102
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-20194-42/+278
* | | | Merge pull request #12749 from owncloud/server2server-sharing-ngBjörn Schießle2014-12-1916-123/+513
|\ \ \ \
| * | | | Next step in server-to-server sharing next generation, see #12285Bjoern Schiessle2014-12-1916-123/+513
* | | | | Merge pull request #12101 from owncloud/ldap_split_mappingblizzz2014-12-1913-282/+571
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Split mapping from Access and Helper classes into it's own. Fully test them, ...Arthur Schiwon2014-12-1913-282/+571
* | | | | Merge pull request #12956 from owncloud/jenkins-user-backend-namesThomas Müller2014-12-193-3/+28
|\ \ \ \ \
| * | | | | introduce names for user backends - IUserBackendMorris Jobke2014-12-193-3/+28