summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6912 from owncloud/replace-webroot-in-cssMorris Jobke2014-01-276-34/+6
|\
| * remove %webroot from files_sharing appJan-Christoph Borchardt2014-01-234-25/+5
| * remove %webroot% from files appJan-Christoph Borchardt2014-01-232-9/+1
* | Merge pull request #5153 from owncloud/core-em-to-pxJan-Christoph Borchardt2014-01-274-18/+18
|\ \
| * | Fixes settings.css and converts more styles.raghunayyar2014-01-261-10/+6
| * | Fixes width of the dropdown menus as per computed styles.raghunayyar2014-01-261-1/+1
| * | Fixes typos, adds ; wherever not present.raghunayyar2014-01-161-1/+1
| * | Fixes typo in versions.cssraghunayyar2014-01-161-1/+1
| * | Merge branch 'master' into core-em-to-pxraghunayyar2014-01-16658-5645/+20132
| |\ \
| * | | 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-272-20/+25
|\ \ \ \
| * | | | Keep the EOF-Newlinekondou2014-01-181-1/+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-163-8/+10
| * | | | Merge branch 'master' into files-em-to-pxraghunayyar2014-01-15656-5626/+20089
| |\ \ \ \
| * | | | | 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 #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
|\ \ \ \ \ \ \
| * | | | | | | Removed unused writeBack methodVincent Petry2014-01-231-8/+0
| * | | | | | | Now using SFTP stream wrapper from phpseclibVincent Petry2014-01-2325-4745/+9724
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #6736 from owncloud/tests-jsunittestsThomas Müller2014-01-232-0/+135
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Added Javascript unit testsVincent Petry2014-01-162-0/+135
* | | | | | | Merge pull request #6898 from owncloud/encryption_infinite_loopBjörn Schießle2014-01-232-45/+30
|\ \ \ \ \ \ \
| * | | | | | | fix infinite loop if folder and subfolder has the same nameBjoern Schiessle2014-01-221-39/+13
| * | | | | | | add path relative to the files folder of the currently logged in user to the ...Bjoern Schiessle2014-01-221-6/+17
* | | | | | | | Merge pull request #6890 from owncloud/version_fix_array_orderBjörn Schießle2014-01-223-7/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix array orderBjoern Schiessle2014-01-222-5/+4
| * | | | | | | code clean-upBjoern Schiessle2014-01-221-1/+2
| * | | | | | | fix size calculation of getAllVersions()Bjoern Schiessle2014-01-221-1/+1
* | | | | | | | Merge pull request #6719 from tripflex/fix_pubup_progbarMorris Jobke2014-01-224-27/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | change publicUploadButtonMock to public_uploadMyles McNamara2014-01-201-1/+1
| * | | | | | | | change em to pxMyles McNamara2014-01-151-1/+1
| * | | | | | | | modify js to move upload wrapper, modify css to match core valuesMyles McNamara2014-01-102-8/+12
| * | | | | | | | remove extra upload controlsMyles McNamara2014-01-101-13/+1
| * | | | | | | | fix upload button layoutMyles McNamara2014-01-101-5/+7
* | | | | | | | | Merge branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-2114-116/+307
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #6863 from owncloud/versioning_expire_function_testsThomas Müller2014-01-212-77/+264
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add first unit test for the versioning appBjoern Schiessle2014-01-211-0/+188
| | * | | | | | | | isolate getExpireList function to make it testableBjoern Schiessle2014-01-211-77/+76