Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | fix for autoloader while user logged in and system is in maintenance | Florin Peter | 2013-05-31 | 1 | -23/+28 | |
* | | | | | | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-11 | 10 | -6/+160 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #3646 from owncloud/introduce_phpunit_timeouts | Thomas Müller | 2013-06-11 | 6 | -0/+123 | |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | ||||||
| | * | | | | | | allow 30 sec for testDeleteFile | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -0/+1 | |
| | * | | | | | | raise failed tests from first commit to size @medium | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -0/+3 | |
| | * | | | | | | add timeouts 3/30/90 to phpunit tests | Jörn Friedrich Dreyer | 2013-06-10 | 5 | -0/+119 | |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-11 | 3 | -2/+32 | |
| * | | | | | | | Merge pull request #3647 from owncloud/missing_backticks | Morris Jobke | 2013-06-10 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | add missing backticks all over the place | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -4/+4 | |
| | |/ / / / / / | ||||||
* | | | | | | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-10 | 52 | -44/+409 | |
|\| | | | | | | | ||||||
| * | | | | | | | Merge pull request #3610 from owncloud/encryption_recovery_for_ldap | Björn Schießle | 2013-06-10 | 2 | -0/+10 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | use pre_setPassword hook to update the encryption keys if the back-end doesn'... | Björn Schießle | 2013-06-06 | 2 | -0/+10 | |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-08 | 6 | -14/+27 | |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-07 | 9 | -11/+54 | |
| * | | | | | | | Read configuratons for external filesystem test from a private place. | Thomas Mueller | 2013-06-07 | 1 | -0/+9 | |
| |/ / / / / / | ||||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-06 | 7 | -2/+46 | |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-05 | 15 | -8/+167 | |
| * | | | | | | LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600 | Arthur Schiwon | 2013-06-04 | 1 | -0/+4 | |
| * | | | | | | Merge pull request #3561 from owncloud/user | icewind1991 | 2013-06-03 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | fix broken tests | Florin Peter | 2013-05-31 | 1 | -1/+1 | |
| | | |/ / / / | | |/| | | | | ||||||
| * | | | | | | Merge pull request #3051 from owncloud/backgroundjob | icewind1991 | 2013-06-02 | 3 | -12/+11 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Files: use public api to register backgroundjob | Robin Appelman | 2013-06-02 | 1 | -1/+1 | |
| | * | | | | | | merge master into backgroundjob | Robin Appelman | 2013-06-02 | 376 | -3989/+10324 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Rework background job system | Robin Appelman | 2013-04-20 | 2 | -11/+10 | |
| * | | | | | | | | Merge pull request #3567 from owncloud/fixing-3466 | Frank Karlitschek | 2013-06-02 | 1 | -2/+12 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | In cases where smb4php returns false of an empty array stat/( has to return f... | Thomas Mueller | 2013-06-01 | 1 | -2/+12 | |
| | | |_|_|_|/ / | | |/| | | | | | ||||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-02 | 2 | -1/+25 | |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-01 | 6 | -1/+28 | |
| * | | | | | | | Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js | blizzz | 2013-05-31 | 2 | -2/+8 | |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| | * | | | | | | LDAP: sqlite compatibility for emptyiing tables | Arthur Schiwon | 2013-05-31 | 1 | -1/+7 | |
| | * | | | | | | LDAP: fix setting value of checkbox after loading configuration | Arthur Schiwon | 2013-05-31 | 1 | -1/+1 | |
| | | |_|/ / / | | |/| | | | | ||||||
| * | | | | | | Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling | blizzz | 2013-05-31 | 1 | -3/+9 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | LDAP: fix possible recursion | Arthur Schiwon | 2013-05-25 | 1 | -0/+7 | |
| | * | | | | | | LDAP: fix handling when LDAP Host is offline | Arthur Schiwon | 2013-05-25 | 1 | -3/+2 | |
| | | |/ / / / | | |/| | | | | ||||||
| * | | | | | | also fix login errors while filesystem is not loaded in app.php | Florin Peter | 2013-05-31 | 1 | -0/+6 | |
| * | | | | | | Merge branch 'master' into files_encryption_fs_loaded_fix | Florin Peter | 2013-05-31 | 7 | -142/+145 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| * | | | | | | fix login errors while filesystem is not loaded | Florin Peter | 2013-05-31 | 1 | -0/+5 | |
* | | | | | | | add a hint that the admin can recover your files; Don't let the user change t... | Björn Schießle | 2013-06-05 | 1 | -3/+9 | |
* | | | | | | | allow to press enter to update the password | Björn Schießle | 2013-06-05 | 1 | -15/+23 | |
* | | | | | | | tell the user what he can do to regain access to his files | Björn Schießle | 2013-06-05 | 1 | -1/+1 | |
* | | | | | | | only show personal settings if the recovery feature is enabled or if no priva... | Björn Schießle | 2013-06-05 | 1 | -6/+13 | |
* | | | | | | | improved error msg and removed duplicate string | Florin Peter | 2013-06-04 | 1 | -3/+5 | |
* | | | | | | | improved label for the password recovery feature | Björn Schießle | 2013-06-04 | 1 | -2/+2 | |
* | | | | | | | link directly to the encryption settings | Björn Schießle | 2013-06-04 | 2 | -1/+2 | |
* | | | | | | | better handling for http post | Florin Peter | 2013-06-04 | 2 | -1/+9 | |
* | | | | | | | changed redirect handling | Florin Peter | 2013-06-03 | 4 | -16/+46 | |
* | | | | | | | fixed typo | Florin Peter | 2013-06-03 | 1 | -1/+1 | |
* | | | | | | | reformat code | Florin Peter | 2013-06-03 | 10 | -74/+83 | |
* | | | | | | | use generated private key fro m setUp() | Björn Schießle | 2013-06-03 | 1 | -4/+2 | |
* | | | | | | | added test for decryptPrivateKey() | Björn Schießle | 2013-06-03 | 1 | -0/+18 |