aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change to 24H format instead of 12H formatDaniel Hansson2015-03-231-1/+1
* Merge pull request #15121 from owncloud/email-sent-unboldMorris Jobke2015-03-231-4/+4
|\
| * unbold share email sent notificationJan-Christoph Borchardt2015-03-231-4/+4
* | Merge pull request #15075 from owncloud/fix-15056-masterThomas Müller2015-03-231-1/+0
|\ \
| * | remove unneeded status element from json response on /categories - fixes 15056Thomas Müller2015-03-231-1/+0
* | | Merge pull request #15123 from owncloud/fix_14098blizzz2015-03-232-1/+15
|\ \ \
| * | | offset needs to be considered in computed limitArthur Schiwon2015-03-232-1/+15
| |/ /
* | | Merge pull request #13941 from owncloud/fix-folder-upload-on-firefoxLukas Reschke2015-03-231-0/+9
|\ \ \
| * | | Show message if upload of folder isn't allowedMorris Jobke2015-02-061-0/+9
* | | | Merge pull request #14862 from owncloud/introduce-shipped.json-masterMorris Jobke2015-03-233-6/+68
|\ \ \ \
| * | | | adding enterprise apps to shipped.jsonThomas Müller2015-03-231-11/+20
| * | | | Update shipped.jsonThomas Müller2015-03-161-1/+2
| * | | | Add spacesMorris Jobke2015-03-161-1/+1
| * | | | [WIP] upgrade app store apps during console upgradeThomas Müller2015-03-131-1/+21
| * | | | shipped apps are now defined in core/shipped.json - the shipped tag in info.x...Thomas Müller2015-03-132-5/+37
* | | | | Merge pull request #15114 from owncloud/sharing-labelsJan-Christoph Borchardt2015-03-232-6/+5
|\ \ \ \ \
| * | | | | combine labels with inputs in sharing dialog, fix #14796Jan-Christoph Borchardt2015-03-232-6/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #15120 from owncloud/ldap-occ-fix-warningsMorris Jobke2015-03-234-10/+37
|\ \ \ \ \
| * | | | | fix PHP warnings when using occ with some LDAP commandsArthur Schiwon2015-03-234-10/+37
| |/ / / /
* | | | | Merge pull request #15118 from owncloud/user-mgmt-groupsJan-Christoph Borchardt2015-03-231-0/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fix long group names overlapping in the sidebar, fix #12649Jan-Christoph Borchardt2015-03-231-0/+10
| |/ / /
* | | | Merge pull request #14383 from jknockaert/newbranchClark Tomlinson2015-03-231-130/+160
|\ \ \ \
| * | | | fix 3rdpartyjknockaert2015-02-191-0/+0
| * | | | againjknockaert2015-02-191-36/+0
| * | | | try againjknockaert2015-02-191-0/+36
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master'jknockaert2015-02-195-4/+21
| | |\ \ \ \
| | | * | | | OC8 versionjknockaert2015-02-191-196/+170
| | | * | | | update enc streamjknockaert2014-12-171-136/+161
| | * | | | | backjknockaert2015-02-191-35/+34
| * | | | | | new tryjknockaert2015-02-192-130/+160
* | | | | | | Merge pull request #15107 from owncloud/user-mgmt-headerMorris Jobke2015-03-231-1/+9
|\ \ \ \ \ \ \
| * | | | | | | fix first user mgmt header jumping around, fix #8873Jan-Christoph Borchardt2015-03-231-1/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #15108 from owncloud/issue/15049-iran-timezoneThomas Müller2015-03-231-3/+1
|\ \ \ \ \ \ \
| * | | | | | | The iran timezone removed the DST handling which breaks the timezone libJoas Schilling2015-03-231-3/+1
| |/ / / / / /
* | | | | | | Merge pull request #15103 from owncloud/link-personalMorris Jobke2015-03-233-6/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix capitalization in Personal settingsJan-Christoph Borchardt2015-03-231-3/+3
| * | | | | | link back to top on Personal page, fix #14519Jan-Christoph Borchardt2015-03-233-3/+8
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2322-20/+70
* | | | | | Merge pull request #15088 from oparoz/3d-supportMorris Jobke2015-03-223-305/+286
|\ \ \ \ \ \
| * | | | | | Introducing 3D images support (media type)Olivier Paroz2015-03-203-305/+286
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2258-0/+136
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2132-10/+196
|/ / / / / /
* | | | | | Merge pull request #14737 from owncloud/app-descriptions-collapsibleJan-Christoph Borchardt2015-03-203-16/+48
|\ \ \ \ \ \
| * | | | | | collapse app descriptions by default, make expandable, fix #13112Jan-Christoph Borchardt2015-03-193-16/+48
* | | | | | | Merge pull request #15069 from owncloud/enable-oci-testing-on-pr-masterThomas Müller2015-03-201-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Adding magic file to enable oci on pull request testing on ci.owncloud.orgThomas Müller2015-03-201-0/+0
* | | | | | | | Merge pull request #14857 from owncloud/preview-provider-registration-in-managerThomas Müller2015-03-2019-270/+551
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove load*() methods from public interfaceJoas Schilling2015-03-161-48/+1
| * | | | | | | | Fix controller testJoas Schilling2015-03-161-0/+1
| * | | | | | | | Only register the core providers when necessaryJoas Schilling2015-03-161-6/+13