summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 5.0.12v5.0.12Frank Karlitschek2013-10-031-2/+2
|
* set rememberlogin to false for the encryption appBjoern Schiessle2013-09-301-0/+1
|
* check every enabled app if the remember login feature needs to be disabledBjoern Schiessle2013-09-301-3/+13
|
* introduce OC_Util::rememberLoginAllowed()Bjoern Schiessle2013-09-303-4/+15
| | | | | | Conflicts: core/templates/login.php lib/util.php
* don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-303-5/+25
| | | | | | | | needs to log-in again in order to decrypt his private key with his password Conflicts: core/templates/login.php lib/util.php
* 5.0.12 RC1Frank Karlitschek2013-09-271-2/+2
|
* Merge pull request #4948 from owncloud/fix-inputfieldsVicDeo2013-09-261-1/+0
|\ | | | | fix visual glitch, do not use black border for input fields
| * fix visual glitch, do not use black border for input fieldsJan-Christoph Borchardt2013-09-231-1/+0
| |
* | we can leave the loop if the permission of the link share was checkedBjoern Schiessle2013-09-261-3/+1
| |
* | check only permission from link-share to decide if public upload is enabled ↵Bjoern Schiessle2013-09-261-1/+3
| | | | | | | | or disabled
* | Merge pull request #4954 from owncloud/fix-link-expiration-stable5Andreas Fischer2013-09-244-10/+215
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of sharing fixes to stable5 * owncloud/fix-link-expiration-stable5: Calculate dateInPast and dateInFuture. Compare objects directly. Also use $expected and $actual. Add database tests for INSERT/SELECT date format. Add comment explaining how $dateInFuture was picked. Coding style: { for methods start are supposed to be on the same line. Expiration tests for sharing with groups. Do not repeat shareUserOneTestFileWithUserTwo() code. Make dates test class properties. Try to make Oracle happy by also specifying seconds. Test whether a still-valid user share is still accessible. Test whether an expired user share is still accessible.
| * | Calculate dateInPast and dateInFuture.Andreas Fischer2013-09-241-5/+8
| | |
| * | Compare objects directly. Also use $expected and $actual.Andreas Fischer2013-09-241-6/+6
| | |
| * | Add database tests for INSERT/SELECT date format.Andreas Fischer2013-09-233-0/+80
| | |
| * | Add comment explaining how $dateInFuture was picked.Andreas Fischer2013-09-231-0/+2
| | |
| * | Coding style: { for methods start are supposed to be on the same line.Andreas Fischer2013-09-231-12/+6
| | |
| * | Expiration tests for sharing with groups.Andreas Fischer2013-09-231-6/+76
| | |
| * | Do not repeat shareUserOneTestFileWithUserTwo() code.Andreas Fischer2013-09-231-25/+22
| | |
| * | Make dates test class properties.Andreas Fischer2013-09-231-2/+5
| | |
| * | Try to make Oracle happy by also specifying seconds.Andreas Fischer2013-09-231-2/+2
| | |
| * | Test whether a still-valid user share is still accessible.Andreas Fischer2013-09-231-11/+34
| | |
| * | Test whether an expired user share is still accessible.Andreas Fischer2013-09-231-0/+33
|/ /
* | remove deleted files while scanningRobin Appelman2013-09-232-0/+12
| |
* | initialize variableBjoern Schiessle2013-09-231-0/+1
| |
* | calculate correct permissions while toggle the password protectionBjoern Schiessle2013-09-231-1/+11
| |
* | make sure that both $permissions and $oldPermissions have the same typeBjoern Schiessle2013-09-231-1/+1
| |
* | only remember password if the user changes the permissions, otherwise the ↵Bjoern Schiessle2013-09-231-3/+6
|/ | | | | | | user disabled the password protection Conflicts: lib/public/share.php
* Merge pull request #4924 from owncloud/fixing-4416-stable5Morris Jobke2013-09-221-1/+1
|\ | | | | Fixing 4416 stable5
| * setting a default on filecache column unencrypted_sizeThomas Müller2013-09-201-1/+1
| |
* | public.php - check if maintenance mode is enabledGeorg Ehrke2013-09-201-0/+1
|/
* adding comma to get cleaner diffs in the futureThomas Müller2013-09-191-1/+1
|
* no file actions during uploadThomas Müller2013-09-191-1/+0
|
* remove file action elements before recreating themThomas Müller2013-09-191-0/+5
|
* store the permissions retrieved via ajax within the dom elementThomas Müller2013-09-191-0/+6
|
* add permissions of the file to the json responseThomas Müller2013-09-191-1/+2
|
* performance improvement, check configuration only if no private key existsBjoern Schiessle2013-09-181-16/+20
| | | | backport from https://github.com/owncloud/core/commit/72eaf2894a540bc9280e144ba493db7fcde07eac
* check if stream wrapper is already registered to avoid warningBjoern Schiessle2013-09-181-1/+3
|
* Merge pull request #4827 from owncloud/backport-4719-stable5Thomas Müller2013-09-132-17/+21
|\ | | | | some is_resource tests have been missing in #4701
| * some is_resource tests have been missing in #4701Thomas Müller2013-09-132-17/+21
| |
* | Merge pull request #4821 from owncloud/fix_user_managementFrank Karlitschek2013-09-132-4/+4
|\ \ | |/ |/| Fix user management
| * Allow numeric group namesringmaster2013-09-121-3/+3
| |
| * Ensure creation of a JSON array, not an object.ringmaster2013-09-121-1/+1
|/
* Improve IE CompatibilityJörn Friedrich Dreyer2013-09-111-1/+2
| | | | Added meta tags from HTML5 Boiler Plate to improve compatibility with IE7+. This fixes the issues with rendering.
* never hack late nightThomas Müller2013-09-111-6/+5
| | | | | Conflicts: apps/files_external/lib/irods.php
* test case for hooks send from a non-default viewRobin Appelman2013-09-101-0/+34
|
* also emit hooks for views that are a subfolder of the user folderRobin Appelman2013-09-101-32/+57
|
* Merge branch 'stable5' of github.com:owncloud/core into stable5Thomas Müller2013-09-1028-154/+251
|\
| * Workaround for IE 9 & 10 for clicking filelist after adding new itemThomas Müller2013-09-101-1/+4
| | | | | | | | manual backport of f4ec5182bdeaa611d13648b50d24f80501d92acd
| * 5.0.11v5.0.11Frank Karlitschek2013-09-061-2/+2
| |
| * Merge pull request #4551 from owncloud/fix_4533Björn Schießle2013-09-064-49/+60
| |\ | | | | | | Handle part files correctly