Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-13 | 2 | -2/+4 |
| | |||||
* | Merge pull request #3676 from owncloud/move-storage-bar | Frank Karlitschek | 2013-06-12 | 1 | -6/+9 |
|\ | | | | | move storage bar below clients showcase to make it more visible | ||||
| * | move storage bar below clients showcase to make it more visible | Jan-Christoph Borchardt | 2013-06-11 | 1 | -6/+9 |
| | | |||||
* | | Merge pull request #3681 from owncloud/fix_ajax_removeuser.php | Morris Jobke | 2013-06-12 | 1 | -0/+1 |
|\ \ | | | | | | | Init language object before using it | ||||
| * | | init language object before using it | Georg Ehrke | 2013-06-12 | 1 | -0/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-12 | 8 | -2/+10 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-11 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #3610 from owncloud/encryption_recovery_for_ldap | Björn Schießle | 2013-06-10 | 2 | -10/+26 |
|\ \ | |/ |/| | 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ßle | 2013-06-06 | 1 | -9/+21 |
| | | | | | | | | doesn't support password change; improved output to let the admin know what happened | ||||
| * | add hint about what the recovery password field is for | Björn Schießle | 2013-06-06 | 1 | -1/+5 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-08 | 4 | -0/+4 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-07 | 4 | -1/+56 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-06 | 4 | -8/+10 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-05 | 3 | -6/+16 |
| | |||||
* | Merge pull request #3454 from owncloud/fix_hasInternetConnection | Thomas Müller | 2013-05-31 | 1 | -1/+1 |
|\ | | | | | isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false | ||||
| * | fix method naming | Thomas Mueller | 2013-05-31 | 1 | -1/+1 |
| | | |||||
| * | use false instead of 0 | Georg Ehrke | 2013-05-27 | 1 | -1/+1 |
| | | |||||
| * | make method names camelCase | Georg Ehrke | 2013-05-27 | 1 | -1/+1 |
| | | |||||
| * | don't show a warning if internet connection is disabled on purpose | Georg Ehrke | 2013-05-27 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-30 | 2 | -0/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-29 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #2778 from Kondou-ger/optimize_pictures | Jörn Friedrich Dreyer | 2013-05-28 | 10 | -9497/+39 |
|\ \ | | | | | | | Optimize pictures with optipng. | ||||
| * | | Optimize svgs with scour. | kondou | 2013-04-12 | 6 | -9497/+39 |
| | | | |||||
| * | | Optimize pictures with optipng. | kondou | 2013-04-07 | 4 | -0/+0 |
| | | | |||||
* | | | Merge pull request #3488 from zafi/master | blizzz | 2013-05-28 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | The "lost password" field in the personal setting depends on OC_USER_BACKEND_SET_PASSWORD | ||||
| * | | | The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD | zafi | 2013-05-25 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | so it should only be visible for users with a supporting backend. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-28 | 2 | -0/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-27 | 2 | -0/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-26 | 8 | -0/+8 |
|/ / / | |||||
* | | | Merge pull request #3416 from owncloud/files_encryption | Thomas Müller | 2013-05-24 | 6 | -5/+31 |
|\ \ \ | | | | | | | | | New files encryption app | ||||
| * \ \ | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-21 | 2 | -2/+52 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: apps/files_trashbin/l10n/nn_NO.php | ||||
| * | | | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-20 | 5 | -22/+24 |
| |\ \ \ | |||||
| * | | | | display a warning if the user has enabled file recovery but the admin tries ↵ | Björn Schießle | 2013-05-18 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | to change the users password without a recovery password | ||||
| * | | | | show nicer warning if the admin recovery password was wrong | Björn Schießle | 2013-05-16 | 2 | -5/+7 |
| | | | | | |||||
| * | | | | some error handling in case the recovery password is wrong | Björn Schießle | 2013-05-16 | 2 | -2/+9 |
| | | | | | |||||
| * | | | | allow admin to recover users files in case of password lost | Björn Schießle | 2013-05-16 | 6 | -4/+17 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-24 | 1 | -1/+5 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-20 | 2 | -2/+52 |
| |/ / |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-18 | 1 | -0/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-17 | 1 | -20/+20 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-16 | 3 | -2/+3 |
|/ / | |||||
* | | Merge remote-tracking branch 'upstream/master' into pr-langcode | Pellaeon Lin | 2013-05-12 | 10 | -23/+93 |
|\ \ | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-12 | 6 | -14/+87 |
| | | | |||||
| * | | Merge pull request #3257 from owncloud/fix_3251 | Jan-Christoph Borchardt | 2013-05-10 | 1 | -2/+3 |
| |\ \ | | | | | | | | | Fix 3251 | ||||
| | * | | Fix #3251 | kondou | 2013-05-09 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | Using ksort now, instead of prefilling the commonlanguages array. | ||||
| * | | | fix inconsistent post parameters in change password operation | Björn Schießle | 2013-05-08 | 2 | -2/+2 |
| | | | | |||||
| * | | | allow to set quota to zero, issue #2696 | Björn Schießle | 2013-05-07 | 1 | -5/+1 |
| | | | | |||||
* | | | | Modify zh_* language codes | Pellaeon Lin | 2013-05-04 | 1 | -3/+3 |
|/ / / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-04 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #3201 from owncloud/own_sorting_for_priorized_languages | Bart Visscher | 2013-05-03 | 1 | -3/+4 |
|\ \ | | | | | | | Sort priorized languages as defined in the array |