kondou
e7e3f1b81a
Fix some of @jancborchardt's complaints in oc_avatars
2013-09-02 17:07:38 +02:00
kondou
76b1b5b6a3
Provide 'enable_avatars' in config.php, to disable avatars
2013-09-01 18:17:14 +02:00
kondou
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
kondou
67c5be9f19
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 16:44:11 +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
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
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
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
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
fbe7a68ce8
Use personal-password for the password name in personal.php
...
Fix #4491
2013-08-24 14:31:32 +02:00
kondou
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +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
kondou
7c296a6cf9
Move .errormsg from settings-css to .warning in core. Reusable!
2013-08-18 17:37:22 +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
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
Jan-Christoph Borchardt
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +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
Jan-Christoph Borchardt
8eaa0e7336
remove table layout for background jobs
2013-07-31 10:04:02 +02:00
Bjoern Schiessle
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
Björn Schießle
2c8e5ec84f
user interface to allow user to decrypt all his files once the encryption app was disabled
...
Conflicts:
settings/templates/personal.php
2013-07-29 13:36:06 +02:00
kondou
92af840a51
Merge branch 'master' into css_cleanup_kondou
...
Conflicts:
core/css/styles.css
settings/templates/personal.php
2013-07-24 20:35:00 +02:00
Björn Schießle
75fd6d4fde
initialize OC_Defaults in template constructorX
2013-07-24 11:51:21 +02:00
Thomas Müller
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
Thomas Müller
840e96cda3
Merge branch 'master' into disable-anon-upload-master
...
Conflicts:
settings/templates/admin.php
2013-07-22 11:55:20 +02:00
Thomas Müller
934f2e94a3
Merge branch 'master' into disable-anon-upload-master
2013-07-22 11:36:52 +02:00
kondou
05084e03a0
Use !== and === in settings.
2013-07-21 13:55:25 +02:00
Thomas Müller
2964027cad
Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master
2013-07-14 22:00:42 +02:00
Thomas Müller
79d23463f8
No admin option to enable public upload in case encryption is enabled
...
No upload on pubic page if public upload is disabled
2013-07-14 21:58:08 +02:00
rolandgeider
995feea42a
Use transifex.com on link to translations
2013-07-14 11:54:39 +02:00
Thomas Mueller
7a44d45714
change anonymous to public
2013-07-12 21:34:38 +02:00
Thomas Müller
fc2d538311
new admin setting added which allows to turn off anonymous uploads
2013-07-12 17:03:51 +02:00
Jan-Christoph Borchardt
7741ca0bcc
use themable strings for admin page, simplify admin export, fix rest of #3791
2013-07-11 17:41:36 +02:00
kondou
4818e0062e
General CSS cleanup
2013-07-09 16:08:32 +02:00
Björn Schießle
9b9ea7cd8e
Merge https://github.com/owncloud/core/pull/3827
...
Squashed commit of the following:
commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308fcb5811b7b0e3e6#3791
commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
2013-07-08 10:07:57 +02:00
Björn Schießle
5f2378be5b
revert changes which where introduced by accident during merge 23cc69b816
2013-07-04 12:06:36 +02:00
Björn Schießle
3c691c9ec9
move to non-static OC_Defaults
...
Conflicts:
lib/mail.php
2013-07-04 10:11:16 +02:00
Björn Schießle
d46e62886a
Add init funtion to OC_Defaults to be able to wrap translatable strings
2013-07-04 10:09:28 +02:00
Thomas Müller
a20e9dee89
Merge pull request #3894 from owncloud/ie8_compatibility_fixes
...
Ie8 compatibility fixes
2013-07-01 11:57:29 -07:00
Björn Schießle
87bbdc1ed9
check for updates only in the community edition
2013-07-01 10:46:16 +02:00
Björn Schießle
23cc69b816
construct the foother in defaults.php so that we use always the same footer
...
Conflicts:
settings/templates/admin.php
2013-07-01 10:46:00 +02:00
