summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-2832-98/+136
* prevent dimmed ocdialog div from scrollingJörn Friedrich Dreyer2014-03-281-1/+1
* Merge pull request #7913 from owncloud/fix-logoMorris Jobke2014-03-286-7/+9
|\
| * fix breadcrumbs for IE8Morris Jobke2014-03-271-1/+1
| * enable SVG->PNG fallback for 'New' menuJan-Christoph Borchardt2014-03-271-3/+3
| * enable SVG->PNG fallback for newly uploaded files and foldersJan-Christoph Borchardt2014-03-271-1/+1
| * specify logo to not repeat when container is biggerJan-Christoph Borchardt2014-03-271-0/+2
| * fix SVG replacement for logo so it works in IE8, fix #7866Jan-Christoph Borchardt2014-03-272-2/+2
* | Merge pull request #7911 from owncloud/ext-fixswifttouchoperationVincent Petry2014-03-271-1/+1
|\ \
| * | Fix swift touch operationVincent Petry2014-03-271-1/+1
| |/
* | Merge pull request #7875 from Xenopathic/files_external_smb_autoVincent Petry2014-03-274-46/+156
|\ \ | |/ |/|
| * Use braces on single line if statementsRobin McCorkell2014-03-261-6/+10
| * Fix error in $isPersonal settingRobin McCorkell2014-03-261-1/+1
| * Perform proper checking for share availabilityRobin McCorkell2014-03-263-45/+90
| * Rename SMB_Auto to SMB_OC and change visible nameRobin McCorkell2014-03-263-5/+5
| * Revoke sharable permission on automatic SMB sharesRobin McCorkell2014-03-261-0/+4
| * Use loginname instead of display nameRobin McCorkell2014-03-261-1/+1
| * SMB/CIFS mount using OwnCloud logon credentialsRobin McCorkell2014-03-263-3/+60
* | Merge pull request #7898 from owncloud/ext-swiftmtimeVincent Petry2014-03-271-0/+4
|\ \
| * | Fixed mtime reading from OpenStack APIVincent Petry2014-03-261-0/+4
* | | Merge pull request #7902 from owncloud/ext-xsendfileextstoragefixVincent Petry2014-03-271-1/+2
|\ \ \
| * | | Use the correct resolve method to resolve file storageVincent Petry2014-03-261-1/+2
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-27176-1740/+1781
* | | Merge pull request #7893 from owncloud/no-routed-link-for-css-filesThomas Müller2014-03-261-1/+1
|\ \ \
| * | | css files are not to be routed through index.php anymoreThomas Müller2014-03-261-1/+1
| | |/ | |/|
* | | Merge pull request #7896 from Xenopathic/misc_text_fixesThomas Müller2014-03-264-5/+5
|\ \ \ | |_|/ |/| |
| * | Miscellaneous text fixes for core appsRobin McCorkell2014-03-264-5/+5
| |/
* | Merge pull request #7889 from owncloud/routing-warningVincent Petry2014-03-261-1/+1
|\ \ | |/ |/|
| * fix undefined index warning in routerRobin Appelman2014-03-261-1/+1
* | Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfigVincent Petry2014-03-263-51/+242
|\ \
| * | Fix merging of external storage configurationsVincent Petry2014-03-263-51/+242
| |/
* | Merge pull request #7885 from owncloud/extstorage-prettyprintjsonVincent Petry2014-03-261-1/+6
|\ \ | |/ |/|
| * Pretty print mount.json when possibleVincent Petry2014-03-261-1/+6
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-26125-5946/+10973
* Merge pull request #7748 from owncloud/postgresversionwarningThomas Müller2014-03-251-0/+35
|\
| * fixing code styleThomas Müller2014-03-251-2/+1
| * Log exception when PostgreSQL version check failedVincent Petry2014-03-241-1/+3
| * Added PostgreSQL version warning on upgradeVincent Petry2014-03-171-0/+34
* | Merge pull request #7864 from owncloud/routing-performanceThomas Müller2014-03-256-27/+106
|\ \
| * | update type hint in PHPDocThomas Müller2014-03-252-2/+3
| * | Fix routes getting lost when loading app routes twiceRobin Appelman2014-03-251-7/+9
| * | fix incorect arrayRobin Appelman2014-03-251-1/+1
| * | Only load core routes for ocs and settingsRobin Appelman2014-03-251-1/+2
| * | Only load core routes when matching a core routeRobin Appelman2014-03-241-3/+5
| * | Cache generated urls for routesRobin Appelman2014-03-241-0/+43
| * | Only load routes from the apps we needRobin Appelman2014-03-242-14/+38
| * | Load the routes when matching or generating a route instead of when creating ...Robin Appelman2014-03-243-7/+13
* | | Merge pull request #7325 from owncloud/recursive-mkdir-localThomas Müller2014-03-252-2/+2
|\ \ \
| * \ \ Merge branch 'master' into recursive-mkdir-localRobin Appelman2014-02-2143-184/+523
| |\ \ \
| * | | | Also make "regular" local storage's mkdir recursiveRobin Appelman2014-02-201-1/+1