summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2096 from owncloud/cache-upgrade-idMichael Gapczynski2013-03-041-4/+5
|\
| * Cache: more efficient detection for existing entries during upgradeRobin Appelman2013-03-041-9/+3
| * Cache: also check if the file id is already in the cache during upgradeRobin Appelman2013-03-041-3/+10
* | Merge pull request #2077 from owncloud/oc_filepicker_inline_jsLukas Reschke2013-03-041-4/+6
|\ \
| * | Remove inline js from OC.Dialogs.FilePicker.Thomas Tanghus2013-03-041-4/+6
* | | Merge pull request #2092 from owncloud/infieldlabels-placeholderLukas Reschke2013-03-044-12/+12
|\ \ \
| * | | explicitly add empty placeholder to inputs which use infield labels, fix #2049Jan-Christoph Borchardt2013-03-044-12/+12
* | | | Merge pull request #2090 from owncloud/fixing-2089-masterFrank Karlitschek2013-03-041-1/+1
|\ \ \ \
| * | | | fixes #2089Thomas Mueller2013-03-041-1/+1
| |/ / /
* | | | Merge pull request #2030 from j-ed/masterBernhard Posselt2013-03-046-28/+28
|\ \ \ \
| * | | | Update app.phpj-ed2013-03-021-1/+1
| * | | | Update app.phpj-ed2013-03-021-2/+2
| * | | | Update app.phpj-ed2013-03-021-2/+2
| * | | | Update app.phpj-ed2013-03-021-7/+7
| * | | | Update app.phpj-ed2013-03-021-6/+6
| * | | | Update app.phpj-ed2013-03-021-10/+10
* | | | | Merge pull request #2088 from owncloud/fixing-1844-again-masterBernhard Posselt2013-03-043-2/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | adding test case for getDefaultEmailAddress() + fixing #1844 againThomas Mueller2013-03-043-2/+15
* | | | | Merge pull request #2078 from owncloud/save_category_relationsThomas Müller2013-03-041-5/+4
|\ \ \ \ \
| * | | | | VCategories: Don't forget to save category relations if category exists.Thomas Tanghus2013-03-041-5/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #2085 from owncloud/csp_shitty-browsersLukas Reschke2013-03-041-1/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Only send the standard headersLukas Reschke2013-03-041-1/+0
|/ / / /
* | | | Merge pull request #2084 from owncloud/fix-group-displaynamesBernhard Posselt2013-03-042-7/+7
|\ \ \ \
| * | | | Fix #2074 by initializing as an arrayMichael Gapczynski2013-03-042-7/+7
* | | | | Merge pull request #2082 from owncloud/fix-permissions-classBernhard Posselt2013-03-041-1/+1
|\ \ \ \ \
| * | | | | Change remove() $user parameter to optionalMichael Gapczynski2013-03-041-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #2079 from owncloud/fix_expire_functionBernhard Posselt2013-03-041-5/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix expire functionBjörn Schießle2013-03-041-5/+5
| |/ / /
* | | | Merge pull request #2076 from owncloud/filestable-specificityBernhard Posselt2013-03-042-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Corrects Files Layout in Trashbinraghunayyar2013-03-041-1/+1
| * | | fix files table CSS specificity issue causing multiselect bar overlap, fix #2075Jan-Christoph Borchardt2013-03-041-1/+1
|/ / /
* | | Merge pull request #2073 from owncloud/trashbin_userHomeblizzz2013-03-041-4/+4
|\ \ \
| * | | make trashbin work with different user homesBjörn Schießle2013-03-041-4/+4
* | | | Merge pull request #2072 from owncloud/fix_typoFrank Karlitschek2013-03-041-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | damn copy&paste, fix wrong var nameBjörn Schießle2013-03-041-1/+1
|/ / /
* | | Merge pull request #2069 from owncloud/fix_sanitize_callLukas Reschke2013-03-042-2/+2
|\ \ \
| * | | fix p() callBjörn Schießle2013-03-041-1/+1
| * | | use p() for the output and not for the comparisonBjörn Schießle2013-03-041-1/+1
* | | | Merge pull request #2070 from owncloud/fix_quotaBjörn Schießle2013-03-042-5/+5
|\ \ \ \
| * | | | fix type in var nameBjörn Schießle2013-03-042-2/+2
| * | | | fix quota calculation for trash and versionsBjörn Schießle2013-03-042-5/+5
| |/ / /
* | | | Merge pull request #2068 from owncloud/fix_ldap_typoLukas Reschke2013-03-042-3/+5
|\ \ \ \
| * | | | LDAP: orthograophy fixArthur Schiwon2013-03-041-1/+1
| * | | | LDAP: typos in app descriptionArthur Schiwon2013-03-042-3/+5
|/ / / /
* | | | Merge pull request #2044 from owncloud/fix_1779_including_permanent_sharesBart Visscher2013-03-041-1/+7
|\ \ \ \
| * | | | durhurrrhurrrJörn Friedrich Dreyer2013-03-031-1/+7
* | | | | Merge pull request #2065 from owncloud/files_datepickerBart Visscher2013-03-042-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Datepicker height fixed.raghunayyar2013-03-042-2/+2
* | | | | Merge pull request #2061 from owncloud/app-textFrank Karlitschek2013-03-041-1/+1
|\ \ \ \ \
| * | | | | Add the description as text and not as htmlLukas Reschke2013-03-041-1/+1