aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8579 from owncloud/ldap_nail_filter_on_upgradeblizzz2014-06-022-13/+31
|\ | | | | LDAP: fix filter can be reset and broken after upgrade from OC 5
| * simpler and better readable assignmentArthur Schiwon2014-05-281-4/+1
| |
| * bump version and don't overwrite values on next update if not necessaryArthur Schiwon2014-05-142-13/+22
| |
| * get the correct version number for compare -.-Arthur Schiwon2014-05-141-1/+1
| |
| * LDAP: set filter mode to raw, so filters will not be changed and broken ↵Arthur Schiwon2014-05-131-0/+12
| | | | | | | | after upgrade from oc5, when visiting the LDAP settings and opening filter tabs
* | Merge pull request #8672 from owncloud/stable6-obfuscatepasswordsFrank Karlitschek2014-06-024-24/+618
|\ \ | | | | | | [backport] [stable6] Added password obfuscation for external storage config
| * | Added password obfuscation for external storage configVincent Petry2014-05-224-24/+618
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added obfuscation for all "password" options from external storages. Added more ext storage unit tests config. Added unit tests for reading/writing the configuration. Added IV for ext storage password encryption Moved the mounting code for external storage from OC\Filesystem::initMountPoint to files_external using the post_initMountPoints hook Fixed ext storage unit test for groups Squashed backport of 2c561c9c5072ce82e06bd5ab2c4ee81bc5d09d59 from master.
* | | Merge pull request #8692 from owncloud/fix_unit_tests_oc6Thomas Müller2014-05-281-2/+2
|\ \ \ | | | | | | | | fix failing unit tests on OC6
| * | | don't expect depreciated OC_FilesystemViewBjoern Schiessle2014-05-231-2/+2
| |/ /
* / / php upload errors are written to logThomas Müller2014-05-231-1/+3
|/ /
* / only start migration if the encryption was initialized; allow to overwrite ↵Bjoern Schiessle2014-05-212-3/+49
|/ | | | keys if no files exists
* Added unit test for sharing ext storage mount pointsVincent Petry2014-05-091-1/+56
| | | | Backport of f73a168 from master
* Fix sharing of ext storage mount pointsVincent Petry2014-05-091-4/+6
| | | | | | | When sharing an ext storage mount point, it will now use the name of the mount point instead of an empty string for the target path. Backport of 28f0e63 from master
* always encrypt files to ownerBjoern Schiessle2014-05-052-10/+9
|
* fix layout of external storage config tableMorris Jobke2014-04-261-1/+6
| | | | | Conflicts: apps/files_external/css/settings.css
* Merge pull request #7745 from owncloud/fix_6946_stable6blizzz2014-04-232-36/+1
|\ | | | | Group Database backend must not gather user details itself but ask user backends, fixes #6946 in stable6
| * LDAP: getDisplayNamesInGroup is not an option for group backends anymoreArthur Schiwon2014-04-232-36/+1
| |
* | Merge pull request #8261 from owncloud/stable6-backport-8182Lukas Reschke2014-04-231-1/+6
|\ \ | |/ |/| Backport of #8182
| * Check whether the user has permissions to add personal storage backendsLukas Reschke2014-04-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quick’n dirty back port of #8182 - master has a better fix but that should be good enough… missing return - OCP\JSON::success does not terminate the PHP process - which is good ;-) Use error instead of success Revert "Use error instead of success" This reverts commit e2d5535a5aa436c3896e46f0b9e8ff1bd5640d4d. Use error instead of success
* | Backport of #8164ben-denham2014-04-233-79/+122
|/ | | | | | | | | | | | | | Added improved version of patch by @blizzz in https://github.com/owncloud/core/issues/6651#issuecomment-32261257 to stop filter settings from being reset under a race condition. Moved LdapFilter into a separate js file in user_ldap. Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation. fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh Give hint when composing filter failed fixing some JSHint warnings
* add additional comments, PHPdoc and check whether it's really applicableArthur Schiwon2014-04-161-3/+12
|
* LDAP: cache display names immediately on retrieval, saves tens of unecessary ↵Arthur Schiwon2014-04-161-0/+6
| | | | queries to LDAP server in the share dialog for example
* Backport of PR #7815, correct LDAP user count on setup with many usersArthur Schiwon2014-04-161-15/+40
| | | | | | | | | | | | | | (occ user:report) LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0 LDAP: fix user report i.e. count for LDAP servers with really many users initialize variable var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop Put inner loop into own method, let's see whether it makes scrutinizer happier
* LDAP: fetch email from LDAP on userExists check as well (along to Quota and ↵Arthur Schiwon2014-04-111-0/+1
| | | | Avatar)
* Merge pull request #8123 from owncloud/fix_filename_closing_tagMorris Jobke2014-04-091-5/+3
|\ | | | | fix double closing </a> for filenames
| * fix double closing </a> for filenamesJörn Friedrich Dreyer2014-04-091-5/+3
| |
* | Backport of PR #7837 to stable6Arthur Schiwon2014-04-092-7/+235
|/ | | | | | | | | | | | | | | | | | | | | LDAP Wizard: when determining objectclasses, we realy do not need to look at every entry. Fixes #7530 Conflicts: apps/user_ldap/lib/wizard.php Fix wildcard handling and check even less DNs per filter, enough will be looked at anyway Use the LDAP wrapper for checking resources, needs for proper testing fix potential infinite loop when the DN of the first entry was already read. add tests for cumulativeSearchOnAttribute make tests work on systems without php5_ldap define var add comment to clearify when a skip in the foreach happens
* Merge pull request #8038 from owncloud/fix_8028blizzz2014-04-041-2/+1
|\ | | | | Meanwhile, the quota value is stored human-readable in the DB
| * Meanwhile, the quota value is stored human-readable in the DBArthur Schiwon2014-04-031-2/+1
| |
* | fix unit testsRobin Appelman2014-04-041-5/+5
| |
* | authentication apps need to be loaded in any case - fixes #7216Thomas Müller2014-04-031-1/+1
|/
* Improve phpdocRobin Appelman2014-04-031-0/+7
|
* Implement getPath for shared filesRobin Appelman2014-04-032-8/+82
|
* Merge pull request #7931 from owncloud/fix_7785_stable6blizzz2014-04-022-33/+61
|\ | | | | LDAP: Read email and quota when mapping user, fixes #7785
| * more precise php docArthur Schiwon2014-04-021-2/+4
| |
| * add PHP docsArthur Schiwon2014-04-011-1/+12
| |
| * LDAP: Read email and quota when mapping user, fixes #7785Arthur Schiwon2014-03-282-33/+48
| |
* | Merge pull request #7976 from owncloud/fix-7973-stable6-2Vincent Petry2014-04-011-5/+0
|\ \ | | | | | | remove pl_PL - fixes #7973
| * | remove pl_PL - fixes #7973Thomas Müller2014-03-311-5/+0
| | |
* | | Revert "remove Sabre_DAV_Browser_Plugin"Thomas Müller2014-04-011-0/+1
|/ / | | | | | | This reverts commit e4104e63d924c41e80a42282cce2a7e09ec36c42.
* / don't write file if opening a stream to encrypt the data failsBjoern Schiessle2014-03-281-0/+2
|/
* don't block php session while download is in progressJörn Friedrich Dreyer2014-03-281-0/+3
|
* Fix swift touch operationVincent Petry2014-03-271-1/+1
| | | | | | | | | | The touch() operation now uses "UpdateMetadata()" instead of "Update()" which doesn't clear the object's contents. This fixes syncing, as the sync client needs to use touch to update the object's mtime. Backport of 2a08e35 from master
* Fixed mtime reading from OpenStack APIVincent Petry2014-03-271-0/+4
| | | | | | | | The API seems to return floating point values, which prevents the hasUpdated() check to work and causes the scanner to rescan everything every time. Backport of fa00a18 from master
* add test for cloning and keeping configuration seperateArthur Schiwon2014-03-211-0/+54
|
* Use array_key_exists instead of isset, because the latter returns false if ↵Arthur Schiwon2014-03-211-2/+2
| | | | the assigned value is null
* On clone create a new instance of the ConfigurationArthur Schiwon2014-03-211-0/+2
| | | | | To avide effects on the original instance of Connection when the clone is modified, for instance on authentication checks.
* Fixed warning when browsing Shared folderVincent Petry2014-03-211-1/+1
| | | | | | | The virtual "Shared" folder doesn't have an unencrypted_size field. This fix adds a check to prevent warnings in the log. Backport of 022d76c from master
* Fix duplicate ipauniqueidRobin McCorkell2014-03-211-1/+1
|
* Add FreeIPA UUID compatibility, fixes #7796Robin McCorkell2014-03-211-2/+2
| | | | Ability to use ipauniqueid for the UUID of a user
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-09 15:13:30 +0000