summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 7.0.3RC1v7.0.3RC2Frank Karlitschek2014-10-231-2/+2
|
* Added encryption test when moving file as non-ownerVincent Petry2014-10-291-2/+15
|
* Fix warning with unset extension checkVincent Petry2014-10-291-1/+1
|
* Fix moving share keys as non-owner to subdirVincent Petry2014-10-291-32/+26
| | | | | | | | | | | | This fix gathers the share keys BEFORE a file is moved to make sure that findShareKeys() is able to find all relevant keys when the file still exists. After the move/copy operation the keys are moved/copied to the target dir. Also: refactored preRename and preCopy into a single function to avoid duplicate code.
* Close session for searchLukas Reschke2014-10-291-0/+1
| | | | Make search non-blocking.
* Close session for avatar getLukas Reschke2014-10-291-0/+1
| | | | This somehow blocked the "Users" UI for me when having a lot of users. - Shouldn't hurt here.
* Show login again instead of JSON if CSRF check failsLukas Reschke2014-10-291-1/+3
| | | | | | | | Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login. With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often. This can be tested by opening the login page, then clearing the cookies, and trying to login.
* Merge pull request #11802 from owncloud/backport-10958Lukas Reschke2014-10-288-19/+128
|\ | | | | Backport #10958
| * Introduce cross-db ILIKERobin Appelman2014-10-278-19/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | adding ILIKE to AdapterSQLSrv add test case for ILIKE with wildcard Make sqlite LIKE case sensitive on default Implement ILIKE for sqlite Use ILIKE in cache search Fix ILIKE without wildcards for oracle
* | Merge pull request #11800 from owncloud/backport-MakeSupportedDBsConfigurableThomas Müller2014-10-286-34/+248
|\ \ | | | | | | Make supported DBs configurable within config.php
| * | Make supported DBs configurable within config.phpLukas Reschke2014-10-276-34/+248
| |/ | | | | | | | | | | | | | | | | This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake. To test this play around with the new configuration parameter "supportedDatabases". Conflicts: lib/private/util.php
* / Properly catch 503 storage not available in getQuotaInfoVincent Petry2014-10-281-7/+11
|/ | | | | | | | | When doing a PROPFIND on the root and one of the mount points is not available, the returned quota attributes will now be zero. This fix prevents the expected exception to make the whole call fail. Backport of 21d825ed6c11425d36a143f8ed63f1e3852d0aeb from master
* Make files non executableLukas Reschke2014-10-2422-0/+0
| | | | There is not much sense in having these files marked executable, we should avoid that.
* Merge pull request #11719 from owncloud/stable7-fix-s3-regressionVincent Petry2014-10-231-5/+11
|\ | | | | [stable7] Fix S3 connection regression
| * Fix S3 connectionVincent Petry2014-10-221-5/+11
|/
* Backport of #11702Arthur Schiwon2014-10-221-4/+5
| | | | | | set up FS by username, not login name\! better variable name
* Lazy initialize external storagesVincent Petry2014-10-226-103/+159
| | | | Backport of 075e8d8e8658913e1c5b8869f3e457fa6db2d847 from master
* guess mimetype on touchJörn Friedrich Dreyer2014-10-222-2/+5
| | | | | Conflicts: apps/files_external/lib/amazons3.php
* Merge pull request #11691 from owncloud/fix_pub_link_creationVincent Petry2014-10-222-4/+4
|\ | | | | fix target creation for public links
| * if it is not a folder share the path already points to the correct fileBjoern Schiessle2014-10-211-1/+1
| |
| * always use the correct share typeBjoern Schiessle2014-10-211-3/+3
|/
* Merge pull request #11673 from owncloud/backport-11593Lukas Reschke2014-10-203-10/+90
|\ | | | | Backport #11593
| * Add proper setup and teardownVincent Petry2014-10-201-0/+17
| | | | | | | | Properly restore REQUEST_URI and SCRIPT_NAME after test runs
| * Add "$_SERVER['REQUEST_URI']" to fix the unit testsLukas Reschke2014-10-201-1/+8
| | | | | | | | Let's hope that works
| * Refer to relative path instead of absolute pathLukas Reschke2014-10-201-9/+21
| | | | | | | | | | | | | | | | | | | | There is no need to refer to the absolute path here if we can use the relative one. Conflicts: lib/private/templatelayout.php Conflicts: lib/private/templatelayout.php
| * Add unit tests for convertToRelativePathLukas Reschke2014-10-202-1/+45
|/
* backport of #11494Arthur Schiwon2014-10-185-33/+96
| | | | | | | | | | | | | | fix retrievel of group members and cache group members fix changed variable name with several backends, more than limit can be returned make performance less bad. Still far from good, but at least it works add one simple cache test adjust group manager tests
* backport of #9104macjohnny2014-10-172-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update manager.php add caching to getUserGroupIds Update manager.php added description and blank lines in getUserGroupIds Update manager.php defined $uid in getUserGroupIds Update manager.php Update manager.php Update manager.php clean up function getUserGroupIds clean up of function getUserGroupIds and improved caching mechanism of cachedUserGroupIds modified caching mechanism in getUserGroupIds removed cachedUserGroupIds, instead changed indexing in getUserGroups to groupId adapted tests for a groupId indexed group array
* Encapsulate require_once to avoid name space bleedindVincent Petry2014-10-171-1/+11
| | | | | | | | The script required by require_once might use variable names like $app which will conflict with the code that follows. This fix encapsulates require_once into its own function to avoid such issues.
* fixing usage of EncryptionExceptionThomas Müller2014-10-171-3/+4
|
* Merge pull request #11610 from owncloud/fix-svg-s7Thomas Müller2014-10-172-3/+13
|\ | | | | Fix SVG icons
| * Remove insane commentLukas Reschke2014-10-161-1/+0
| |
| * Fix SVG iconsLukas Reschke2014-10-162-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | FIXME: Ugly hack to prevent SVG of being returned if the SVG provider is not enabled. This is required because the preview system is designed in a bad way and relies on opt-in with asterisks (i.e. image/*) which will lead to the fact that a SVG will also match the image provider. Conflicts: lib/private/preview.php
* | set password field placeholder back if passward was disabledBjoern Schiessle2014-10-171-0/+1
| |
* | fix the RST syntax of config.sample.phpMorris Jobke2014-10-171-3/+5
| |
* | Merge pull request #11550 from owncloud/fix_flickering_usersJörn Friedrich Dreyer2014-10-171-1/+1
|\ \ | | | | | | fix flickering users in files external
| * | fix flickering usersJörn Friedrich Dreyer2014-10-131-1/+1
| | |
* | | read config.sample.php options and whitespace fixesMorris Jobke2014-10-171-4/+6
| | |
* | | commented out instanceid and passwordsaltCarla Schroder2014-10-171-3/+5
| | |
* | | some small tweaksCarla Schroder2014-10-171-9/+18
| | |
* | | small corrections to config.sample.phpCarla Schroder2014-10-171-6/+12
| | |
* | | Add a try catch blockLukas Reschke2014-10-161-6/+10
| | | | | | | | | | | | This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.
* | | backport of #11478Arthur Schiwon2014-10-1612-206/+551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add checkbox for experienced users to server tab must be empty not auto sets user filters to raw mode when marking user as experienced Objectlasses, Groups and Attributes are now loaded only in assisted mode and only once user and group counts are only upated on demand in experienced mode confirmation before switching to assisted mode when admin is experienced rename internal var name to avoid collision more beautiful white spaces smaller corrections to make scruitinizer happier, no effective changes bump version fix triggering of group update counts. improves the basic code which is also responsible for user counts. i did not find regressions, please doublecheck remove debug output coding style, no effective code changes always abort running ajax request when the method is fired up again show a spinner next to test filter button when the test is running show Spinner when stuff is being saved show busy cursor and lock tabs on save instead of dis/enabling tabs on save, cancel tab change. avoids noisy ui remove debug output rephrase xp'ed user mode label left-align checkbox on server tab
* | | Merge pull request #10732 from ↵Jörn Friedrich Dreyer2014-10-1616-59/+152
|\ \ \ | | | | | | | | | | | | | | | | owncloud/make_skeleton_compatible_with_objectstore_minimal_stable7 make skeleton compatible with objectstore
| * | | throw exception in writeBack, the returned boolean is checked nowhereJörn Friedrich Dreyer2014-10-161-3/+2
| | | |
| * | | make tests compatible with hook based skeleton generationJörn Friedrich Dreyer2014-10-1612-24/+102
| | | |
| * | | make skeleton compatible with objectstoreJörn Friedrich Dreyer2014-10-164-32/+48
| | | | | | | | | | | | | | | | suspend encryption proxy when copying skeleton
* | | | include the apps' versions hash to invalidate the cached assetsThomas Müller2014-10-161-0/+2
| | | |
* | | | Add app version to JS and CSSLukas Reschke2014-10-161-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | This leads to the regeneration of the hash in case a single application is updated. Fixes https://github.com/owncloud/core/issues/11374
* | | | strip whitespace from the beginning and end of the display name to avoid ↵Bjoern Schiessle2014-10-162-2/+58
| | | | | | | | | | | | | | | | empty display names