summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5153 from owncloud/core-em-to-pxJan-Christoph Borchardt2014-01-274-18/+18
|\ | | | | Cleans up Core apps for relative(em) to absolute(px) styles.
| * 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
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/css/public.css apps/user_ldap/css/settings.css core/css/multiselect.css core/css/share.css
| * | 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
|\ \ \ | | | | | | | | Converts em to px values for styles in Files.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firefox is using native checkboxes and in KDE the checkboxes have a bigger height which caused the row height to increase and be misaligned with the date column. This fix makes the checkbox absolute to prevent it to influence the row height.
| * | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/css/files.css
| * | | | 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
|\ \ \ \ | | | | | | | | | | [encryption] update file cache after the file was written
| * | | | 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 style
| * | | | | Fixed max upload size input field styleVincent Petry2014-01-231-1/+1
| |/ / / / | | | | | | | | | | | | | | | Added "type=text" makes it look like nice like all other fields
* | | | | Merge pull request #6921 from owncloud/trash_mimetype_sizeBjörn Schießle2014-01-242-9/+9
|\ \ \ \ \ | | | | | | | | | | | | increase size of mimetype column
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | #6051 [ux][files] Move File Spinner
| * | | | | Fixed indention.zombiehugs2013-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As per @kabum request, indention on line 694 has been fixed.
| * | | | | #6051 [ux][files] Move File Spinnerzombiehugs2013-12-041-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added spinner to file icon when moving to new folder or out of folder. Commit is related to #6051
* | | | | | Merge pull request #5954 from owncloud/extstorage-stream-sftpVincent Petry2014-01-2425-4753/+9724
|\ \ \ \ \ \ | | | | | | | | | | | | | | [Ext storage] Now using SFTP stream wrapper from phpseclib
| * | | | | | Removed unused writeBack methodVincent Petry2014-01-231-8/+0
| | | | | | |
| * | | | | | Now using SFTP stream wrapper from phpseclibVincent Petry2014-01-2325-4745/+9724
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Upgraded phpseclib to master version (post 0.3.5) - Now using fopen() on sftp URL for both read and write - Fixes #4063
* | | | | | Merge pull request #6736 from owncloud/tests-jsunittestsThomas Müller2014-01-232-0/+135
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Added Javascript unit tests
| * | | | | Added Javascript unit testsVincent Petry2014-01-162-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added karma utility to run jasmine unit tests - added Sinon library (for stubs/mocks/fakeserver) - added a few unit tests for core and files - added autotest-js.sh script
* | | | | | Merge pull request #6898 from owncloud/encryption_infinite_loopBjörn Schießle2014-01-232-45/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | [encryption] infinite loop on sharing
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | output of getFolderContent()
* | | | | | | Merge pull request #6890 from owncloud/version_fix_array_orderBjörn Schießle2014-01-223-7/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [files_versions] fix array order
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix public upload progress bar
| * | | | | | | change publicUploadButtonMock to public_uploadMyles McNamara2014-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Changed jQuery selector for public preview to public_upload to correctly show preview
| * | | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Versioning expire function tests
| | * | | | | | | 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
| | | | | | | | |
| * | | | | | | | Merge pull request #6868 from owncloud/enc-fixrandomfailunittestVincent Petry2014-01-217-35/+35
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Replaced time() with uniqid() to make sure the file name is unique
| | * | | | | | | | Replaced time() with uniqid() to make sure the file name is uniqueVincent Petry2014-01-217-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache isn't cleared properly because unlink() doesn't remove the cache entry which caused side-effects when reusing the same file name (which randomly happens when time() returns the same value) This fix first makes sure the unit tests don't fail any more. The unlink() case with the cache will be investigated separately.
| * | | | | | | | | Merge branch 'master' into fix-setupfs-only-for-existing-users-masterThomas Müller2014-01-214-19/+25
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 04:48:13 +0000