summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | various fixes as requested by pr reviewersGeorg Ehrke2014-06-025-28/+22
| * | | | | | read ocsid from shipped apps on installGeorg Ehrke2014-05-311-0/+3
| * | | | | | Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-05-311-3/+3
| |\ \ \ \ \ \
| * | | | | | | add button for properly uninstalling appsGeorg Ehrke2014-05-315-11/+48
| * | | | | | | Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-05-311948-48418/+116556
| |\ \ \ \ \ \ \
| * | | | | | | | make it possible to update shipped apps via the appstoreGeorg Ehrke2014-05-316-183/+438
* | | | | | | | | Merge pull request #9048 from owncloud/fix_9041Morris Jobke2014-06-161-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | styleArthur Schiwon2014-06-161-2/+2
| * | | | | | | | escape before output, fixes #9041Arthur Schiwon2014-06-161-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #9040 from owncloud/fix-xssMorris Jobke2014-06-162-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Do even more sanitizationLukas Reschke2014-06-141-5/+5
| * | | | | | | | Sanitize name of shareeLukas Reschke2014-06-141-1/+1
* | | | | | | | | Merge pull request #9030 from owncloud/default-allow-user-mount-backendsMorris Jobke2014-06-163-5/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix camelCase and avoiud re-wrapping $()Morris Jobke2014-06-161-4/+4
| * | | | | | | | | fix typo - Backups -> BackendsMorris Jobke2014-06-163-4/+4
| * | | | | | | | | AllowUserMount defaults now to all backends fixes #7958Morris Jobke2014-06-132-0/+13
* | | | | | | | | | Merge pull request #8716 from owncloud/forget-documentationVolkan Gezer2014-06-161-1/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | app manager forgets the documentation linksVolkan Gezer2014-06-061-1/+16
* | | | | | | | | | Merge pull request #8917 from owncloud/repair-routine-baseVincent Petry2014-06-166-45/+334
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed instanceof to use interface instead of classVincent Petry2014-06-121-1/+2
| * | | | | | | | | | Added RepairStep interface and default repair step listsVincent Petry2014-06-126-69/+304
| * | | | | | | | | | Add support for repair step classesVincent Petry2014-06-122-3/+56
* | | | | | | | | | | Merge pull request #9027 from owncloud/fix-password-saved-share-layoutVincent Petry2014-06-162-0/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix pathMorris Jobke2014-06-141-1/+1
| * | | | | | | | | | | fix layout of password protected sharesMorris Jobke2014-06-132-0/+9
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-1663-316/+433
* | | | | | | | | | | Merge pull request #9022 from owncloud/speedup-nested-ldap-groupsmacjohnny2014-06-162-6/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | drastic speedup for nested ldap groupsmacjohnny2014-06-132-6/+13
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-15219-5995/+7838
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-httpsLukas Reschke2014-06-141-29/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | migrate table layout to paragraph layout for HTTPS settingMorris Jobke2014-06-131-29/+25
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #8618 from owncloud/yet-another-ajax-lost-passwordFrank Karlitschek2014-06-1410-170/+440
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | add proper Exception message for invalid tokenMorris Jobke2014-06-131-2/+5
| * | | | | | | | | | use array_merge for merging arrays in PHPMorris Jobke2014-06-131-1/+1
| * | | | | | | | | | complete renaming uid to userIdMorris Jobke2014-06-132-6/+6
| * | | | | | | | | | remove whitespace at end of lineMorris Jobke2014-06-131-14/+14
| * | | | | | | | | | Migrate ยด to 'Morris Jobke2014-06-132-5/+5
| * | | | | | | | | | Remove infield label, add password icon, fix layoutMorris Jobke2014-06-133-2/+12
| * | | | | | | | | | reformat method call and fix paranthesis mismatchMorris Jobke2014-06-131-8/+8
| * | | | | | | | | | more style fixesBernhard Posselt2014-06-131-15/+24
| * | | | | | | | | | use more stuff from core :)Bernhard Posselt2014-06-133-76/+113
| * | | | | | | | | | Add missing useVictor Dubiniuk2014-06-131-0/+1
| * | | | | | | | | | Fix check for user existenceVictor Dubiniuk2014-06-131-1/+2
| * | | | | | | | | | Remove debug outputVictor Dubiniuk2014-06-131-1/+0
| * | | | | | | | | | Change routes. Update templatesVictor Dubiniuk2014-06-135-24/+27
| * | | | | | | | | | Changes according to reviewVictor Dubiniuk2014-06-135-156/+154
| * | | | | | | | | | Use appframeworkVictor Dubiniuk2014-06-138-200/+229
| * | | | | | | | | | BasicsVictor Dubiniuk2014-06-137-48/+228
| |/ / / / / / / / /
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-14358-5450/+1627
* | | | | | | | | | remove double spaceMorris Jobke2014-06-141-1/+1