Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into mobile-style | Jan-Christoph Borchardt | 2014-01-29 | 2 | -27/+48 |
|\ | |||||
| * | Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt | Morris Jobke | 2014-01-27 | 2 | -25/+27 |
| |\ | | | | | | | remove the form, it isn't needed here | ||||
| | * | disable button and input field during decryption | Bjoern Schiessle | 2014-01-24 | 1 | -0/+5 |
| | | | |||||
| | * | remove the form, it isn't needed here | Bjoern Schiessle | 2014-01-24 | 2 | -25/+22 |
| | | | |||||
| * | | prevent autofill for password change settings, prevent leak of existing ↵ | Jan-Christoph Borchardt | 2014-01-24 | 1 | -2/+4 |
| |/ | | | | | | | password, fix #6552 | ||||
| * | Merge pull request #6234 from owncloud/change-email-by-enter | Jan-Christoph Borchardt | 2014-01-23 | 1 | -0/+17 |
| |\ | | | | | | | change mail address by pressing enter - fixes #6179 | ||||
| | * | fix double call of changeEmailAddress() | Morris Jobke | 2014-01-18 | 1 | -0/+5 |
| | | | |||||
| | * | fix typo | Morris Jobke | 2013-12-09 | 1 | -1/+1 |
| | | | |||||
| | * | change mail address by pressing enter - fixes #6179 | Morris Jobke | 2013-12-07 | 1 | -0/+12 |
| | | | |||||
* | | | Merge branch 'master' into mobile-style | Thomas Müller | 2014-01-23 | 8 | -15/+73 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js apps/files_sharing/css/public.css apps/files_sharing/js/public.js apps/files_sharing/templates/public.php | ||||
| * | | added website field | Bjoern Schiessle | 2014-01-17 | 3 | -18/+25 |
| | | | |||||
| * | | distinguish app links from doc links | Bjoern Schiessle | 2014-01-17 | 3 | -3/+4 |
| | | | |||||
| * | | show link to app documentation | Bjoern Schiessle | 2014-01-17 | 3 | -1/+30 |
| | | | |||||
| * | | Merge pull request #6786 from wakeup/master | Björn Schießle | 2014-01-16 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fix untranslated text when deleting user | ||||
| | * | | Fix untranslated text when deleting user | Volkan Gezer | 2014-01-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This should fix issue #6728 | ||||
| * | | | Indicate password strength using strengthify | Morris Jobke | 2014-01-15 | 4 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * uses zxcvbn * outsourced to separate jquery plugin * async loading * hide strength meter if input is empty * feedback if user enters weakest password * fade in and out * show tipsy with strength * Opera 12, IE8-10, FF 23, Chromium 29 | ||||
| * | | | remove ru_RU - it has bee removed from transifex | Thomas Müller | 2014-01-13 | 1 | -10/+0 |
| | | | | |||||
* | | | | remove unused log icon | Jan-Christoph Borchardt | 2014-01-15 | 3 | -12/+0 |
|/ / / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-06 | 3 | -4/+11 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-05 | 1 | -0/+6 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-04 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-02 | 1 | -0/+153 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-29 | 1 | -14/+47 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-24 | 4 | -7/+18 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-22 | 1 | -0/+22 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-21 | 1 | -0/+3 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-19 | 1 | -0/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-17 | 1 | -0/+6 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-17 | 3 | -3/+12 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-13 | 2 | -0/+4 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-11 | 5 | -1/+60 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-07 | 2 | -0/+28 |
|/ | |||||
* | Merge pull request #6213 from owncloud/fix-full-name-edit | Vincent Petry | 2013-12-06 | 1 | -1/+4 |
|\ | | | | | Fix full name edit for repetitive edit | ||||
| * | parent().parent() -> closest() | Morris Jobke | 2013-12-06 | 1 | -1/+1 |
| | | |||||
| * | Fix full name edit for repetive edit | Morris Jobke | 2013-12-05 | 1 | -1/+4 |
| | | | | | | | | | | | | | | fixes #6212 fixes the data attributes after edit fixes markup to successfully re-edit display name | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-05 | 10 | -0/+21 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-04 | 3 | -2/+26 |
| | |||||
* | lower required php version to 5.3.3 | Frank Karlitschek | 2013-12-04 | 2 | -0/+15 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-02 | 6 | -18/+47 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-29 | 10 | -0/+31 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-27 | 2 | -0/+5 |
| | |||||
* | fix wording | Morris Jobke | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | add warning for HTTP connection | Morris Jobke | 2013-11-27 | 1 | -0/+14 |
| | |||||
* | Merge pull request #6058 from owncloud/ldap2avatar | blizzz | 2013-11-26 | 2 | -0/+5 |
|\ | | | | | Set Avatar for LDAP users automatically (if a picture is available) | ||||
| * | Enable user backends to provide avatar images | Arthur Schiwon | 2013-11-22 | 2 | -0/+5 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-26 | 7 | -0/+17 |
| | | |||||
* | | check if user is logged in | Bjoern Schiessle | 2013-11-26 | 1 | -0/+3 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-26 | 30 | -29/+29 |
| | | |||||
* | | Merge pull request #5960 from owncloud/enc_small_visual_improvements | Vincent Petry | 2013-11-25 | 1 | -5/+5 |
|\ \ | | | | | | | [encryption] some small visual improvements | ||||
| * | | - show a spinner while decrypting files if the encryption app was disabled | Bjoern Schiessle | 2013-11-20 | 1 | -5/+5 |
| | | | | | | | | | | | | - don't fade-out the decryption result |