mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
83,566 Commits 36 Branches 519 Tags
Commit Graph

2066 Commits

Author SHA1 Message Date
Damyon Wiese
419d1abdad MDL-48091 users: Revert "MDL-42875 users: Show only profile visible..." 
This reverts commit a09a837f20e2e09a19c8120bf71bac794ee68ae6.
 2014-11-07 09:30:42 +08:00
Dan Poltawski
5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle 
Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php
 2014-11-05 12:11:16 +00:00
Dan Poltawski
fb3e9ea25d Merge branch 'MDL-48067-master' of git://github.com/jethac/moodle 2014-11-05 10:15:41 +00:00
Jetha Chan
088fcf90ca MDL-48067 user_menu: allow empty customusermenuitems setting 2014-11-05 14:37:33 +08:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
Sam Hemelryk
f836166a8a MDL-48025 user: fixed typo in user_search HTML 2014-11-03 10:08:03 +13:00
Sam Hemelryk
3ea5ff8941 Merge branch 'MDL-42875_master' of https://github.com/crazyserver/moodle 2014-10-31 10:27:46 +13:00
pau.ferrer-ocana
a09a837f20 MDL-42875 users: Show only profile visible roles on participants list 2014-10-29 11:24:19 +01:00
Jetha Chan
b865a3e2d1 MDL-47559 user_menu: customusermenu setting 2014-10-27 20:04:45 +08:00
Damyon Wiese
0b9635cba4 Merge branch '46499-28' of git://github.com/samhemelryk/moodle 2014-10-24 11:48:24 +02:00
Dave Cooper
368f0bf8f6 MDL-47689 user: Add duplicate field check to avoid oracle db error. 2014-10-24 11:48:10 +02:00
Petr Skoda
f1cac3d515 MDL-47754 install: fix redirect loop 2014-10-20 12:52:35 +13:00
Sam Hemelryk
30aca4a74b MDL-46499 navigation: better enrolled course limit 
We now user $CFG->navcourselimit to limit the number of
courses shown in the navigation when browsing another users
full profile. Previously it showed all courses which caused
some slowdown.
 2014-10-20 10:58:40 +13:00
Damyon Wiese
8ae6df3798 Merge branch 'MDL-47667' of git://github.com/timhunt/moodle 2014-10-16 13:00:22 +08:00
Tim Hunt
01e7c3bf4e MDL-47667 profile unit tests: don't assume none by default. 
E.g. if an add-on creates a user profile field on install, the test was
failing.
 2014-10-14 12:09:51 +01:00
Adrian Greeve
c1a27029fe MDL-47617 behat: Fixed behat sorting failure 
Postgres and MySQL treat values that are null differently
when sorting. MySQL will sort null values above fields with
values and Postgres will be vice versa. I removed the checks
against the Admin User.

Oracle treats lower case values different to upper case values
and so I have modified the test so that all Names start with
an Uppercase letter.
 2014-10-14 11:30:01 +08:00
Damyon Wiese
2b187a479e MDL-46921 User: Add @core_user to new behat test. 2014-10-09 11:20:44 +08:00
Damyon Wiese
e6b00f032d Merge branch 'wip-MDL-46921-master' of git://github.com/abgreeve/moodle 2014-10-09 09:57:58 +08:00
Adrian Greeve
28127d8897 MDL-46921 lib: behat tests for alternate name sorting. 2014-10-09 08:19:49 +08:00
Adrian Greeve
143aacaea0 MDL-46921 lib: Add sorting on additional name fields 
A thank you to Yishe Choden for creating a patch for this issue.
 2014-10-09 08:07:44 +08:00
Frederic Massart
dcb59c872c MDL-45893 my: Specifically follow My home from block in Behat tests 2014-10-08 16:59:41 +08:00
Damyon Wiese
0d474cb2b4 Merge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle 2014-10-08 09:53:53 +08:00
Sam Hemelryk
c709fafc6e Merge branch 'MDL-47197-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2014-10-08 11:16:54 +13:00
Dan Poltawski
99675668b4 Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-10-07 16:52:07 +01:00
Andrew Nicols
27f7487f82 MDL-47197 core: Private files handler 
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
 2014-10-07 10:01:19 +08:00
Tony Butler
1e31f11852 MDL-28484 core_lib: Add function for https detection 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-10-03 13:02:29 +01:00
Jetha Chan
6da0e4cfff MDL-45893 user_menu: based on action_menu, new responsive approach 2014-10-03 15:12:59 +08:00
Sam Hemelryk
251089fe44 Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle 2014-10-02 17:30:47 +13:00
Dmitry Nefedov
66b864c797 MDL-47408 user: Add checking before adding blog's link. 
Checking enableblogs  and bloglevel, userid, constant  BLOG_USER_LEVEL.
 2014-10-02 12:17:14 +08:00
Dan Poltawski
76e348d46d Revert "MDL-45893 user_menu: revised based on action_menu" 
Was not yet ready for the prime time.

This reverts commit dc4bff329dc2faf56445effebaa6790e0bc76713.
This reverts commit a535004e5c54689dc664d780b15900e1e6e19f83.
This reverts commit c8398fb95af3533a1945e0b4f45ac939f3044d8d.
This reverts commit d24b8e52d38526bf62612c3569db1d3174613c77.

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
 2014-10-01 08:58:22 +01:00
Jetha Chan
dc4bff329d MDL-45893 user_menu: fix to hide user_pictures from screen readers 2014-09-30 21:18:17 +08:00
Dan Poltawski
d452f49cf9 Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle 2014-09-30 08:29:02 +01:00
Sam Hemelryk
c8398fb95a MDL-45893 user: fixed user menu for guest 2014-09-30 10:25:23 +13:00
Dan Poltawski
f03b612191 Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-09-29 10:30:42 +01:00
Dmitry Nefedov
e2e1c98a7f MDL-47408 user: Add enableblogs checking before adding blog's link. 2014-09-27 15:23:13 +08:00
Dave Cooper
e89682d822 MDL-32275 enrol: Last site access column now shows last course access 2014-09-26 10:51:47 +08:00
Jetha Chan
d24b8e52d3 MDL-45893 user_menu: revised based on action_menu 2014-09-25 13:43:06 +08:00
Andrew Davis
005fa74115 MDL-47238 core_user: added an error message if guests access user profiles and they aren't allowed to 2014-09-22 11:02:54 +08:00
Marina Glancy
ea80c29a2c MDL-47079 user: behat test for deleting users 2014-09-16 09:43:48 +08:00
Shane Elliott
99c9798b32 MDL-46676 profilefield_datetime: Use moodle time API 2014-08-06 16:34:40 +08:00
Sam Hemelryk
6239a2358f Merge branch 'MDL-45041' of git://github.com/jleyva/moodle 2014-07-29 15:47:13 +12:00
Sam Hemelryk
9834bce700 Merge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle 2014-07-28 13:07:27 +12:00
Juan Leyva
a1bacaf13d MDL-45041 Web Service: add_user_device doesn't store entries for different users using the same push key 2014-07-25 10:35:24 +02:00
Michael de Raadt
846abed55f MDL-46427 Course: Correcting dimmed course link class on profile pages. 2014-07-18 15:30:33 +08:00
Sam Hemelryk
6a91c41a49 Merge branch 'wip-MDL-37812-master' of git://github.com/marinaglancy/moodle 2014-07-15 12:07:05 +12:00
Marina Glancy
9f7379e9b4 MDL-37812 user: apply default values for user preferences when creating user 2014-07-08 12:35:44 +08:00
Marina Glancy
747dac69f9 MDL-37812 user: added defaults for user preferences 2014-07-08 12:35:44 +08:00
Marina Glancy
7a0bf1bd1a MDL-37812 user: separate preferences into separate section in editform 2014-07-08 12:35:40 +08:00
Osanda Malith Jayathissa
ce5a785b09 MDL-45683 user: Escaping Skype ID used in profile 2014-07-07 16:05:06 +01:00
Marina Glancy
9dbf62d230 MDL-45760 make sure to check permission before setting header 2014-07-07 15:06:08 +01:00