Bart Visscher
45a7b0dbac
Fix the apps enabling/disabling in settings
2013-09-20 20:29:15 +02: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
Bernhard Posselt
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
kondou
18da2f9cf7
Improve changepassword route naming
2013-09-13 17:07:23 +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
4963a5b30f
Fix language selection; Fix #4756
2013-09-07 16:28:51 +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
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
a1e7614d73
Clean up oc_avatars
2013-09-04 12:56:14 +02: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
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
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
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
Jan-Christoph Borchardt
1e834c57a4
fix issues caused by introduction of sticky Apps management footer
2013-08-30 13:46:10 +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
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
8d8a57de7f
Continue work on cropper
2013-08-28 16:39:00 +02:00
kondou
31736a1df3
Have a controller instead ofo avatar.php and fix some cropper-design
2013-08-26 16:46:55 +02: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
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
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
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
kondou
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
Christopher
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07: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
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
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
