| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into oc_avatars | kondou | 2013-08-28 | 61 | -287/+168 |
| |\ | | | | | | | | | Conflicts: 3rdparty | ||||
| | * | Merge pull request #4563 from owncloud/use_personal-password | Jan-Christoph Borchardt | 2013-08-28 | 2 | -2/+2 |
| | |\ | | | | | | | Use personal-password for the password name in personal.php | ||||
| | | * | Use personal-password for the password name in personal.php | kondou | 2013-08-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | Fix #4491 | ||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-28 | 4 | -0/+19 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-27 | 11 | -5/+34 |
| | | | | |||||
| | * | | Merge pull request #4586 from owncloud/fixing-3431-master | Morris Jobke | 2013-08-27 | 1 | -118/+0 |
| | |\ \ | | | | | | | | | kill zh_CN.GB2312 | ||||
| | | * | | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 1 | -118/+0 |
| | | | | | |||||
| | * | | | storage information is path specific | Thomas Müller | 2013-08-27 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-25 | 58 | -163/+114 |
| | | | | |||||
| * | | | Continue work on cropper | kondou | 2013-08-28 | 1 | -2/+3 |
| | | | | |||||
| * | | | Clean up some cruft | kondou | 2013-08-26 | 2 | -4/+0 |
| | | | | |||||
| * | | | Have a controller instead ofo avatar.php and fix some cropper-design | kondou | 2013-08-26 | 3 | -12/+19 |
| | | | | |||||
| * | | | Use Jcrop, have inline errormsg, work on cropping, clean up, WIP | kondou | 2013-08-25 | 4 | -13/+54 |
| | | | | |||||
| * | | | Remove gravatar and no-avatar functionality, prepare for default avatars ↵ | kondou | 2013-08-25 | 8 | -71/+8 |
| | | | | | | | | | | | | | even more and reword some stuff | ||||
| * | | | Integrate newavatar.php into avatar.php by using GET, POST & DELETE | kondou | 2013-08-25 | 4 | -39/+9 |
| | | | | |||||
| * | | | 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 | 4 | -41/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | 2 | -1/+6 |
| | | | | |||||
| * | | | Refactor newavatar.php and show (for now) an alert on problems when setting ↵ | kondou | 2013-08-25 | 2 | -22/+33 |
| | | | | | | | | | | | | | new avatars | ||||
| * | | | 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 | 2 | -5/+3 |
| | | | | |||||
| * | | | Improve styling & enable avatar-upload at personal page | kondou | 2013-08-25 | 6 | -18/+34 |
| | | | | |||||
| * | | | Load avatar from path, if one's provided | kondou | 2013-08-25 | 1 | -7/+3 |
| | | | | |||||
| * | | | Add unittests & check filetype in setLocalAvatar() | kondou | 2013-08-25 | 1 | -6/+4 |
| | | | | | | | | | | | | | TODO: Fix OC_Image->mimetype(), it always returns "image/png" | ||||
| * | | | Modularize get(), async getAvatar, avatars @ usermgmt | kondou | 2013-08-25 | 7 | -2/+71 |
| | | | | | | | | | | | | | And other small improvements | ||||
| * | | | Add basic avatars and gravatar | kondou | 2013-08-25 | 7 | -0/+72 |
| |/ / | |||||
| * | | Merge pull request #4331 from owncloud/improve_app-management | Christopher | 2013-08-25 | 4 | -22/+54 |
| |\ \ | |/ |/| | Improve app-management | ||||
| | * | Merge branch 'master' into improve_app-management | kondou | 2013-08-21 | 70 | -34/+282 |
| | |\ | | | | | | | | | | | | | Conflicts: settings/js/apps.js | ||||
| | * | | Move .errormsg from settings-css to .warning in core. Reusable! | kondou | 2013-08-18 | 3 | -14/+6 |
| | | | | |||||
| | * | | Use appitem instead of always recreating a jquery object | kondou | 2013-08-18 | 1 | -15/+13 |
| | | | | | | | | | | | | | Also fix some wrong data storages | ||||
| | * | | Don't use an alert for displaying app-mgmt-errors | kondou | 2013-08-18 | 3 | -10/+44 |
| | | | | | | | | | | | | | | | | | | | Rather display a dominant div and mark the problematic app in the applist. Fix #305 | ||||
| | * | | Merge branch 'master' into improve_app-management | kondou | 2013-08-18 | 10 | -36/+47 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into improve_app-management | kondou | 2013-08-09 | 75 | -76/+348 |
| | |\ \ \ | |||||
| | * | | | | Log exception at the catching code | kondou | 2013-08-09 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Improve app-management | kondou | 2013-08-06 | 2 | -11/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Better error messages - Translate untranslated strings Basically picks non-app-dependency related stuff from #4017 | ||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-23 | 3 | -0/+18 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-22 | 5 | -1/+16 |
| | |_|_|/ |/| | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-21 | 25 | -0/+65 |
| | | | | | |||||
| * | | | | Merge pull request #4262 from owncloud/fix_jslint_kondou | Christopher | 2013-08-20 | 4 | -7/+10 |
| |\ \ \ \ | | | | | | | | | | | Fix some JSLint warnings | ||||
| | * \ \ \ | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 81 | -129/+441 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| | * | | | | Fix a syntax error & have if-conds in an own line | kondou | 2013-08-01 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Fix some JSLint warnings | kondou | 2013-07-31 | 4 | -7/+8 |
| | | | | | | |||||
| * | | | | | Merge pull request #4447 from owncloud/fix_4351_master | Morris Jobke | 2013-08-20 | 4 | -22/+29 |
| |\ \ \ \ \ | | | | | | | | | | | | | Use JSON to send/receive group data. | ||||
| | * | | | | | Break long lines into smaller ones. | Owen Winkler | 2013-08-18 | 1 | -3/+10 |
| | | | | | | | |||||
| | * | | | | | Use JSON to send/receive group data. | Owen Winkler | 2013-08-15 | 4 | -22/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commits from PR #4364 for master. | ||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 35 | -0/+62 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 5 | -0/+111 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Enable user to decrypt files again after encryption app was disabled | ||||
| | * \ \ \ \ \ | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 81 | -122/+464 |
| | |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | ||||
| | * | | | | | | check if some encrypted files are left after the app was disabled and warn ↵ | Bjoern Schiessle | 2013-08-12 | 1 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the user | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |