Commit Graph

2290 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) 8f2e522735 Merge branch 'wip-MDL-48978-master' of git://github.com/marinaglancy/moodle 2015-01-28 11:58:50 +01:00
Marina Glancy 17d33eec66 MDL-48978 user: fixed regression from MDL-37704 2015-01-28 16:47:50 +08:00
Andrew Nicols 06c2753115 MDL-48542 user_menu: Handle invalid strings better 2015-01-28 15:39:15 +08:00
Andrew Nicols 0977d3d404 Merge branch 'MDL-48542-master' of git://github.com/jethac/moodle 2015-01-28 12:02:28 +08:00
Jetha Chan 22893d6f47 MDL-48542 user_menu: add proper divider support
Added divider support to the user menu; hardened the custom user menu against invalid input.
2015-01-19 23:58:11 +08:00
Dan Poltawski 947ab40bf2 MDL-46976 user: trim whitespace from input email address
Don't complain about invalid email address, we are a computer, we
love the jobs users hate.

ref: https://www.youtube.com/watch?v=5tquSbZEP-g
2015-01-14 17:13:15 +00:00
Eloy Lafuente (stronk7) a158a85668 Merge branch 'MDL-32088-master' of git://github.com/danpoltawski/moodle 2015-01-07 02:11:41 +01:00
Vishal Raheja 1e72465c17 MDL-32088 user: Correct the Moodle docs link
This patch links the moodle docs link to user profile Moodle doc when
the user sees the user profile for a particular course. The page is set
to course view type to load course specific blocks. So, we use
set_docs_path to change the Moodle docs link instead of changing the
pagetype.
2014-12-30 13:44:37 +00:00
Andrew Davis 7120494ea1 MDL-48441 core_user: profile.php, view.php now handle guests the same 2014-12-22 09:26:59 +01:00
Marina Glancy 5d9204af46 MDL-48569 profile: behat test for user full profile access 2014-12-12 10:20:10 +08:00
Marina Glancy 0366b6fa72 MDL-48569 profile: show link to full profile if anybody can see it 2014-12-12 10:20:06 +08:00
Dan Poltawski 29a9a28e57 Merge branch 'MDL-14908-master' of git://github.com/FMCorz/moodle 2014-12-08 13:22:16 +00:00
Sam Hemelryk 922d32371a Merge branch 'MDL-37704-master' of git://github.com/ankitagarwal/moodle 2014-12-08 14:50:53 +13:00
Sam Hemelryk 6c4e70a6d8 Merge branch 'wip_MDL-47830_m29_pwrotation' of https://github.com/skodak/moodle 2014-12-04 12:03:15 +00:00
Ankit Agarwal 5bc886259b MDL-37704 user_profile: Make sure description field can be locked
Thanks JD for the initial patch.
2014-12-02 09:40:09 +05:30
Frederic Massart fbd846bebc MDL-14908 user: Parents are not restricted when separated groups is used 2014-12-01 15:14:26 +08:00
Petr Skoda 1d658535b6 MDL-47830 auth: Add pw rotation restrictions 2014-12-01 08:53:52 +13:00
Andrew Nicols 64e7aa4de1 MDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string 2014-12-01 08:32:04 +13:00
Dan Poltawski eb0acfa311 Merge branch 'wip_MDL-47800_m28_pwchange2' of git://github.com/skodak/moodle 2014-11-18 16:32:57 +00:00
Sam Hemelryk 2f365ee4aa Merge branch 'wip-MDL-43205-master' of git://github.com/abgreeve/moodle 2014-11-18 16:48:27 +13:00
Petr Skoda 866f03de46 MDL-47800 auth: Add option to logout on pw change 2014-11-18 09:51:52 +13:00
Sam Hemelryk 2611dd99d3 MDL-48196 phpunit: fixed the fail after this change 2014-11-17 15:07:15 +13:00
Brent Boghosian f1c0061daa MDL-43205 user profile fields: Menu multi-lang improvements.
Improve custom user profile multi-language menu options
support, so that it is not set to a specific language.
2014-11-10 13:46:39 +08:00
James Ballard 91325ff616 MDL-47391 Update pagelayout for default profile configuration 2014-11-10 09:23:45 +11:00
Damyon Wiese 419d1abdad MDL-48091 users: Revert "MDL-42875 users: Show only profile visible..."
This reverts commit a09a837f20.
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