summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3653 from owncloud/shorten_identifiers_in_testsThomas Müller2013-06-104-7/+7
|\ | | | | shorten table identifiers in tests
| * shorten table identifiers in testsJörn Friedrich Dreyer2013-06-104-7/+7
| |
* | Merge pull request #3647 from owncloud/missing_backticksMorris Jobke2013-06-105-26/+26
|\ \ | | | | | | add missing backticks all over the place
| * | add missing backticks all over the placeJörn Friedrich Dreyer2013-06-105-26/+26
| |/
* | Merge pull request #3648 from owncloud/sql_limit_as_paramJörn Friedrich Dreyer2013-06-101-1/+1
|\ \ | | | | | | convert LIMIT to parameter
| * | convert LIMIT to parameterJörn Friedrich Dreyer2013-06-101-1/+1
| |/
* | Merge pull request #3610 from owncloud/encryption_recovery_for_ldapBjörn Schießle2013-06-105-13/+39
|\ \ | |/ |/| recover encryption keys if ownCloud can't change the log-in password
| * use pre_setPassword hook to update the encryption keys if the back-end ↵Björn Schießle2013-06-063-9/+31
| | | | | | | | doesn't support password change; improved output to let the admin know what happened
| * always emit the preSetPassword hook, this should only indicate the ↵Björn Schießle2013-06-061-3/+3
| | | | | | | | intention. Finally the post-hooks indicate if it was successful or not
| * add hint about what the recovery password field is forBjörn Schießle2013-06-061-1/+5
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-10529-1045/+1045
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-09521-1040/+1040
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-08557-1151/+1184
| |
* | Merge pull request #2919 from owncloud/hook-improvementsMichael Gapczynski2013-06-071-6/+8
|\ \ | | | | | | Hook improvements
| * \ Merge branch 'master' into hook-improvementsMichael Gapczynski2013-06-041691-65985/+65795
| |\ \ | | | | | | | | | | | | | | | | Conflicts: lib/files/view.php
| * | | Don't unlink old renamed file if stream copy failedMichael Gapczynski2013-04-131-1/+3
| | | |
| * | | Check if operation worked before sending post hooks, fixes #2484Michael Gapczynski2013-04-131-4/+4
| | | |
* | | | Merge pull request #3628 from owncloud/update_3rdparty_submoduleMorris Jobke2013-06-071-0/+0
|\ \ \ \ | | | | | | | | | | update 3rdparty submodule
| * | | | update 3rdparty submoduleGeorg Ehrke2013-06-071-0/+0
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-0753-222/+372
| | | |
* | | | Merge pull request #3622 from owncloud/read-extfx-confg-from-homeThomas Müller2013-06-061-0/+9
|\ \ \ \ | |_|_|/ |/| | | Read configuratons for external filesystem test from a private place.
| * | | Read configuratons for external filesystem test from a private place.Thomas Mueller2013-06-071-0/+9
|/ / / | | | | | | | | | This will help not to accidentially push private data and enable testing on our ci server.
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-0637-115/+176
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-0562-341/+598
| |/ |/|
* | Merge pull request #3594 from opensaucesystems/patch-1Thomas Müller2013-06-041-3/+4
|\ \ | | | | | | Added input[type="url"] to styles.css
| * | Added input[type="url"] to styles.cssopensaucesystems2013-06-041-3/+4
| | |
* | | exclude 3rdparty folder within files_external and files_encryption from code ↵Thomas Mueller2013-06-041-0/+2
|/ / | | | | | | coverage
* | LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600Arthur Schiwon2013-06-041-0/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-04148-632/+636
| |
* | ignore l10n folder within remaining appsThomas Mueller2013-06-041-0/+8
| |
* | Cache Test: set datadir to temporary location, otherwise initmountpoints ↵Arthur Schiwon2013-06-031-2/+8
| | | | | | | | will access to productive location
* | Cache: mount user mountpoints to make sure that // exists before accessing ↵Arthur Schiwon2013-06-031-0/+1
| | | | | | | | it. Fixes #2553 and #2374
* | Merge pull request #3444 from owncloud/share-fixJörn Friedrich Dreyer2013-06-031-1/+1
|\ \ | | | | | | Fix undefined index for share mount point retrieval
| * | Fix undefined index for share mount point retrievalMichael Gapczynski2013-05-211-1/+1
| | |
* | | Merge pull request #3581 from owncloud/publicphp_maintenanceJörn Friedrich Dreyer2013-06-031-0/+1
|\ \ \ | | | | | | | | public.php - check if maintenance mode is enabled
| * | | public.php - check if maintenance mode is enabledGeorg Ehrke2013-06-031-0/+1
| | | |
* | | | Merge pull request #3561 from owncloud/usericewind19912013-06-0313-412/+1893
|\ \ \ \ | | | | | | | | | | Refactor of user management
| * | | | also clear cached users when removing a single backendRobin Appelman2013-06-031-0/+1
| | | | |
| * | | | use caching for userExistsRobin Appelman2013-06-031-6/+3
| | | | |
| * | | | cast result to boolRobin Appelman2013-06-031-1/+2
| | | | |
| * | | | move phpdoc commentsRobin Appelman2013-06-033-2/+52
| | | | |
| * | | | User: return backend resultRobin Appelman2013-06-031-2/+1
| | | | |
| * | | | User: consisten variable namingRobin Appelman2013-06-031-9/+9
| | | | |
| * | | | User: remove determineDisplayNameRobin Appelman2013-06-031-19/+9
| | | | |
| * | | | adding PHPDoc comment to getManager()Thomas Mueller2013-06-011-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | adding PHPDoc comment for $user within the hooks callbacks fixing PHPDoc comment on isLoggedIn()
| * | | | fix namespacing errorRobin Appelman2013-06-011-3/+3
| | | | |
| * | | | fix undefined variablesRobin Appelman2013-06-011-2/+2
| | | | |
| * | | | use single quotesRobin Appelman2013-06-011-10/+10
| | | | |
| * | | | user should set into session before postLogin hook otherwise it will break ↵Florin Peter2013-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | not only the files_encryption app
| * | | | fix broken testsFlorin Peter2013-05-311-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 21:50:38 +0000