Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6912 from owncloud/replace-webroot-in-css | Morris Jobke | 2014-01-27 | 6 | -34/+6 |
|\ | |||||
| * | remove %webroot from files_sharing app | Jan-Christoph Borchardt | 2014-01-23 | 4 | -25/+5 |
| * | remove %webroot% from files app | Jan-Christoph Borchardt | 2014-01-23 | 2 | -9/+1 |
* | | Merge pull request #5153 from owncloud/core-em-to-px | Jan-Christoph Borchardt | 2014-01-27 | 4 | -18/+18 |
|\ \ | |||||
| * | | Fixes settings.css and converts more styles. | raghunayyar | 2014-01-26 | 1 | -10/+6 |
| * | | Fixes width of the dropdown menus as per computed styles. | raghunayyar | 2014-01-26 | 1 | -1/+1 |
| * | | Fixes typos, adds ; wherever not present. | raghunayyar | 2014-01-16 | 1 | -1/+1 |
| * | | Fixes typo in versions.css | raghunayyar | 2014-01-16 | 1 | -1/+1 |
| * | | Merge branch 'master' into core-em-to-px | raghunayyar | 2014-01-16 | 658 | -5645/+20132 |
| |\ \ | |||||
| * | | | Cleans up Core apps for relative(em) to absolute(px) styles. | raghunayyar | 2013-10-06 | 4 | -18/+18 |
* | | | | Merge pull request #5152 from owncloud/files-em-to-px | Jan-Christoph Borchardt | 2014-01-27 | 2 | -20/+25 |
|\ \ \ \ | |||||
| * | | | | Keep the EOF-Newline | kondou | 2014-01-18 | 1 | -1/+1 |
| * | | | | Removes Bogus Styles. | raghunayyar | 2014-01-18 | 1 | -2/+0 |
| * | | | | Removes Bogus classes from previous commits. | raghunayyar | 2014-01-16 | 2 | -5/+3 |
| * | | | | Fixes header going down in trash bin app. | raghunayyar | 2014-01-16 | 1 | -1/+1 |
| * | | | | Fixed files row height in Firefox/KDE | Vincent Petry | 2014-01-16 | 1 | -0/+5 |
| * | | | | Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase | raghunayyar | 2014-01-16 | 3 | -8/+10 |
| * | | | | Merge branch 'master' into files-em-to-px | raghunayyar | 2014-01-15 | 656 | -5626/+20089 |
| |\ \ \ \ | |||||
| * | | | | | Converts em to px values for styles in Files. | raghunayyar | 2013-10-06 | 2 | -16/+16 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #6916 from owncloud/encryption_update_filecache | Björn Schießle | 2014-01-27 | 1 | -7/+24 |
|\ \ \ \ \ | |||||
| * | | | | | only update file cache with the unenecrypted size when the file was written | Bjoern Schiessle | 2014-01-24 | 1 | -7/+24 |
* | | | | | | Merge pull request #6923 from owncloud/files-maxuploadfieldstylefix | Morris Jobke | 2014-01-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed max upload size input field style | Vincent Petry | 2014-01-23 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #6921 from owncloud/trash_mimetype_size | Björn Schießle | 2014-01-24 | 2 | -9/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | increase size of mimetype column | Bjoern Schiessle | 2014-01-23 | 2 | -9/+9 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner | Morris Jobke | 2014-01-24 | 1 | -5/+37 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed indention. | zombiehugs | 2013-12-04 | 1 | -1/+1 |
| * | | | | | | #6051 [ux][files] Move File Spinner | zombiehugs | 2013-12-04 | 1 | -5/+37 |
* | | | | | | | Merge pull request #5954 from owncloud/extstorage-stream-sftp | Vincent Petry | 2014-01-24 | 25 | -4753/+9724 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Removed unused writeBack method | Vincent Petry | 2014-01-23 | 1 | -8/+0 |
| * | | | | | | | Now using SFTP stream wrapper from phpseclib | Vincent Petry | 2014-01-23 | 25 | -4745/+9724 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #6736 from owncloud/tests-jsunittests | Thomas Müller | 2014-01-23 | 2 | -0/+135 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Added Javascript unit tests | Vincent Petry | 2014-01-16 | 2 | -0/+135 |
* | | | | | | | Merge pull request #6898 from owncloud/encryption_infinite_loop | Björn Schießle | 2014-01-23 | 2 | -45/+30 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix infinite loop if folder and subfolder has the same name | Bjoern Schiessle | 2014-01-22 | 1 | -39/+13 |
| * | | | | | | | add path relative to the files folder of the currently logged in user to the ... | Bjoern Schiessle | 2014-01-22 | 1 | -6/+17 |
* | | | | | | | | Merge pull request #6890 from owncloud/version_fix_array_order | Björn Schießle | 2014-01-22 | 3 | -7/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | fix array order | Bjoern Schiessle | 2014-01-22 | 2 | -5/+4 |
| * | | | | | | | code clean-up | Bjoern Schiessle | 2014-01-22 | 1 | -1/+2 |
| * | | | | | | | fix size calculation of getAllVersions() | Bjoern Schiessle | 2014-01-22 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #6719 from tripflex/fix_pubup_progbar | Morris Jobke | 2014-01-22 | 4 | -27/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | change publicUploadButtonMock to public_upload | Myles McNamara | 2014-01-20 | 1 | -1/+1 |
| * | | | | | | | | change em to px | Myles McNamara | 2014-01-15 | 1 | -1/+1 |
| * | | | | | | | | modify js to move upload wrapper, modify css to match core values | Myles McNamara | 2014-01-10 | 2 | -8/+12 |
| * | | | | | | | | remove extra upload controls | Myles McNamara | 2014-01-10 | 1 | -13/+1 |
| * | | | | | | | | fix upload button layout | Myles McNamara | 2014-01-10 | 1 | -5/+7 |
* | | | | | | | | | Merge branch 'master' into fixing-gallery-password-protected-access-master | Thomas Müller | 2014-01-21 | 14 | -116/+307 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #6863 from owncloud/versioning_expire_function_tests | Thomas Müller | 2014-01-21 | 2 | -77/+264 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | add first unit test for the versioning app | Bjoern Schiessle | 2014-01-21 | 1 | -0/+188 |
| | * | | | | | | | | isolate getExpireList function to make it testable | Bjoern Schiessle | 2014-01-21 | 1 | -77/+76 |