Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #3810 from owncloud/improve_webdavauth | Thomas Müller | 2013-06-21 | 1 | -4/+4 | |
|\ \ \ | ||||||
| * | | | improve error handling of webdavauth | Georg Ehrke | 2013-06-21 | 1 | -4/+4 | |
* | | | | fix some strings in the admin settings, it's not a 'recovery account' but a '... | Björn Schießle | 2013-06-21 | 1 | -5/+5 | |
* | | | | encryption is LDAP compatible | Björn Schießle | 2013-06-21 | 1 | -1/+1 | |
* | | | | Squashed commit of the following: | Björn Schießle | 2013-06-21 | 2 | -9/+18 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-21 | 6 | -0/+47 | |
* | | | | Merge pull request #3788 from owncloud/more_error_messages | Björn Schießle | 2013-06-20 | 2 | -26/+28 | |
|\ \ \ \ | ||||||
| * | | | | always have a defined return value | Björn Schießle | 2013-06-19 | 1 | -4/+4 | |
| * | | | | some more error messages | Björn Schießle | 2013-06-19 | 1 | -5/+3 | |
| * | | | | add some more error messages, in case something went wrong | Björn Schießle | 2013-06-19 | 2 | -24/+28 | |
* | | | | | Merge pull request #3784 from owncloud/rescan-all | Thomas Müller | 2013-06-20 | 2 | -15/+45 | |
|\ \ \ \ \ | ||||||
| * | | | | | use json to encode user list | Robin Appelman | 2013-06-19 | 2 | -2/+2 | |
| * | | | | | allow scanning files for multiple users | Robin Appelman | 2013-06-19 | 2 | -15/+45 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-20 | 8 | -17/+36 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #3764 from owncloud/scanfolder-existing | icewind1991 | 2013-06-19 | 1 | -1/+1 | |
|\| | | | | |/ / / |/| | | | ||||||
| * | | | reuse etag when doing a forced rescan | Robin Appelman | 2013-06-14 | 1 | -1/+1 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-18 | 4 | -0/+24 | |
* | | | | Merge branch 'master' into fix_glob_escaping | Björn Schießle | 2013-06-17 | 56 | -52/+121 | |
|\ \ \ \ | ||||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-17 | 4 | -0/+8 | |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-16 | 11 | -0/+54 | |
| * | | | | Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder | Morris Jobke | 2013-06-15 | 1 | -2/+9 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | ||||||
| | * | | | duplicate verification | Bastien Ho | 2013-05-10 | 1 | -3/+0 | |
| | * | | | Fix inexisting trashbin's sub-folders | Bastien Ho | 2013-05-10 | 1 | -2/+12 | |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-15 | 48 | -48/+42 | |
| * | | | | Merge pull request #3473 from opensaucesystems/master | Thomas Müller | 2013-06-14 | 2 | -3/+9 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Update settings.php | opensaucesystems | 2013-05-23 | 1 | -1/+1 | |
| | * | | | Remove http:// from label and add placeholder | opensaucesystems | 2013-05-23 | 1 | -1/+1 | |
| | * | | | Enable https authentication | opensaucesystems | 2013-05-23 | 1 | -1/+1 | |
| | * | | | Enable https authentication | opensaucesystems | 2013-05-23 | 1 | -2/+8 | |
* | | | | | don't normalize absolute local path | Björn Schießle | 2013-06-17 | 1 | -1/+1 | |
* | | | | | fix indention | Björn Schießle | 2013-06-14 | 1 | -319/+310 | |
* | | | | | only escape glob pattern | Björn Schießle | 2013-06-14 | 2 | -8/+11 | |
|/ / / / | ||||||
* | | | | Merge pull request #3715 from owncloud/fixes_for_3641_3620 | Björn Schießle | 2013-06-14 | 2 | -9/+8 | |
|\ \ \ \ | ||||||
| * | | | | fix for path_hash not unique as reported at #3641 | Florin Peter | 2013-06-13 | 1 | -2/+2 | |
| * | | | | fix memory problems as reported at #3620 | Florin Peter | 2013-06-13 | 2 | -7/+6 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-14 | 88 | -167/+71 | |
|/ / / / | ||||||
* | | | | Merge pull request #3687 from owncloud/template_updates | Björn Schießle | 2013-06-13 | 1 | -2/+6 | |
|\ \ \ \ | ||||||
| * | | | | improved footer | Björn Schießle | 2013-06-13 | 1 | -2/+6 | |
| * | | | | make pub link share footer aware of different owncloud editions | Björn Schießle | 2013-06-12 | 1 | -2/+2 | |
* | | | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-13 | 12 | -144/+161 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into files_encryption_upgrade_fix | Björn Schießle | 2013-06-13 | 3 | -28/+74 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge pull request #3668 from owncloud/encryption_migrate_only_once | Björn Schießle | 2013-06-13 | 3 | -28/+74 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | add comment to explain the helper function | Björn Schießle | 2013-06-13 | 1 | -0/+8 | |
| | | * | | | | | fix typo in var name | Björn Schießle | 2013-06-13 | 1 | -1/+1 | |
| | | * | | | | | adapt test to the code changes | Björn Schießle | 2013-06-12 | 1 | -3/+18 | |
| | | * | | | | | use number of manipulated rows as idicator if it was possible to enter the mi... | Björn Schießle | 2013-06-12 | 2 | -69/+24 | |
| | | * | | | | | use constants for different migration status | Björn Schießle | 2013-06-11 | 1 | -8/+11 | |
| | | * | | | | | make sure that only one process can enter the migration mode | Björn Schießle | 2013-06-11 | 2 | -12/+77 | |
| * | | | | | | | LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed | Björn Schießle | 2013-06-13 | 1 | -18/+0 | |
| * | | | | | | | Merge branch 'master' into files_encryption_upgrade_fix | Björn Schießle | 2013-06-12 | 65 | -63/+599 | |
| |\| | | | | | |