| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-20 | 5 | -22/+24 |
|\ |
|
| * | [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 |
* | | display a warning if the user has enabled file recovery but the admin tries t... | Björn Schießle | 2013-05-18 | 1 | -3/+7 |
* | | 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 |
|/ |
|
* | 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 | kondou | 2013-05-09 | 1 | -2/+3 |
| * | | 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 | kondou | 2013-05-01 | 1 | -3/+4 |
* | | Fix retrieval of users with multiple backends | Arthur Schiwon | 2013-05-03 | 2 | -5/+16 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-02 | 5 | -37/+43 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-01 | 4 | -8/+12 |
|/ |
|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-30 | 4 | -10/+80 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-29 | 6 | -4/+23 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-28 | 2 | -6/+8 |
* | Merge pull request #3114 from owncloud/update-notification | Raghu Nayyar | 2013-04-26 | 1 | -2/+1 |
|\ |
|
| * | Add an update notification on every page for admin users | Lukas Reschke | 2013-04-24 | 1 | -2/+1 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-27 | 53 | -189/+257 |
* | | Merge pull request #3002 from owncloud/priorize_common_languages | Bart Visscher | 2013-04-26 | 3 | -4/+21 |
|\ \ |
|
| * | | Make divider not selectable | kondou | 2013-04-19 | 2 | -5/+4 |
| * | | Priorize common languages. | kondou | 2013-04-18 | 3 | -4/+22 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-26 | 36 | -108/+0 |
* | | | Merge pull request #3098 from jerrac/displaynamesaveontimeout | Morris Jobke | 2013-04-25 | 3 | -40/+46 |
|\ \ \ |
|
| * | | | Fixed comment in personal.js. Changed message text in changedisplayname.php. | David Reagan | 2013-04-23 | 2 | -2/+2 |
| * | | | Made saving the display name work the same way as the email address. Fixed a ... | David Reagan | 2013-04-23 | 3 | -40/+46 |
* | | | | Merge pull request #3094 from owncloud/log-ajax | Bart Visscher | 2013-04-25 | 2 | -8/+6 |
|\ \ \ \ |
|
| * | | | | fix syntax layout | Morris Jobke | 2013-04-23 | 1 | -3/+6 |
| * | | | | remove log sort in admin section | Morris Jobke | 2013-04-23 | 1 | -5/+0 |
| * | | | | fix logical issue while retrieving log via ajax | Morris Jobke | 2013-04-23 | 1 | -1/+1 |
| |/ / / |
|
* | | | | Merge pull request #3096 from owncloud/add_missing_space_for_new_groups | Raghu Nayyar | 2013-04-24 | 1 | -9/+3 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Fix #3095. | kondou | 2013-04-24 | 1 | -9/+3 |
| |/ / |
|
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-24 | 2 | -0/+7 |
|/ / |
|
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-22 | 1 | -0/+4 |
|/ |
|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-18 | 4 | -4/+7 |
* | Merge pull request #2975 from owncloud/log-date | Morris Jobke | 2013-04-17 | 2 | -2/+10 |
|\ |
|
| * | also adjust template properly for log date fix | Bernhard Posselt | 2013-04-17 | 1 | -1/+5 |
| * | fix admin log display and use a more readable format | Bernhard Posselt | 2013-04-17 | 1 | -1/+5 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-17 | 2 | -1/+65 |
* | | Removed extra id from jquery selectors. Remove console.log call. Removed comm... | David Reagan | 2013-04-16 | 1 | -4/+2 |
* | | Modified how the #lostpassword or #email fields save email addresses on the P... | David Reagan | 2013-04-16 | 1 | -12/+24 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-16 | 1 | -3/+3 |
|/ |
|