| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | more elegant style for Personal and Admin settings | Jan-Christoph Borchardt | 2013-10-05 | 2 | -19/+19 |
| | | |||||
| * | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-16 | 2 | -0/+27 |
| |\ | | | | | | | | | Conflicts: apps/files/index.php | ||||
| | * | 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 |
| | | | | | | | | | | | | | 1. Crop an avatar 2. Crop another avatar without reloading -> Second cropper is 28px x 30px big | ||||
| | * | 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 |
| | |\ | | | | | | | | | | | | | Conflicts: 3rdparty | ||||
| | * | | 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 ↵ | kondou | 2013-08-25 | 3 | -47/+7 |
| | | | | | | | | | | | | | even more and reword some stuff | ||||
| | * | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Don't use gravatars default avatars - Use "profile image" instead of "avatar" - Use <p> instead of tables - Ease updateAvatar() - Actually return something in \OCP\Avatar | ||||
| | * | | 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 |
| | | | | | | | | | | | | | And other small improvements | ||||
| | * | | Add basic avatars and gravatar | kondou | 2013-08-25 | 2 | -0/+50 |
| | | | | |||||
| * | | | use css class hidden to hide setting elements | Bjoern Schiessle | 2013-09-02 | 1 | -5/+5 |
| | | | | |||||
| * | | | enable user to inform recipients about a shared file by mail | Bjoern Schiessle | 2013-08-30 | 1 | -1/+9 |
| | |/ |/| | |||||
| * | | 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 | ||||
| | * | Use personal-password for the password name in personal.php | kondou | 2013-08-24 | 1 | -1/+1 |
| | | | | | | | | | Fix #4491 | ||||
| * | | Merge branch 'master' into improve_app-management | kondou | 2013-08-21 | 2 | -3/+29 |
| |\| | | | | | | | | | Conflicts: settings/js/apps.js | ||||
| | * | Merge pull request #4447 from owncloud/fix_4351_master | Morris Jobke | 2013-08-20 | 1 | -3/+3 |
| | |\ | | | | | | | Use JSON to send/receive group data. | ||||
| | | * | Use JSON to send/receive group data. | Owen Winkler | 2013-08-15 | 1 | -3/+3 |
| | | | | | | | | | | | | | Squashed commits from PR #4364 for master. | ||||
| | * | | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 2 | -16/+8 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | ||||
| | * | | | 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 ↵ | Björn Schießle | 2013-07-29 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app was disabled Conflicts: settings/templates/personal.php | ||||
| * | | | | 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 |
| | |/ / |/| | | | | | | | | | | | | | | Rather display a dominant div and mark the problematic app in the applist. Fix #305 | ||||
| * | | | 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 |
| | |\| | | | | | | | | | | | | | | | | Conflicts: core/css/styles.css settings/templates/personal.php | ||||
| | * | | 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 |
| |\ \ | | | | | | | | | | | | | Conflicts: lib/template.php | ||||
| | * \ | Merge branch 'master' into disable-anon-upload-master | Thomas Müller | 2013-07-22 | 2 | -16/+16 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: settings/templates/admin.php | ||||
| | | * | | 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 ↵ | Thomas Müller | 2013-07-14 | 1 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | disable-anon-upload-master | ||||
| | | * | | | 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 |
| | |/ / / | | | | | | | | | | | | | No upload on pubic page if public upload is disabled | ||||
| | * / / | 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 |
| |/ / | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |