summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | fix for autoloader while user logged in and system is in maintenanceFlorin Peter2013-05-311-23/+28
* | | | | | | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-1110-6/+160
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #3646 from owncloud/introduce_phpunit_timeoutsThomas Müller2013-06-116-0/+123
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | allow 30 sec for testDeleteFileJörn Friedrich Dreyer2013-06-101-0/+1
| | * | | | | | raise failed tests from first commit to size @mediumJörn Friedrich Dreyer2013-06-101-0/+3
| | * | | | | | add timeouts 3/30/90 to phpunit testsJörn Friedrich Dreyer2013-06-105-0/+119
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-113-2/+32
| * | | | | | | Merge pull request #3647 from owncloud/missing_backticksMorris Jobke2013-06-101-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | add missing backticks all over the placeJörn Friedrich Dreyer2013-06-101-4/+4
| | |/ / / / / /
* | | | | | | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-1052-44/+409
|\| | | | | | |
| * | | | | | | Merge pull request #3610 from owncloud/encryption_recovery_for_ldapBjörn Schießle2013-06-102-0/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | use pre_setPassword hook to update the encryption keys if the back-end doesn'...Björn Schießle2013-06-062-0/+10
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-086-14/+27
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-079-11/+54
| * | | | | | | Read configuratons for external filesystem test from a private place.Thomas Mueller2013-06-071-0/+9
| |/ / / / / /
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-067-2/+46
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-0515-8/+167
| * | | | | | LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600Arthur Schiwon2013-06-041-0/+4
| * | | | | | Merge pull request #3561 from owncloud/usericewind19912013-06-031-1/+1
| |\ \ \ \ \ \
| | * | | | | | fix broken testsFlorin Peter2013-05-311-1/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #3051 from owncloud/backgroundjobicewind19912013-06-023-12/+11
| |\ \ \ \ \ \
| | * | | | | | Files: use public api to register backgroundjobRobin Appelman2013-06-021-1/+1
| | * | | | | | merge master into backgroundjobRobin Appelman2013-06-02376-3989/+10324
| | |\ \ \ \ \ \
| | * | | | | | | Rework background job systemRobin Appelman2013-04-202-11/+10
| * | | | | | | | Merge pull request #3567 from owncloud/fixing-3466Frank Karlitschek2013-06-021-2/+12
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | In cases where smb4php returns false of an empty array stat/( has to return f...Thomas Mueller2013-06-011-2/+12
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-022-1/+25
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-016-1/+28
| * | | | | | | Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_jsblizzz2013-05-312-2/+8
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | LDAP: sqlite compatibility for emptyiing tablesArthur Schiwon2013-05-311-1/+7
| | * | | | | | LDAP: fix setting value of checkbox after loading configurationArthur Schiwon2013-05-311-1/+1
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #3562 from owncloud/fix_ldap_offline_host_handlingblizzz2013-05-311-3/+9
| |\ \ \ \ \ \
| | * | | | | | LDAP: fix possible recursionArthur Schiwon2013-05-251-0/+7
| | * | | | | | LDAP: fix handling when LDAP Host is offlineArthur Schiwon2013-05-251-3/+2
| | | |/ / / / | | |/| | | |
| * | | | | | also fix login errors while filesystem is not loaded in app.phpFlorin Peter2013-05-311-0/+6
| * | | | | | Merge branch 'master' into files_encryption_fs_loaded_fixFlorin Peter2013-05-317-142/+145
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | fix login errors while filesystem is not loadedFlorin Peter2013-05-311-0/+5
* | | | | | | add a hint that the admin can recover your files; Don't let the user change t...Björn Schießle2013-06-051-3/+9
* | | | | | | allow to press enter to update the passwordBjörn Schießle2013-06-051-15/+23
* | | | | | | tell the user what he can do to regain access to his filesBjörn Schießle2013-06-051-1/+1
* | | | | | | only show personal settings if the recovery feature is enabled or if no priva...Björn Schießle2013-06-051-6/+13
* | | | | | | improved error msg and removed duplicate stringFlorin Peter2013-06-041-3/+5
* | | | | | | improved label for the password recovery featureBjörn Schießle2013-06-041-2/+2
* | | | | | | link directly to the encryption settingsBjörn Schießle2013-06-042-1/+2
* | | | | | | better handling for http postFlorin Peter2013-06-042-1/+9
* | | | | | | changed redirect handlingFlorin Peter2013-06-034-16/+46
* | | | | | | fixed typoFlorin Peter2013-06-031-1/+1
* | | | | | | reformat codeFlorin Peter2013-06-0310-74/+83
* | | | | | | use generated private key fro m setUp()Björn Schießle2013-06-031-4/+2
* | | | | | | added test for decryptPrivateKey()Björn Schießle2013-06-031-0/+18