| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Users page: username instead of login name as col header to avoid confusion w... | Arthur Schiwon | 2013-06-18 | 1 | -1/+1 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-18 | 1 | -0/+1 |
|/ |
|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-16 | 1 | -0/+1 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-15 | 38 | -37/+40 |
* | [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 |
|\ |
|
| * | Merge branch 'template_updates' of github.com:owncloud/core into template_upd... | Björn Schießle | 2013-06-12 | 2 | -9/+4 |
| |\ |
|
| | * | 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 |
|\ \ |
|
| * \ | Merge pull request #3677 from owncloud/apps-buttons | Jan-Christoph Borchardt | 2013-06-13 | 2 | -6/+17 |
| |\ \ |
|
| | * | | 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 inter... | Jan-Christoph Borchardt | 2013-06-12 | 2 | -6/+17 |
| | |/ |
|
| * | | [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 | 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 | 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 |
|\| | |
|
| * | | [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 |
|\| | |
|
| * | | Merge pull request #3610 from owncloud/encryption_recovery_for_ldap | Björn Schießle | 2013-06-10 | 2 | -10/+26 |
| |\ \
| | |/
| |/| |
|
| | * | use pre_setPassword hook to update the encryption keys if the back-end doesn'... | Björn Schießle | 2013-06-06 | 1 | -9/+21 |
| | * | 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 |
| |\ |
|
| | * | 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 the... | Björn Schießle | 2013-06-07 | 1 | -1/+1 |
* | | | 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 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 depends on OC_USER_BACKEND_SET_PASSWORD | zafi | 2013-05-25 | 1 | -0/+6 |
* | | | | [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 |
|\ \ \ |
|
| * \ \ | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-21 | 2 | -2/+52 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-20 | 5 | -22/+24 |
| |\ \ \ |
|