Commit Graph

1229 Commits

Author SHA1 Message Date
Jenkins for ownCloud 2d12e52769 [tx-robot] updated from transifex 2013-09-24 12:59:48 -04:00
Thomas Müller 40871bab88 Merge pull request #4930 from owncloud/fix-apps-settings
Fix the apps enabling/disabling in settings
2013-09-24 01:02:50 -07:00
Jenkins for ownCloud 28918d61d2 [tx-robot] updated from transifex 2013-09-22 12:58:42 -04:00
Bart Visscher 45a7b0dbac Fix the apps enabling/disabling in settings 2013-09-20 20:29:15 +02:00
Jenkins for ownCloud 5b95e7aa0f [tx-robot] updated from transifex 2013-09-20 10:50:14 -04:00
Thomas Müller de8d0783ed fixing syntax error - it it that hard to test own code? 2013-09-18 23:46:58 +02:00
Jenkins for ownCloud 6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Bart Visscher 817b8d151b Merge pull request #4745 from owncloud/split_personal-user_passwordchange
Split personal and user-mgmt password change logic
2013-09-18 07:53:11 -07:00
kondou 18a2c48ceb Translate errormsgs in settings/changepassword/controller 2013-09-18 16:47:27 +02:00
Bernhard Posselt a58e176852 Merge pull request #4506 from owncloud/oc_avatars
OC Avatars
2013-09-14 16:00:36 -07:00
Jenkins for ownCloud 556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
kondou 18da2f9cf7 Improve changepassword route naming 2013-09-13 17:07:23 +02:00
kondou 306a8681c5 Move ajax/changepassword to changepassword/controller to use autoloading 2013-09-13 17:03:13 +02:00
ringmaster 3790cbb493 Allow numeric group names 2013-09-13 09:06:20 -04:00
kondou c9c5e1b97f Merge branch 'master' into oc_avatars 2013-09-12 07:41:44 +02:00
kondou 2ae3ab98d8 Merge branch 'master' into split_personal-user_passwordchange 2013-09-11 16:35:55 +02:00
kondou f6faec0e0b Use a controller instead of two files for changepassword.php 2013-09-11 16:35:13 +02:00
Jenkins for ownCloud 72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
kondou 1832eb8872 Pass view in \OC_Avatar to constructor and use $_ for enable_avatars 2013-09-09 16:57:46 +02:00
Jenkins for ownCloud 92f6c3bb10 [tx-robot] updated from transifex 2013-09-08 21:37:53 -04:00
kondou 4963a5b30f Fix language selection; Fix #4756 2013-09-07 16:28:51 +02:00
Jenkins for ownCloud e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
kondou 4aa84047fe Remove $recoveryPassword from changepersonalpassword & fix indent 2013-09-06 17:05:10 +02:00
kondou d18a070a03 Have the "notsquare" error as data, not as message 2013-09-06 13:46:50 +02:00
kondou a21376480d Split personal and user-mgmt password change logic 2013-09-06 08:05:07 +02:00
kondou 3774632ecc Clean up avatars and preliminary use JSON->rawlist.php 2013-09-05 23:12:52 +02:00
kondou 15ab798353 Fix an IE8 bug with the avatarcropper.
1. Crop an avatar
2. Crop another avatar without reloading
-> Second cropper is 28px x 30px big
2013-09-05 19:26:02 +02:00
Jenkins for ownCloud 0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
kondou 6db96603a0 Have login-checks and CSRF checks 2013-09-05 00:04:31 +02:00
kondou fca5db748b Remove backgroundcolor on updating avatar, and add a missing parameter 2013-09-04 13:16:21 +02:00
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
kondou e7e3f1b81a Fix some of @jancborchardt's complaints in oc_avatars 2013-09-02 17:07:38 +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
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