| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix conflicts and add missing closing tag | Morris Jobke | 2014-01-23 | 2 | -9/+1 |
| | | |||||
| * | focus link text only on click in the input field - closes #6817 | Thomas Müller | 2014-01-23 | 1 | -1/+4 |
| | | |||||
| * | Merge branch 'master' into mobile-style | Thomas Müller | 2014-01-23 | 48 | -317/+534 |
| |\ | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js apps/files_sharing/css/public.css apps/files_sharing/js/public.js apps/files_sharing/templates/public.php | ||||
| | * | Merge pull request #6890 from owncloud/version_fix_array_order | Björn Schießle | 2014-01-22 | 3 | -7/+7 |
| | |\ | | | | | | | [files_versions] fix array order | ||||
| | | * | 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 |
| | |\ \ | | | | | | | | | Fix public upload progress bar | ||||
| | | * | | change publicUploadButtonMock to public_upload | Myles McNamara | 2014-01-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | Changed jQuery selector for public preview to public_upload to correctly show preview | ||||
| | | * | | 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 |
| | | |\ \ | | | | | | | | | | | Versioning expire function tests | ||||
| | | | * | | 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 |
| | | | | | | |||||
| | | * | | | Merge pull request #6868 from owncloud/enc-fixrandomfailunittest | Vincent Petry | 2014-01-21 | 7 | -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 unique | Vincent Petry | 2014-01-21 | 7 | -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-master | Thomas Müller | 2014-01-21 | 4 | -19/+25 |
| | | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | | OC_Util::setupFS($user) will create a data dir for the given string - no ↵ | Thomas Müller | 2014-01-21 | 5 | -4/+8 |
| | | | |/ / | | |/| | | | | | | | | | | | | matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error | ||||
| | * | | | | Merge branch 'master' into fixing-gallery-password-protected-access-master | Thomas Müller | 2014-01-21 | 4 | -19/+25 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | don't use the user id within the versions preview call as it could be used ↵ | Thomas Müller | 2014-01-21 | 3 | -15/+14 |
| | | | | | | | | | | | | | | | | | | | | | to access previews of another user | ||||
| | | * | | | user workarount to compare CLOB column with CHAR value | Jörn Friedrich Dreyer | 2014-01-21 | 1 | -4/+11 |
| | | |/ / | |||||
| | * / / | adding password protection check to getShareByToken() | Thomas Müller | 2014-01-21 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge pull request #6849 from owncloud/checkupdate-reuse | icewind1991 | 2014-01-20 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | Reuse the data retrieved from the cache in checkUpdate | ||||
| | | * | | Reuse the data retrieved from the cache in checkUpdate | Robin Appelman | 2014-01-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge pull request #6851 from owncloud/files-fixtrashandversionrootsizecalc | Vincent Petry | 2014-01-20 | 2 | -2/+2 |
| | |\ \ \ | | |/ / | |/| | | When reading the size of "files" mountpoints need to be excluded | ||||
| | | * | | When reading the size of "files" mountpoints need to be excluded | Vincent Petry | 2014-01-20 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The versions and trashbin app are now passing "includeMountPoints=false" to "getFileInfo()" to make sure that the calculated total size doesn't include mount points like Shared or external storage. This is because the default call (legacy) used to return the size of mount points as well. Fixes #6731 | ||||
| | * | | | Merge pull request #6827 from rnveach/fix_6730 | Morris Jobke | 2014-01-20 | 2 | -1/+4 |
| | |\ \ \ | | | | | | | | | | | Fix 6730 | ||||
| | | * | | | added trigger to redo selection text on a directory change | rnveach | 2014-01-17 | 1 | -0/+2 |
| | | | | | | |||||
| | | * | | | fixed selector string and removed all checkbox if it was selected | rnveach | 2014-01-17 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Merge pull request #6819 from owncloud/files-ispreviewenabledwarningfix | Vincent Petry | 2014-01-19 | 2 | -2/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | Fixed isPreviewAvailable warnings in log | ||||
| | | * | | | | Fixed isPreviewAvailable warnings in log | Vincent Petry | 2014-01-17 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isPreviewAvailable wasn't always set as the files formatting code is slightly different than the one from the files app. Fixes #6423 | ||||
| | * | | | | | add link to documentation | Bjoern Schiessle | 2014-01-17 | 1 | -0/+4 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #6810 from kofemann/for-upstream | Vincent Petry | 2014-01-17 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | webdav: return SPACE_UNKNOWN if server do not support quota | ||||
| | | * | | | | | webdav: return SPACE_UNKNOWN if server do not support quota | Tigran Mkrtchyan | 2014-01-17 | 1 | -1/+1 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> | ||||
| | * | | | | | Merge pull request #6807 from owncloud/enc_updated_description | Vincent Petry | 2014-01-17 | 1 | -1/+1 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | updated description of the files encryption app | ||||
| | | * | | | | updated description of the files encryption app | Bjoern Schiessle | 2014-01-17 | 1 | -1/+1 |
| | | | |/ / | | |/| | | |||||
| | * | | | | Merge pull request #6264 from owncloud/files-draggabledestroy | Morris Jobke | 2014-01-16 | 1 | -1/+4 |
| | |\ \ \ \ | | |/ / / | |/| | | | Fix to not destroy draggable when no draggable was set | ||||
| | | * | | | Fix to not destroy draggable when no draggable was set | Vincent Petry | 2014-01-14 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a dir has no delete permission, the draggable isn't initialized on files. This fix makes sure we don't try to destroy a draggable when it wasn't inited in the first place. Fixes #6254 | ||||
| | * | | | | Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix | Vincent Petry | 2014-01-15 | 3 | -19/+33 |
| | |\ \ \ \ | | | | | | | | | | | | | Fixed Dropbox/Google storage async save call | ||||
| | | * | | | | Fixed Dropbox/Google storage async save call | Vincent Petry | 2013-12-06 | 3 | -19/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking "Grant access", the settings for Dropbox/Google were saved through a call that gets cancelled when redirecting to the grant page (for example in Firefox) This fix makes sure the "save settings" call finished before redirecting to the grant page. Fixes #6176 | ||||
| | * | | | | | Merge pull request #6780 from owncloud/trash_bin_copy_recursively | Björn Schießle | 2014-01-15 | 2 | -5/+5 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | copy files to owners trash recursively | ||||
| | | * | | | | | remove old code | Bjoern Schiessle | 2014-01-15 | 1 | -3/+0 |
| | | | | | | | | |||||
| | | * | | | | | don't try to encrypt/decrypt cache chunks or files in the trash bin | Bjoern Schiessle | 2014-01-15 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | copy files to owner trash recursively | Bjoern Schiessle | 2014-01-15 | 1 | -3/+6 |
| | | | |/ / / | | |/| | | | |||||
| | * | | | | | Show the name of the shared folder in the breadcrumb when viewing a publicly ↵ | Robin Appelman | 2014-01-15 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | shared folder | ||||
| | * | | | | | call getFileInfo to enforce a file cache entry for the new version, fix #6286 | Bjoern Schiessle | 2014-01-15 | 1 | -2/+4 |
| | |/ / / / | |||||
| | * | | | | typo, grammar | Arthur Schiwon | 2014-01-14 | 1 | -1/+1 |
| | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |