| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-14 | 4 | -5/+10 |
| | | |||||
| * | Merge pull request #3687 from owncloud/template_updates | Björn Schießle | 2013-06-13 | 3 | -8/+13 |
| |\ | | | | | Make templates aware of different owncloud editions | ||||
| | * | Merge branch 'template_updates' of github.com:owncloud/core into ↵ | Björn Schießle | 2013-06-12 | 2 | -9/+4 |
| | |\ | | | | | | | | | | template_updates | ||||
| | | * | move common settings footer fieldset out of conditional | Jan-Christoph Borchardt | 2013-06-12 | 2 | -9/+4 |
| | | | | |||||
| | * | | don't show translation hints in enterprise edition | Björn Schießle | 2013-06-12 | 1 | -0/+2 |
| | |/ | |||||
| | * | make footer and urls aware of ownCloud editions | Björn Schießle | 2013-06-12 | 3 | -5/+13 |
| | | | |||||
| * | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-13 | 14 | -16/+41 |
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php | ||||
| | * \ | Merge pull request #3677 from owncloud/apps-buttons | Jan-Christoph Borchardt | 2013-06-13 | 2 | -6/+17 |
| | |\ \ | | | | | | | | | remove App management top bar and move buttons more contextually in the interface | ||||
| | | * | | apps management: change misleading + to ... | Jan-Christoph Borchardt | 2013-06-12 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | remove App management top bar and move buttons more contextually in the ↵ | Jan-Christoph Borchardt | 2013-06-12 | 2 | -6/+17 |
| | | |/ | | | | | | | | | | interface | ||||
| | * | | [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 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-11 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/crypt.php | ||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-11 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-10 | 17 | -25/+114 |
| |\| | | | | | | | | | | | | | | Conflicts: settings/ajax/changepassword.php | ||||
| | * | | 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 |
| | | | | |||||
| * | | | only check for recovery key if someone else than the user wants to change ↵ | Björn Schießle | 2013-06-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | the password | ||||
| * | | | fix password change when files_encryption app is disabled | Florin Peter | 2013-06-03 | 1 | -23/+29 |
| |/ / | |||||
| * | | [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 |
| | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |