summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6907 from owncloud/webdav-logexceptionsThomas Müller2014-01-274-5/+60
|\
| * Added exception logger plugin for sabre connectorVincent Petry2014-01-274-5/+60
* | Merge pull request #6958 from owncloud/localised_dateMorris Jobke2014-01-271-5/+4
|\ \
| * | use localised date in notification mailsBjoern Schiessle2014-01-271-5/+4
* | | Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decryptMorris Jobke2014-01-272-25/+27
|\ \ \
| * | | disable button and input field during decryptionBjoern Schiessle2014-01-241-0/+5
| * | | remove the form, it isn't needed hereBjoern Schiessle2014-01-242-25/+22
* | | | Merge pull request #6930 from jcfischer/masterMorris Jobke2014-01-273-0/+20
|\ \ \ \
| * | | | updated config.sample.php with mail_from_address parameterJens-Christian Fischer2014-01-241-0/+6
| * | | | added function documentationJens-Christian Fischer2014-01-241-0/+4
| * | | | Add 'mail_from_address' configurationJens-Christian Fischer2014-01-242-0/+10
| |/ / /
* | | | Merge pull request #6933 from seberm/masterMorris Jobke2014-01-271-0/+2
|\ \ \ \
| * | | | Add check for apc.enabled optionOtto Sabart2014-01-241-0/+2
* | | | | Merge pull request #6912 from owncloud/replace-webroot-in-cssMorris Jobke2014-01-279-35/+248
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | remove css files from rewrite rule - there is no need to rewrite css any moreThomas Müller2014-01-231-1/+1
| * | | | remove %webroot from files_sharing appJan-Christoph Borchardt2014-01-234-25/+5
| * | | | remove %webroot% from files appJan-Christoph Borchardt2014-01-232-9/+1
| * | | | add icons.css file, first step to get rid of %webroot%Jan-Christoph Borchardt2014-01-232-0/+241
* | | | | Merge pull request #5153 from owncloud/core-em-to-pxJan-Christoph Borchardt2014-01-278-91/+90
|\ \ \ \ \
| * | | | | Fixes settings.css and converts more styles.raghunayyar2014-01-261-10/+6
| * | | | | Fixes width of the dropdown menus as per computed styles.raghunayyar2014-01-262-2/+2
| * | | | | Fixes typos, adds ; wherever not present.raghunayyar2014-01-162-19/+19
| * | | | | Fixes typo in versions.cssraghunayyar2014-01-161-1/+1
| * | | | | Merge branch 'master' into core-em-to-pxraghunayyar2014-01-162107-70802/+150645
| |\ \ \ \ \
| * | | | | | All Core Styles from em->px, apart from styles.cssraghunayyar2013-10-074-27/+27
| * | | | | | Cleans up Core apps for relative(em) to absolute(px) styles.raghunayyar2013-10-064-18/+18
* | | | | | | Merge pull request #5152 from owncloud/files-em-to-pxJan-Christoph Borchardt2014-01-273-21/+26
|\ \ \ \ \ \ \
| * | | | | | | Keep the EOF-Newlinekondou2014-01-181-1/+1
| * | | | | | | remove comment & add spaceMorris Jobke2014-01-181-2/+1
| * | | | | | | Removes Bogus Styles.raghunayyar2014-01-181-2/+0
| * | | | | | | Removes Bogus classes from previous commits.raghunayyar2014-01-162-5/+3
| * | | | | | | Fixes header going down in trash bin app.raghunayyar2014-01-161-1/+1
| * | | | | | | Fixed files row height in Firefox/KDEVincent Petry2014-01-161-0/+5
| * | | | | | | Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebaseraghunayyar2014-01-164-9/+12
| * | | | | | | Merge branch 'master' into files-em-to-pxraghunayyar2014-01-152104-70774/+150497
| |\ \ \ \ \ \ \
| * | | | | | | | Converts em to px values for styles in Files.raghunayyar2013-10-062-16/+16
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #6916 from owncloud/encryption_update_filecacheBjörn Schießle2014-01-271-7/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | only update file cache with the unenecrypted size when the file was writtenBjoern Schiessle2014-01-241-7/+24
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #6939 from owncloud/disable-password-autocompleteJan-Christoph Borchardt2014-01-251-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | prevent autofill for password change settings, prevent leak of existing passw...Jan-Christoph Borchardt2014-01-241-2/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #6905 from owncloud/add_expiredate_to_linkshareVincent Petry2014-01-242-3/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | add expire date to link share if possibleBjoern Schiessle2014-01-242-3/+24
| |/ / / / / / /
* | | | | | | | Merge pull request #6923 from owncloud/files-maxuploadfieldstylefixMorris Jobke2014-01-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed max upload size input field styleVincent Petry2014-01-231-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #6921 from owncloud/trash_mimetype_sizeBjörn Schießle2014-01-242-9/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | increase size of mimetype columnBjoern Schiessle2014-01-232-9/+9
* | | | | | | | | Merge pull request #6184 from owncloud/6051-ux-files-Move-File-SpinnerMorris Jobke2014-01-241-5/+37
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fixed indention.zombiehugs2013-12-041-1/+1
| * | | | | | | | #6051 [ux][files] Move File Spinnerzombiehugs2013-12-041-5/+37
* | | | | | | | | Merge pull request #5954 from owncloud/extstorage-stream-sftpVincent Petry2014-01-2425-4753/+9724
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |