summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | 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-2311-2/+4824
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | adding code coverage supportThomas Müller2014-01-212-2/+14
| | * | | | | | | | Added Javascript unit testsVincent Petry2014-01-1611-2/+4812
| * | | | | | | | | Merge pull request #6234 from owncloud/change-email-by-enterJan-Christoph Borchardt2014-01-231-0/+17
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | fix double call of changeEmailAddress()Morris Jobke2014-01-181-0/+5
| | * | | | | | | | fix typoMorris Jobke2013-12-091-1/+1
| | * | | | | | | | change mail address by pressing enter - fixes #6179Morris Jobke2013-12-071-0/+12
| * | | | | | | | | 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 pull request #6856 from owncloud/fixing-gallery-password-protected-acce...Vincent Petry2014-01-213-5/+84
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-2119-118/+336
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #6863 from owncloud/versioning_expire_function_testsThomas Müller2014-01-213-77/+265
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | add first unit test for the versioning appBjoern Schiessle2014-01-212-0/+189
| | * | | | | | | | | | isolate getExpireList function to make it testableBjoern Schiessle2014-01-211-77/+76
| * | | | | | | | | | | Merge pull request #6868 from owncloud/enc-fixrandomfailunittestVincent Petry2014-01-217-35/+35
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Replaced time() with uniqid() to make sure the file name is uniqueVincent Petry2014-01-217-35/+35
| * | | | | | | | | | | | Merge pull request #6844 from owncloud/fix-css-loading-masterJörn Friedrich Dreyer2014-01-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |