Commit Graph

1252 Commits

Author SHA1 Message Date
kondou 820fd42161 Merge branch 'master' into oc_avatars 2013-09-04 12:56:40 +02:00
kondou a1e7614d73 Clean up oc_avatars 2013-09-04 12:56:14 +02:00
Morris Jobke 09187f3b3b Merge pull request #4449 from owncloud/clean_up_util
Clean up \OC\Util
2013-09-03 22:53:03 -07:00
kondou 32a7ba9823 Don't update avatar on displayNameChange anymore 2013-09-04 07:13:09 +02:00
kondou 6d42f51d0c Fix unwanted caching in IE8 2013-09-03 18:34:40 +02:00
kondou 4724d60ecd Partly fix cropper in IE8 and don't use a dialog for it 2013-09-03 17:40:41 +02:00
Jenkins for ownCloud fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
kondou 65413a95dc Merge branch 'master' into oc_avatars
Conflicts:
	config/config.sample.php
2013-09-03 04:43:11 +02:00
Bjoern Schiessle 3ce4bf5ec7 use css class hidden to hide setting elements 2013-09-02 17:14:11 +02:00
kondou e7e3f1b81a Fix some of @jancborchardt's complaints in oc_avatars 2013-09-02 17:07:38 +02:00
Bjoern Schiessle b918c06be6 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/util.php
2013-09-02 14:41:46 +02:00
Morris Jobke 91c0923cce Merge pull request #4663 from owncloud/fix-sticky-apps
fix issues caused by introduction of sticky Apps management footer
2013-09-02 01:11:09 -07:00
kondou e5fc7b9dbe Merge branch 'master' into clean_up_util
Conflicts:
	lib/base.php
2013-09-02 07:58:06 +02:00
Jenkins for ownCloud e68b5f8b0d [tx-robot] updated from transifex 2013-09-01 13:30:40 -04:00
kondou c95d4cafa9 Fix @tanghus's complains in avatars and clean up cropper after closing with "x" 2013-09-01 19:12:54 +02:00
kondou 76b1b5b6a3 Provide 'enable_avatars' in config.php, to disable avatars 2013-09-01 18:17:14 +02:00
kondou aa88eea9cf Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname 2013-08-31 18:27:28 +02:00
kondou 5d653753bd Merge branch 'master' into oc_avatars 2013-08-31 12:56:36 +02:00
Jenkins for ownCloud dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
Bjoern Schiessle 77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
Jan-Christoph Borchardt 1e834c57a4 fix issues caused by introduction of sticky Apps management footer 2013-08-30 13:46:10 +02:00
kondou 80e10f01c4 Clean up 2013-08-30 13:16:13 +02:00
kondou ecf187393b Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests 2013-08-30 09:00:37 +02:00
kondou c533b80682 Use OC_Cache and finish cropper functionality 2013-08-29 16:56:32 +02:00
kondou 0c708be76b Use defaultavatars 2013-08-29 14:26:11 +02:00
kondou e66113f50d Include placeholder.js 2013-08-28 23:23:17 +02:00
Thomas Müller 1d04843ef0 no duplicate declaration of appLicense + camelCase 2013-08-28 22:42:43 +02:00
kondou 6c7efd5dac Work around #4630 to fix license showing 2013-08-28 22:12:01 +02:00
kondou bdf48a6daa Use OC.Router.generate, TODO use cache, prepare for defaultavatars 2013-08-28 21:20:28 +02:00
kondou 67c5be9f19 Merge branch 'master' into oc_avatars
Conflicts:
	3rdparty
2013-08-28 16:44:11 +02:00
kondou 8d8a57de7f Continue work on cropper 2013-08-28 16:39:00 +02:00
Jan-Christoph Borchardt 0c02e1efef Merge pull request #4563 from owncloud/use_personal-password
Use personal-password for the password name in personal.php
2013-08-28 06:23:13 -07:00
Jenkins for ownCloud 3e7ddbc9d9 [tx-robot] updated from transifex 2013-08-28 06:24:14 -04:00
Jenkins for ownCloud d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04:00
Morris Jobke ea446544ef Merge pull request #4586 from owncloud/fixing-3431-master
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
Thomas Müller c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Thomas Müller 8cf9336bcb storage information is path specific 2013-08-27 00:59:58 +02:00
kondou e6473e6d49 Clean up some cruft 2013-08-26 17:41:19 +02:00
kondou 31736a1df3 Have a controller instead ofo avatar.php and fix some cropper-design 2013-08-26 16:46:55 +02:00
Jenkins for ownCloud d587146a5a [tx-robot] updated from transifex 2013-08-25 19:21:52 -04:00
kondou 9a8908b643 Use Jcrop, have inline errormsg, work on cropping, clean up, WIP 2013-08-25 21:06:44 +02:00
kondou 81cadd5ea3 Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff 2013-08-25 21:06:02 +02:00
kondou 0a4febf1eb Integrate newavatar.php into avatar.php by using GET, POST & DELETE 2013-08-25 21:06:01 +02:00
kondou cd2f7bdaef Deny access for non-users and add a (not-working) override button 2013-08-25 21:06:01 +02:00
kondou 9c12da6a94 Several improvements
- 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
2013-08-25 21:05:40 +02:00
kondou d7e6c77e20 Have a fancy uploadavatar button 2013-08-25 21:05:40 +02:00
kondou 9500109349 Refactor newavatar.php and show (for now) an alert on problems when setting new avatars 2013-08-25 21:05:40 +02:00
kondou 33827d690e Use avatar.php in user-management 2013-08-25 21:05:38 +02:00
kondou 131d0edab6 Show avatar on personal.php always (except if avatars are disabled) 2013-08-25 21:04:49 +02:00
kondou 4521b54c67 Have /avatar.php as a central avatar-point 2013-08-25 21:04:49 +02:00
kondou 252548c62c Improve styling & enable avatar-upload at personal page 2013-08-25 21:04:45 +02:00
kondou a58d270684 Load avatar from path, if one's provided 2013-08-25 21:04:09 +02:00
kondou 2bfe662235 Add unittests & check filetype in setLocalAvatar()
TODO: Fix OC_Image->mimetype(), it always returns "image/png"
2013-08-25 21:04:09 +02:00
kondou fac671b14e Modularize get(), async getAvatar, avatars @ usermgmt
And other small improvements
2013-08-25 21:04:04 +02:00
kondou 4a08f7d710 Add basic avatars and gravatar 2013-08-25 21:02:43 +02:00
Christopher b8965c6107 Merge pull request #4331 from owncloud/improve_app-management
Improve app-management
2013-08-25 11:56:56 -07:00
kondou fbe7a68ce8 Use personal-password for the password name in personal.php
Fix #4491
2013-08-24 14:31:32 +02:00
Jenkins for ownCloud 596ac40b7f [tx-robot] updated from transifex 2013-08-23 20:17:08 -04:00
Jenkins for ownCloud 02b2b5a808 [tx-robot] updated from transifex 2013-08-22 10:37:23 -04:00
kondou 0ce35af02a Merge branch 'master' into improve_app-management
Conflicts:
	settings/js/apps.js
2013-08-21 19:20:25 +02:00
Jenkins for ownCloud a89199cc7b [tx-robot] updated from transifex 2013-08-21 08:14:27 -04:00
Christopher 90da518e3e Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
kondou f1518a54df Merge branch 'master' into clean_up_util
Conflicts:
	lib/util.php
2013-08-20 17:20:30 +02:00
Morris Jobke de949b1caa Merge pull request #4447 from owncloud/fix_4351_master
Use JSON to send/receive group data.
2013-08-20 02:49:48 -07:00
Jenkins for ownCloud e9644c2f52 [tx-robot] updated from transifex 2013-08-19 15:14:38 -04:00
Björn Schießle 9be836814c Merge pull request #4239 from owncloud/decrypt_files_again
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
kondou 7c296a6cf9 Move .errormsg from settings-css to .warning in core. Reusable! 2013-08-18 17:37:22 +02:00
Kondou c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
kondou db424cc86b Use appitem instead of always recreating a jquery object
Also fix some wrong data storages
2013-08-18 14:49:11 +02:00
kondou 9f4bd7cb47 Don't use an alert for displaying app-mgmt-errors
Rather display a dominant div and mark the problematic app in the applist.

Fix #305
2013-08-18 13:49:34 +02:00
kondou c741a25eaa Merge branch 'master' into improve_app-management 2013-08-18 12:15:22 +02:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Owen Winkler 9840363488 Break long lines into smaller ones. 2013-08-18 05:03:20 -04:00
kondou 65d802329f Fix some naming and spacing in lib/util.php 2013-08-18 10:33:09 +02:00
kondou edd92e4c09 Merge branch 'master' into fix_jslint_kondou
Conflicts:
	apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
Andreas Fischer 4f462e9b6f Add trailing comma for all touched array lines. 2013-08-17 23:39:26 +02:00
Andreas Fischer d38929fb10 Fix spacing of all touched lines. 2013-08-17 23:38:26 +02:00
Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again
Conflicts:
	apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Bart Visscher 29b6dd53a0 Compare result are already true/false 2013-08-17 12:58:10 +02:00
Thomas Müller 264ee9df9a Merge pull request #4476 from owncloud/doc-on-master
fix difference between packaged version and master
2013-08-17 03:13:17 -07:00
Thomas Müller de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Morris Jobke 746d32eb05 fix difference between packaged version and master 2013-08-17 10:33:11 +02:00
Jan-Christoph Borchardt 1e8849b04e Merge pull request #4314 from owncloud/css-fixes
Design fixes
2013-08-16 01:05:29 -07:00
Jenkins for ownCloud 6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt 399adf67b0 merge master into css-fixes 2013-08-16 00:29:43 +02:00
kondou 9c5416fe4a Clean up \OC\Util
- Use camelCase

 - Add some phpdoc

 - Fix some indents

 - Use some more spacing
2013-08-15 15:57:32 +02:00
Owen Winkler cd7e57e8ec Use JSON to send/receive group data.
Squashed commits from PR #4364 for master.
2013-08-15 06:19:40 -04:00
Jenkins for ownCloud 9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
Bjoern Schiessle 53bb89824d check if some encrypted files are left after the app was disabled and warn the user 2013-08-12 17:25:27 +02:00
kondou 80e9744da0 Merge branch 'master' into improve_app-management 2013-08-09 18:02:40 +02:00
kondou 605050df9b Log exception at the catching code 2013-08-09 18:01:49 +02:00
Jan-Christoph Borchardt 4c0ec974b9 Merge pull request #4344 from owncloud/appmgmt-in-navigation
show 'More apps' link to app administration directly in app navigation
2013-08-09 08:49:41 -07:00
Jenkins for ownCloud 98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Jan-Christoph Borchardt 8652137ad6 Merge pull request #3912 from owncloud/css_cleanup_kondou
General CSS cleanup
2013-08-08 07:31:01 -07:00
Jan-Christoph Borchardt 31d50288a5 draw attention to the newly added app entry by flashing it twice 2013-08-07 21:54:28 +02:00
Jan-Christoph Borchardt 7a9daa99d1 scroll the app navigation down so the newly added app is seen 2013-08-07 21:53:53 +02:00
Jan-Christoph Borchardt 775f33cc1b prepend the new app before the 'More apps' function 2013-08-07 21:53:25 +02:00
Jan-Christoph Borchardt 367b248bc0 show 'More apps' link to app administration directly in app navigation 2013-08-07 18:18:09 +02:00
Jenkins for ownCloud 0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
kondou 1a4465f41d Improve app-management
- Better error messages

- Translate untranslated strings

Basically picks non-app-dependency related stuff from #4017
2013-08-06 17:19:18 +02:00