summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11494 from owncloud/fix-ldap-ingroup-for-9225-2blizzz2014-10-175-33/+96
|\ | | | | fix retrieval of group members and cache group members
| * adjust group manager testsArthur Schiwon2014-10-171-15/+9
| |
| * add one simple cache testArthur Schiwon2014-10-171-4/+29
| |
| * make performance less bad. Still far from good, but at least it worksArthur Schiwon2014-10-173-11/+32
| |
| * with several backends, more than limit can be returnedArthur Schiwon2014-10-171-1/+1
| |
| * fix retrievel of group members and cache group membersArthur Schiwon2014-10-171-2/+25
|/ | | | fix changed variable name
* update 3rdparty to match master - just adds the merge commitMorris Jobke2014-10-171-0/+0
|
* Merge pull request #11430 from owncloud/minify-js-css-masterMorris Jobke2014-10-177-81/+147
|\ | | | | adding cssmin and jssmin(minify)
| * adding cssmin and jssmin(minify)Thomas Müller2014-10-177-81/+147
| | | | | | | | | | | | adding argument deleteSelf to rmdirr() - if false the directory itself will not be deleted only it's content adding repair step to clean the asset cache after upgrade + coding style adjustments
* | Merge pull request #11634 from owncloud/loadapps-encapsulaterequireLukas Reschke2014-10-171-1/+11
|\ \ | | | | | | Encapsulate require_once to avoid name space bleedind
| * | 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.
* | | Merge pull request #11631 from owncloud/fix-undefine-encryption-exceptionBjörn Schießle2014-10-171-3/+4
|\ \ \ | |_|/ |/| | fixing usage of EncryptionException
| * | fixing usage of EncryptionExceptionThomas Müller2014-10-171-3/+4
| | |
* | | Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedupblizzz2014-10-172-15/+22
|\ \ \ | | | | | | | | drastic ldap speedup (update)
| * | | adapted tests for a groupId indexed group arraymacjohnny2014-06-241-10/+10
| | | |
| * | | modified caching mechanism in getUserGroupIdsmacjohnny2014-06-231-25/+6
| | | | | | | | | | | | removed cachedUserGroupIds, instead changed indexing in getUserGroups to groupId
| * | | clean up function getUserGroupIdsmacjohnny2014-06-231-7/+4
| | | | | | | | | | | | clean up of function getUserGroupIds and improved caching mechanism of cachedUserGroupIds
| * | | Update manager.phpmacjohnny2014-06-211-3/+11
| | | |
| * | | Update manager.phpmacjohnny2014-06-191-2/+2
| | | |
| * | | Update manager.phpmacjohnny2014-06-191-9/+25
| | | |
| * | | Update manager.phpmacjohnny2014-06-191-0/+1
| | | | | | | | | | | | defined $uid in getUserGroupIds
| * | | Update manager.phpmacjohnny2014-06-191-1/+2
| | | | | | | | | | | | added description and blank lines in getUserGroupIds
| * | | Update manager.phpmacjohnny2014-06-191-1/+4
| | | | | | | | | | | | add caching to getUserGroupIds
* | | | Merge pull request #11611 from owncloud/fix-svg-masterMorris Jobke2014-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
* | | | | Merge pull request #11629 from owncloud/add-notice-to-php-docMorris Jobke2014-10-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Add PHPDoc about sanitization of "insertIfNotExist"
| * | | | | Add PHPDoc about sanitization of "insertIfNotExist"Lukas Reschke2014-10-171-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | Let's document this potential pitfall properly.
* | | | | Merge pull request #11594 from owncloud/sharing_toggle_passwordMorris Jobke2014-10-171-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | set password field placeholder back if passward was disabled
| * | | | set password field placeholder back if passward was disabledBjoern Schiessle2014-10-151-0/+1
| | | | |
* | | | | Merge pull request #11627 from owncloud/fix-sample.php-syntaxThomas Müller2014-10-171-3/+5
|\ \ \ \ \ | | | | | | | | | | | | fix the RST syntax of config.sample.php
| * | | | | fix the RST syntax of config.sample.phpMorris Jobke2014-10-171-3/+5
| | | | | |
* | | | | | Merge pull request #11552 from owncloud/fix_files_external_flickeringJörn Friedrich Dreyer2014-10-171-76/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix files external flickering
| * | | | | | cleanup variable names and duplicate jQuery selectorsJörn Friedrich Dreyer2014-10-131-76/+80
| | | | | | |
| * | | | | | fix flickering usersJörn Friedrich Dreyer2014-10-131-1/+1
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1794-69/+329
| |/ / / / / |/| | | | |
* | | | | | read config.sample.php options and whitespace fixesMorris Jobke2014-10-171-4/+6
| | | | | |
* | | | | | Merge pull request #11626 from owncloud/add-l10nLukas Reschke2014-10-161-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Use l10n on this string as well
| * | | | | Use l10n on this string as wellLukas Reschke2014-10-161-1/+1
| | | | | |
* | | | | | Merge pull request #11625 from owncloud/fix-setup-due-to-some-race-conditionVincent Petry2014-10-161-6/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add a try catch block
| * | | | | 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.
* | | | | Merge pull request #11617 from owncloud/fix-unitThomas Müller2014-10-161-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix unit test
| * | | | | Fix unit testLukas Reschke2014-10-161-3/+3
| | | | | | | | | | | | | | | | | | Regression introduced with https://github.com/owncloud/core/pull/11615
* | | | | | Merge pull request #11591 from owncloud/addAppVersionToCSSandJSLukas Reschke2014-10-161-9/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add app version to JS and CSS
| * | | | | | 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-151-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
* | | | | | Merge pull request #11521 from owncloud/configsamplephpLukas Reschke2014-10-161-11/+28
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | small corrections to config.sample.php
| * | | | | commented out instanceid and passwordsaltCarla Schroder2014-10-141-3/+5
| | | | | |
| * | | | | some small tweaksCarla Schroder2014-10-141-9/+18
| | | | | |
| * | | | | small corrections to config.sample.phpCarla Schroder2014-10-101-6/+12
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 22:21:08 +0000