summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-07152-1067/+1060
* Merge pull request #10224 from owncloud/typo-fixMorris Jobke2014-08-071-2/+2
|\
| * typo fix from transifex suggestionVolkan Gezer2014-08-061-2/+2
|/
* Merge pull request #10144 from owncloud/issue/9972Thomas Müller2014-08-064-4/+4
|\
| * Fix isLoggedIn() check for user '0'Joas Schilling2014-08-042-2/+2
| * Fix getting group '0' from database backendJoas Schilling2014-08-042-2/+2
* | Merge pull request #10186 from owncloud/versioning_fix_pathThomas Müller2014-08-062-2/+36
|\ \
| * | add unit test to make sure getVersions returns the correct resultBjoern Schiessle2014-08-051-0/+34
| * | make sure that the versions array contains the correct pathBjoern Schiessle2014-08-051-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0637-174/+199
* | | Merge pull request #10191 from owncloud/sharing_rm_trailing_slashMorris Jobke2014-08-052-2/+2
|\ \ \
| * | | remove trailing slash from pathBjoern Schiessle2014-08-051-1/+2
| * | | remove unused variableBjoern Schiessle2014-08-051-1/+0
| |/ /
* | | Merge pull request #9520 from owncloud/theme_urlsBjörn Schießle2014-08-053-15/+59
|\ \ \
| * | | remove escaping because it's unneededMorris Jobke2014-08-051-1/+1
| * | | fix uppercase issueMorris Jobke2014-08-051-4/+4
| * | | Added to personal settings page.scolebrook2014-08-051-2/+2
| * | | Add ability to theme iOS and Android client URLs just like desktop URLs.scolebrook2014-08-052-13/+57
* | | | Merge pull request #10176 from owncloud/fix-install-icon-sizeMorris Jobke2014-08-051-1/+1
|\ \ \ \
| * | | | use correct app-icon class for new apps as well, fix icon sizeJan-Christoph Borchardt2014-08-051-1/+1
| |/ / /
* | | | Merge pull request #10166 from owncloud/sharing_dont_display_share_permissionTom Needham2014-08-054-3/+13
|\ \ \ \
| * | | | don't display share permission if resharing was disabled by the adminBjoern Schiessle2014-08-054-3/+13
| | |/ / | |/| |
* | | | Merge pull request #10154 from owncloud/uninstall-undefined-appitemMorris Jobke2014-08-051-1/+2
|\ \ \ \
| * | | | Fix undefined variable when uninstalling an appRobin Appelman2014-08-041-1/+2
* | | | | Merge pull request #10168 from owncloud/parallel-download-on-public-shared-fo...Morris Jobke2014-08-051-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | close session right before the download starts - this enables parallel downloadsThomas Müller2014-08-051-0/+1
| | |/ / | |/| |
* / | | Hack to avoid Agent DN + Password being overwritten by some ugly browsers wit...Arthur Schiwon2014-08-052-0/+12
|/ / /
* | | Merge pull request #10151 from owncloud/issue/9912Morris Jobke2014-08-051-5/+5
|\ \ \
| * | | Increase word wrap limit for emails to 78 charactersJoas Schilling2014-08-041-5/+5
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-05154-2814/+2776
* | | Merge pull request #10143 from owncloud/fix-top-borderRaghu Nayyar2014-08-051-0/+4
|\ \ \
| * | | no top border for first settings item, detail enhancementJan-Christoph Borchardt2014-08-041-0/+4
* | | | Merge pull request #10083 from th3fallen/fix-9969-take-twoJoas Schilling2014-08-042-37/+9
|\ \ \ \
| * \ \ \ Merge branch 'fix-9969-take-two' of https://github.com/th3fallen/core into fi...Clark Tomlinson2014-07-310-0/+0
| |\ \ \ \
| | * | | | Resolving 9969 resubmitting to fix rebase issue.Clark Tomlinson2014-07-312-37/+9
| * | | | | Removing unnecessary switch statements in fopen methods.Clark Tomlinson2014-07-312-37/+9
| |/ / / /
* | | | | Merge pull request #10150 from owncloud/fix-9782blizzz2014-08-041-1/+3
|\ \ \ \ \
| * | | | | Set group usercount to 0, not '', fixes #9782tomneedham2014-08-041-1/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #10138 from owncloud/innodb-repair-non-ocThomas Müller2014-08-041-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Dont touch non-oc tables when doing the InnoDB repair stepRobin Appelman2014-08-041-1/+1
* | | | | Merge pull request #10025 from owncloud/l10n-typoThomas Müller2014-08-041-8/+8
|\ \ \ \ \
| * | | | | expire -> expirationVolkan Gezer2014-08-021-6/+6
| * | | | | suggestions by deepdiverVolkan Gezer2014-08-011-4/+4
| * | | | | typo fix from transifex suggestionVolkan Gezer2014-07-301-2/+2
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0418-34/+35
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0312-12/+12
| |_|_|/ / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0234-169/+214
* | | | | Merge pull request #10097 from owncloud/background-fixJan-Christoph Borchardt2014-08-011-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | add white as background-colorMorris Jobke2014-08-011-0/+1
| * | | | Remove old color of bodyMorris Jobke2014-08-011-1/+0