mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,101 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

105 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt d62b683c6a change 'Display Name' to more understandable 'Full Name', fix #5612 2013-11-06 14:20:43 +01:00
Thomas Müller 148d2616e5 introduce link_to_docs() and migrate links 2013-10-21 21:29:45 +02:00
Frank Karlitschek 7cf81f2d12 show the channel. Also mark git as git channel so that someone can see where this build comes from 2013-10-13 21:51:47 +02:00
raghunayyar 02c7f95687 Includes <optgroup> tag 2013-10-11 18:52:27 +05:30
raghunayyar 7c2f1fd580 Puts the language divider in place. thanks @Kondou-ger ;) 2013-10-11 18:46:59 +05:30
raghunayyar 4b2bb11716 Removes the Bogus Label 2013-10-11 18:42:02 +05:30
raghunayyar e27bb660bd Uniform Styles and Indentation Fixes for Personal Block 2013-10-11 18:03:53 +05:30
Jan-Christoph Borchardt 2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
kondou 1832eb8872 Pass view in \OC_Avatar to constructor and use $_ for enable_avatars 2013-09-09 16:57:46 +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 4724d60ecd Partly fix cropper in IE8 and don't use a dialog for it 2013-09-03 17:40:41 +02:00
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
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 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
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
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
rolandgeider 995feea42a Use transifex.com on link to translations 2013-07-14 11:54:39 +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 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:56 2013 +0200

    Merge branch 'master' into better-messages

commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:41 2013 +0200

    move to non-static defaults.php

commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 2 10:32:13 2013 +0200

    no sprintf here, lets t() handle it

commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:13:38 2013 +0200

    Merge branch 'master' into better-messages

commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:10:57 2013 +0200

    use document base url from defaults.php

commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:00:15 2013 +0200

    Merge branch 'master' into better-messages

commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:21:12 2013 +0200

    link to docs in WebDAV message, ref #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 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
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
Björn Schießle 7889f2ef5c Merge pull request #3687 from owncloud/template_updates 
Make templates aware of different owncloud editions
 2013-06-13 07:32:41 -07:00
Björn Schießle 63472aed3f Merge branch 'template_updates' of github.com:owncloud/core into template_updates 2013-06-12 17:26:38 +02:00
Björn Schießle 2e1836c1da don't show translation hints in enterprise edition 2013-06-12 17:07:43 +02:00
Jan-Christoph Borchardt f565e4c25b move common settings footer fieldset out of conditional 2013-06-12 16:59:23 +02:00
Björn Schießle e1e798c623 make footer and urls aware of ownCloud editions 2013-06-12 15:44:11 +02:00
Jan-Christoph Borchardt b014509f41 move storage bar below clients showcase to make it more visible 2013-06-11 16:05:02 +02:00
zafi f314eb8f72 The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD 
so it should only be visible for users with a supporting backend.
 2013-05-25 09:03:07 +02:00
Björn Schießle 9d1e60325c allow admin to recover users files in case of password lost 2013-05-16 14:53:04 +02:00
Björn Schießle 135991474b fix inconsistent post parameters in change password operation 2013-05-08 12:38:09 +02:00
Bart Visscher d825669265 Merge pull request #3002 from owncloud/priorize_common_languages 
Priorize common languages.
 2013-04-26 06:30:59 -07:00