summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Hack to avoid Agent DN + Password being overwritten by some ugly browsers ↵Arthur Schiwon2014-08-052-0/+12
| | | | | | | with stored site credentials Conflicts: apps/user_ldap/css/settings.css
* Merge pull request #10151 from owncloud/issue/9912Morris Jobke2014-08-051-5/+5
|\ | | | | Increase word wrap limit for emails to 78 characters
| * 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 enhancement
| * | 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
|\ \ \ | | | | | | | | Fix 9969
| * \ \ Merge branch 'fix-9969-take-two' of https://github.com/th3fallen/core into ↵Clark Tomlinson2014-07-310-0/+0
| |\ \ \ | | | | | | | | | | | | | | | fix-9969-take-two
| | * | | 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 #9782
| * | | | 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 step
| * | | 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
|\ \ \ \ | | | | | | | | | | typo fix from transifex suggestion
| * | | | 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
|\ \ \ \ | |_|/ / |/| | | Remove old color of body
| * | | add white as background-colorMorris Jobke2014-08-011-0/+1
| | | |
| * | | Remove old color of bodyMorris Jobke2014-08-011-1/+0
| | | | | | | | | | | | | | | | * only visible in public view as ugly grey pane behind the footer
* | | | Merge pull request #10098 from owncloud/fix-10094-masterThomas Müller2014-08-011-8/+10
|\ \ \ \ | | | | | | | | | | prevent PHP errors and enhance logging
| * | | | fix return documentationJörn Friedrich Dreyer2014-08-011-7/+5
| | | | |
| * | | | prevent PHP errors and enhance loggingThomas Müller2014-08-011-1/+5
| | | | |
* | | | | Merge pull request #9529 from helmutschneider/fix-8326Robin Appelman2014-08-011-17/+12
|\ \ \ \ \ | |/ / / / |/| | | | Fixes #8326: deletion of directories on S3
| * | | | Converted an array to PHP5.3 compatible versionJohan Björk2014-07-091-2/+2
| | | | |
| * | | | Fixes #8326: deletion of directories on S3Johan Björk2014-07-081-17/+12
| | | | |
* | | | | Merge pull request #10067 from owncloud/fix-#9119Morris Jobke2014-08-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Quick fix for #9119. Increase preview to keep empty message more centered
| * | | | | Quick fix for #9119. Increase preview to keep empty message more centered ↵Remco Brenninkmeijer2014-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | and push footer down.
* | | | | | Merge pull request #10085 from owncloud/fixes-for-filepickerMorris Jobke2014-08-013-3/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fixes for filepicker
| * | | | | also fix filepicker for smaller screen sizesJan-Christoph Borchardt2014-07-312-1/+10
| | | | | |
| * | | | | fix date display in filepickerJan-Christoph Borchardt2014-07-311-2/+3
| | | | | |
| * | | | | fix long filename display in filepickerJan-Christoph Borchardt2014-07-311-0/+4
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0117-50/+54
| | | | |
* | | | | Merge pull request #10048 from owncloud/fix_search_in_shared_filesJörn Friedrich Dreyer2014-07-312-62/+101
|\ \ \ \ \ | |/ / / / |/| | | | traverse folders in php to search in shared files
| * | | | add test for search() in shared cacheJörn Friedrich Dreyer2014-07-311-3/+75
| | | | |
| * | | | traverse folders in php to search in shared filesJörn Friedrich Dreyer2014-07-311-59/+26
| | | | |
* | | | | Merge pull request #10051 from owncloud/preview-empty-textThomas Müller2014-07-317-7/+75
|\ \ \ \ \ | | | | | | | | | | | | Use svg mimeicons for empty text files
| * | | | | Use svg mimeicons for empty text filesRobin Appelman2014-07-307-7/+75
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-31172-1233/+1330
| |_|/ / / |/| | | |
* | | | | Merge pull request #10055 from owncloud/notification-fixSander2014-07-302-5/+19
|\ \ \ \ \ | | | | | | | | | | | | Fix notification preventing top bar clickability
| * | | | | set max width for notifications so they won't overlap the whole headerJan-Christoph Borchardt2014-07-301-0/+1
| | | | | |
| * | | | | fix yellow notification styleJan-Christoph Borchardt2014-07-302-5/+12
| | | | | |