| 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 | 105 | -3716/+1034 |
| |\ | | | | | | | | | | | | | | | 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 pull request #6856 from ↵ | Vincent Petry | 2014-01-21 | 3 | -5/+84 |
| | |\ \ \ | | |_|/ | |/| | | | | | | | | | | owncloud/fixing-gallery-password-protected-access-master adding password protection check to getShareByToken() | ||||
| | | * | | Merge branch 'master' into fixing-gallery-password-protected-access-master | Thomas Müller | 2014-01-21 | 19 | -118/+336 |
| | | |\ \ | | |/ / | |/| | | |||||
| | * | | | Merge pull request #6863 from owncloud/versioning_expire_function_tests | Thomas Müller | 2014-01-21 | 3 | -77/+265 |
| | |\ \ \ | | | | | | | | | | | Versioning expire function tests | ||||
| | | * | | | add first unit test for the versioning app | Bjoern Schiessle | 2014-01-21 | 2 | -0/+189 |
| | | | | | | |||||
| | | * | | | 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 pull request #6844 from owncloud/fix-css-loading-master | Jörn Friedrich Dreyer | 2014-01-21 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Revert "use getAppWebPath() in here as well" | ||||
| | | * | | | | | Revert "use getAppWebPath() in here as well" | Thomas Müller | 2014-01-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6254f0a403e315461f8e20ebccf71cb91e9313a3. | ||||
| | * | | | | | | Merge pull request #6858 from ↵ | Thomas Müller | 2014-01-21 | 8 | -5/+35 |
| | |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | owncloud/fix-setupfs-only-for-existing-users-master OC_Util::setupFS($user) will create a data dir for the given string - no... | ||||
| | | * | | | | | Merge branch 'master' into fix-setupfs-only-for-existing-users-master | Thomas Müller | 2014-01-21 | 5 | -20/+26 |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | | * | | | | | OC_Util::setupFS($user) will create a data dir for the given string - no ↵ | Thomas Müller | 2014-01-21 | 8 | -5/+35 |
| | | | |/ / / | | |/| | | | | | | | | | | | | | | | 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 | 5 | -20/+26 |
| | | | | |\ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | | Merge pull request #6864 from owncloud/protect-versions-preview-master | Thomas Müller | 2014-01-21 | 3 | -15/+14 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | don't use the user id within the versions preview call as it could be us... | ||||
| | | * | | | | | 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 | ||||
| | * | | | | | Merge pull request #6861 from owncloud/neutral_download_zip_default_name | Thomas Müller | 2014-01-21 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | use 'download.zip' as default name for zip downloads instead of 'owncloud.zip' | ||||
| | | * | | | | | use 'download.zip' as default name for zip downloads instead of 'owncloud.zip' | Jörn Friedrich Dreyer | 2014-01-21 | 1 | -1/+1 |
| | | |/ / / / | |||||
| | * | | | | | Merge pull request #6857 from owncloud/fix_user_ldap_sql_on_oracle | Thomas Müller | 2014-01-21 | 1 | -4/+11 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | user workaround to compare CLOB column with CHAR value | ||||
| | | * | | | | user workarount to compare CLOB column with CHAR value | Jörn Friedrich Dreyer | 2014-01-21 | 1 | -4/+11 |
| | |/ / / / | |||||
| | | | * | | fixing comment + adding unit test for checkPasswordProtectedShare | Thomas Müller | 2014-01-21 | 2 | -1/+49 |
| | | | | | | |||||
| | | | * | | in case no share is found for the given token we can return right away | Thomas Müller | 2014-01-21 | 1 | -0/+3 |
| | | | | | | |||||
| | | | * | | adding password protection check to getShareByToken() | Thomas Müller | 2014-01-21 | 2 | -5/+33 |
| | | |/ / | |/| | | |||||
| | * | | | Merge pull request #6820 from owncloud/phpunit-test-config | Thomas Müller | 2014-01-20 | 4 | -5/+14 |
| | |\ \ \ | | | | | | | | | | | Load a separate config (if present) when running unit tests | ||||
| | | * | | | Move test config folder to tests/config | Robin Appelman | 2014-01-20 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Load a separate config (if present) when running unit tests | Robin Appelman | 2014-01-17 | 4 | -5/+14 |
| | | | | | | |||||
| | * | | | | Merge pull request #6849 from owncloud/checkupdate-reuse | icewind1991 | 2014-01-20 | 3 | -5/+8 |
| | |\ \ \ \ | | | | | | | | | | | | | Reuse the data retrieved from the cache in checkUpdate | ||||
| | | * | | | | Reuse the data retrieved from the cache in checkUpdate | Robin Appelman | 2014-01-20 | 3 | -5/+8 |
| | | | | | | | |||||
| | * | | | | | 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 #6842 from owncloud/fix-quotes-again-master | Jörn Friedrich Dreyer | 2014-01-20 | 2 | -0/+1 |
| | |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Quote column names on adding description | ||||
| | | * | | | | | adding a comment to the database schema | Thomas Müller | 2014-01-20 | 1 | -0/+1 |
| | | | | | | | | |||||
| | | * | | | | | Updating 3rdparty once more .... | Thomas Müller | 2014-01-20 | 1 | -0/+0 |
| | | | |_|/ / | | |/| | | | |||||
| | * | | | | | Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix | Vincent Petry | 2014-01-20 | 2 | -1/+20 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fixed quota wrapper to not wrap failed fopen streams | ||||
| | | * | | | | | Fixed quota wrapper to not wrap failed fopen streams | Vincent Petry | 2014-01-19 | 2 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling fopen() on some storage types, these return false instead of throwing an exception. This fix makes sure that in case the stream wasn't opened (for example when a file doesn't exist any more) the stream isn't wrapped. Also added 'rb' as another case that doesn't need to be wrapped. Fixes #6832 | ||||
| | * | | | | | | 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 |
| | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |