| Commit message (Expand) | Author | Age | Files | Lines |
* | Pass view in \OC_Avatar to constructor and use $_ for enable_avatars | kondou | 2013-09-09 | 2 | -3/+3 |
* | Fix an IE8 bug with the avatarcropper. | kondou | 2013-09-05 | 1 | -1/+0 |
* | Partly fix cropper in IE8 and don't use a dialog for it | kondou | 2013-09-03 | 1 | -7/+14 |
* | Fix some of @jancborchardt's complaints in oc_avatars | kondou | 2013-09-02 | 1 | -4/+4 |
* | Provide 'enable_avatars' in config.php, to disable avatars | kondou | 2013-09-01 | 2 | -0/+6 |
* | Use defaultavatars | kondou | 2013-08-29 | 2 | -2/+2 |
* | Merge branch 'master' into oc_avatars | kondou | 2013-08-28 | 1 | -1/+1 |
|\ |
|
| * | Merge pull request #4563 from owncloud/use_personal-password | Jan-Christoph Borchardt | 2013-08-28 | 1 | -1/+1 |
| |\ |
|
| | * | Use personal-password for the password name in personal.php | kondou | 2013-08-24 | 1 | -1/+1 |
* | | | Clean up some cruft | kondou | 2013-08-26 | 1 | -3/+0 |
* | | | Have a controller instead ofo avatar.php and fix some cropper-design | kondou | 2013-08-26 | 2 | -3/+3 |
* | | | Use Jcrop, have inline errormsg, work on cropping, clean up, WIP | kondou | 2013-08-25 | 1 | -0/+1 |
* | | | Remove gravatar and no-avatar functionality, prepare for default avatars even... | kondou | 2013-08-25 | 3 | -47/+7 |
* | | | Integrate newavatar.php into avatar.php by using GET, POST & DELETE | kondou | 2013-08-25 | 1 | -1/+1 |
* | | | Deny access for non-users and add a (not-working) override button | kondou | 2013-08-25 | 1 | -0/+1 |
* | | | Several improvements | kondou | 2013-08-25 | 3 | -40/+32 |
* | | | Have a fancy uploadavatar button | kondou | 2013-08-25 | 1 | -1/+2 |
* | | | Use avatar.php in user-management | kondou | 2013-08-25 | 1 | -1/+1 |
* | | | Show avatar on personal.php always (except if avatars are disabled) | kondou | 2013-08-25 | 1 | -5/+11 |
* | | | Have /avatar.php as a central avatar-point | kondou | 2013-08-25 | 1 | -2/+2 |
* | | | Improve styling & enable avatar-upload at personal page | kondou | 2013-08-25 | 2 | -14/+9 |
* | | | Modularize get(), async getAvatar, avatars @ usermgmt | kondou | 2013-08-25 | 3 | -2/+14 |
* | | | Add basic avatars and gravatar | kondou | 2013-08-25 | 2 | -0/+50 |
|/ / |
|
* | | Merge branch 'master' into improve_app-management | kondou | 2013-08-21 | 2 | -3/+29 |
|\| |
|
| * | Merge pull request #4447 from owncloud/fix_4351_master | Morris Jobke | 2013-08-20 | 1 | -3/+3 |
| |\ |
|
| | * | Use JSON to send/receive group data. | Owen Winkler | 2013-08-15 | 1 | -3/+3 |
| * | | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 2 | -16/+8 |
| |\ \ |
|
| * | | | working decrypt files method | Bjoern Schiessle | 2013-07-29 | 1 | -1/+9 |
| * | | | user interface to allow user to decrypt all his files once the encryption app... | Björn Schießle | 2013-07-29 | 1 | -0/+18 |
* | | | | Move .errormsg from settings-css to .warning in core. Reusable! | kondou | 2013-08-18 | 1 | -1/+1 |
* | | | | Don't use an alert for displaying app-mgmt-errors | kondou | 2013-08-18 | 1 | -0/+1 |
| |/ /
|/| | |
|
* | | | merge master into css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 1 | -2/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'master' into css_cleanup_kondou | kondou | 2013-07-24 | 3 | -33/+45 |
| |\| |
|
| * | | General CSS cleanup | kondou | 2013-07-09 | 1 | -2/+2 |
* | | | remove table layout for background jobs | Jan-Christoph Borchardt | 2013-07-31 | 1 | -14/+6 |
| |/
|/| |
|
* | | initialize OC_Defaults in template constructorX | Björn Schießle | 2013-07-24 | 2 | -12/+8 |
* | | Merge branch 'master' into more-themable-strings | Thomas Müller | 2013-07-24 | 3 | -16/+26 |
|\ \ |
|
| * \ | Merge branch 'master' into disable-anon-upload-master | Thomas Müller | 2013-07-22 | 2 | -16/+16 |
| |\ \ |
|
| | * | | Use !== and === in settings. | kondou | 2013-07-21 | 2 | -16/+16 |
| * | | | Merge branch 'master' into disable-anon-upload-master | Thomas Müller | 2013-07-22 | 1 | -1/+1 |
| |\| | |
|
| | * | | Use transifex.com on link to translations | rolandgeider | 2013-07-14 | 1 | -1/+1 |
| * | | | Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into di... | Thomas Müller | 2013-07-14 | 1 | -2/+2 |
| |\ \ \ |
|
| | * | | | change anonymous to public | Thomas Mueller | 2013-07-12 | 1 | -2/+2 |
| * | | | | No admin option to enable public upload in case encryption is enabled | Thomas Müller | 2013-07-14 | 1 | -0/+2 |
| |/ / / |
|
| * / / | new admin setting added which allows to turn off anonymous uploads | Thomas Müller | 2013-07-12 | 1 | -1/+9 |
| |/ / |
|
* / / | use themable strings for admin page, simplify admin export, fix rest of #3791 | Jan-Christoph Borchardt | 2013-07-11 | 1 | -9/+15 |
|/ / |
|
* / | Merge https://github.com/owncloud/core/pull/3827 | Björn Schießle | 2013-07-08 | 1 | -1/+1 |
|/ |
|
* | revert changes which where introduced by accident during merge https://github... | Björn Schießle | 2013-07-04 | 1 | -2/+3 |
* | move to non-static OC_Defaults | Björn Schießle | 2013-07-04 | 2 | -6/+6 |
* | Add init funtion to OC_Defaults to be able to wrap translatable strings | Björn Schießle | 2013-07-04 | 2 | -0/+3 |