summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* explicitly add empty placeholder to inputs which use infield labels, fix #2049Jan-Christoph Borchardt2013-03-044-12/+12
|
* 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.
| * 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 headers
| * | Only send the standard headersLukas Reschke2013-03-041-1/+0
|/ / | | | | Fixes https://github.com/owncloud/apps/issues/675
* | Merge pull request #2084 from owncloud/fix-group-displaynamesBernhard Posselt2013-03-042-7/+7
|\ \ | | | | | | Fix #2074 by initializing as an array
| * | 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 optional
| * | | 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 function
| * | fix expire functionBjörn Schießle2013-03-041-5/+5
| |/
* | Merge pull request #2076 from owncloud/filestable-specificityBernhard Posselt2013-03-042-2/+2
|\ \ | |/ |/| fix files table CSS specificity issue causing multiselect bar overlap
| * 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 homes
| * 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
|\ \ | |/ |/| fix wrong var name
| * 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
|\ | | | | use p() for the output and not for the comparison
| * 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 quota calculation for trash and versions
| * | 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: typos in app description
| * | 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
|\ \ | | | | | | Fix file actions including permanent shares
| * | durhurrrhurrrJörn Friedrich Dreyer2013-03-031-1/+7
| | |
* | | Merge pull request #2065 from owncloud/files_datepickerBart Visscher2013-03-042-2/+2
|\ \ \ | |_|/ |/| | Datepicker height fixed.
| * | Datepicker height fixed.raghunayyar2013-03-042-2/+2
| | | | | | | | | | | | New id defined for files table for positioning.
* | | Merge pull request #2061 from owncloud/app-textFrank Karlitschek2013-03-041-1/+1
|\ \ \ | | | | | | | | Add the description as text and not as html
| * | | Add the description as text and not as htmlLukas Reschke2013-03-041-1/+1
| | | |
* | | | Merge pull request #2060 from owncloud/escapeGroupnameFrank Karlitschek2013-03-041-5/+5
|\ \ \ \ | | | | | | | | | | Sanitize uid, group and quota
| * | | | Sanitize uid, group and quotaLukas Reschke2013-03-041-5/+5
| |/ / /
* | | | Merge pull request #2059 from owncloud/getlogFrank Karlitschek2013-03-042-10/+3
|\ \ \ \ | |_|/ / |/| | | Add log as text and not as HTML
| * | | Add log as text and not as HTMLLukas Reschke2013-03-032-10/+3
| |/ /
* | | Merge pull request #2062 from owncloud/shareTypeBernhard Posselt2013-03-031-3/+3
|\ \ \ | | | | | | | | Sanitize shareWith
| * | | Sanitize shareWithLukas Reschke2013-03-041-3/+3
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2013-03-04141-1244/+951
|/ /
* | Merge pull request #2057 from owncloud/upgrade-fixesFrank Karlitschek2013-03-031-2/+4
|\ \ | | | | | | Upgrade fixes
| * | Disable loading of backgroundjobs js when upgrade is neededBart Visscher2013-03-031-1/+1
| | |
| * | Check maintenance mode before loading apps in route matcherBart Visscher2013-03-031-1/+3
| | |
* | | Merge pull request #2058 from owncloud/fix-getlogFrank Karlitschek2013-03-031-1/+10
|\ \ \ | |/ / |/| | Fix encoding settings ajax getlog
| * | Fix encoding settings ajax getlogBart Visscher2013-03-031-1/+10
|/ /
* | Merge pull request #2034 from owncloud/fix_bug47Michael Gapczynski2013-03-032-58/+68
|\ \ | | | | | | Fix #47 - Duplicate files create a (2) when multiples are uploaded
| * | new Array() -> []Georg Ehrke2013-03-021-1/+1
| | |
| * | update OC.Notification.showGeorg Ehrke2013-03-021-9/+3
| | |
| * | fix oc#47Georg Ehrke2013-03-012-57/+73
| | |
* | | Merge pull request #2050 from owncloud/fix-readfile-commentBernhard Posselt2013-03-031-1/+1
|\ \ \ | | | | | | | | Chunk size comment should say kB, not MB
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-19 11:00:50 +0000