Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Clean up | kondou | 2013-08-30 | 1 | -3/+3 |
* | Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests | kondou | 2013-08-30 | 3 | -16/+14 |
* | Use OC_Cache and finish cropper functionality | kondou | 2013-08-29 | 2 | -31/+9 |
* | Use defaultavatars | kondou | 2013-08-29 | 5 | -3/+50 |
* | Merge branch 'master' into oc_avatars | kondou | 2013-08-28 | 2 | -0/+66 |
|\ | |||||
| * | Merge pull request #4618 from owncloud/visualize-js | Morris Jobke | 2013-08-28 | 1 | -0/+65 |
| |\ | |||||
| | * | fixing typo | Thomas Müller | 2013-08-28 | 1 | -1/+1 |
| | * | calculate fontsize and line-height | Morris Jobke | 2013-08-28 | 1 | -2/+7 |
| | * | reviewers comments | Morris Jobke | 2013-08-28 | 1 | -6/+14 |
| | * | add visualize | Morris Jobke | 2013-08-28 | 1 | -0/+52 |
| * | | Merge pull request #4627 from owncloud/trashbin-tipsy | Morris Jobke | 2013-08-28 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | change orientation for delete tooltip to left, fix #4589 | Jan-Christoph Borchardt | 2013-08-28 | 1 | -0/+1 |
* | | | Use OC.Router.generate, TODO use cache, prepare for defaultavatars | kondou | 2013-08-28 | 1 | -1/+1 |
* | | | Merge branch 'master' into oc_avatars | kondou | 2013-08-28 | 20 | -191/+115 |
|\| | | |||||
| * | | fix shadow style of username input box | Jan-Christoph Borchardt | 2013-08-28 | 1 | -3/+3 |
| * | | remove show password toggle from log in page, ref #4577 #4580 | Jan-Christoph Borchardt | 2013-08-28 | 2 | -4/+1 |
| |/ | |||||
| * | Merge pull request #4434 from owncloud/fix_octemplate_escaping | Thomas Tanghus | 2013-08-28 | 1 | -4/+5 |
| |\ | |||||
| | * | Cache Object.keys(this.vars) | Thomas Tanghus | 2013-08-28 | 1 | -3/+4 |
| | * | Fix octemplate string escaping. | Thomas Tanghus | 2013-08-14 | 1 | -4/+4 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-28 | 7 | -4/+47 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-27 | 4 | -15/+22 |
| * | | Merge pull request #4586 from owncloud/fixing-3431-master | Morris Jobke | 2013-08-27 | 1 | -140/+0 |
| |\ \ | |||||
| | * | | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 1 | -140/+0 |
| * | | | adding translations to update events | Thomas Müller | 2013-08-27 | 1 | -12/+13 |
| |/ / | |||||
| * | | Merge pull request #4281 from owncloud/ie8-multiselect | Morris Jobke | 2013-08-26 | 1 | -0/+7 |
| |\ \ | |||||
| | * | | Better ie8 multiselect | Victor Dubiniuk | 2013-08-01 | 1 | -0/+7 |
| * | | | Merge pull request #4519 from owncloud/style-fixes | Morris Jobke | 2013-08-26 | 1 | -1/+5 |
| |\ \ \ | |||||
| | * | | | fix reviewers concerns | Morris Jobke | 2013-08-26 | 1 | -1/+1 |
| | * | | | fix minor style issue in the app navigation | Morris Jobke | 2013-08-19 | 1 | -1/+5 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-25 | 2 | -8/+12 |
* | | | | | Continue work on cropper | kondou | 2013-08-28 | 2 | -12/+62 |
* | | | | | Translate "Permission denied" & use class-autoloader | kondou | 2013-08-27 | 2 | -8/+8 |
* | | | | | Clean up some cruft | kondou | 2013-08-26 | 1 | -1/+1 |
* | | | | | Have a controller instead ofo avatar.php and fix some cropper-design | kondou | 2013-08-26 | 2 | -0/+108 |
* | | | | | Remove gravatar and no-avatar functionality, prepare for default avatars even... | kondou | 2013-08-25 | 1 | -0/+0 |
* | | | | | Have /avatar.php as a central avatar-point | kondou | 2013-08-25 | 2 | -17/+0 |
* | | | | | Improve styling & enable avatar-upload at personal page | kondou | 2013-08-25 | 2 | -1/+8 |
* | | | | | Modularize get(), async getAvatar, avatars @ usermgmt | kondou | 2013-08-25 | 3 | -0/+18 |
* | | | | | Add basic avatars and gravatar | kondou | 2013-08-25 | 2 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #4331 from owncloud/improve_app-management | Christopher | 2013-08-25 | 1 | -1/+11 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into improve_app-management | kondou | 2013-08-21 | 88 | -285/+129 |
| |\ \ \ \ | |||||
| * | | | | | Move .errormsg from settings-css to .warning in core. Reusable! | kondou | 2013-08-18 | 1 | -1/+11 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-23 | 1 | -4/+10 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-22 | 2 | -8/+11 |
| |/ / / / |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-21 | 1 | -4/+6 |
* | | | | | Merge pull request #4262 from owncloud/fix_jslint_kondou | Christopher | 2013-08-20 | 9 | -38/+52 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 102 | -617/+1122 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix a syntax error & have if-conds in an own line | kondou | 2013-08-01 | 1 | -7/+21 |
| * | | | | | | Fix some JSLint warnings | kondou | 2013-07-31 | 9 | -38/+38 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 68 | -236/+63 |
| |_|_|/ / / |/| | | | | |