mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 02:53:29 +01:00
Code Issues Projects Releases Wiki Activity
72,311 Commits 36 Branches 527 Tags
Commit Graph

1796 Commits

Author SHA1 Message Date
sam marshall
abdbfc76fc MDL-45469 Conditional availability: Restrict by text area broken 
It has never worked, because the data for text area fields is not
loaded into the $USER object.

Changing it so that the dropdown list does not include these types
of field.
 2014-05-19 11:37:51 +01:00
Mark Nelson
99627fb3d1 MDL-45607 events: changed the context passed to the user_profile_viewed event 2014-05-18 20:54:13 -07:00
Marina Glancy
88de944a21 MDL-34914 cohorts: more understandable filter of user list by cohort 2014-05-16 17:09:07 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release 
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
 2014-05-09 02:12:28 +02:00
Dan Poltawski
917ceadbd7 Merge branch 'wip-MDL-45319-master' of git://github.com/marinaglancy/moodle 2014-05-07 17:51:31 +08:00
Mark Nelson
f1e0f66ca8 MDL-45319 events: set the relateduserid when triggering the user_created/updated/deleted events 2014-05-07 16:28:59 +08:00
Andrew Davis
f624f56999 MDL-45282 core_user: fixed up some oddities in the bulk user messaging screen 2014-05-07 15:34:29 +08:00
Mark Nelson
02a5a4b2ff MDL-43557 events: fixed minor issues in existing events 2014-04-29 19:16:11 -07:00
Petr Skoda
cd25119e34 MDL-45203 implement new event user_password_updated 2014-04-23 09:51:57 +08:00
Marina Glancy
bbab4e22f2 MDL-45154 user profiles: category name duplication error 2014-04-22 10:44:51 +08:00
Rajeev S
4a8347b294 MDL-43789: coursename disallows spaces in user bulk actions filter 
Spaces and other non alphanumeric characters are disallowed in
coursename filter for user bulk actions.This prevents filtering
based upon courserole if the coursename contains spaces or other non
alphanumeric characters.
 2014-04-18 11:07:14 +08:00
Marina Glancy
3e5ee8073b MDL-45154 user profiles: avoid redirection warnings 2014-04-17 14:25:52 +08:00
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
 2014-04-08 13:30:41 +08:00
Dan Poltawski
3a047312b6 Merge branch '42317-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-08 09:22:38 +08:00
Sam Hemelryk
c1229656db Merge branch 'MDL-44454_old_code' of https://github.com/andyjdavis/moodle 2014-04-08 11:35:34 +12:00
sam marshall
8270f0d0bd MDL-44070 Conditional availability enhancements (9): wider changes 
Changes to arbitrary areas of code that are necessary after the new
API (mostly to replace deprecated function calls).
 2014-04-07 20:11:59 +01:00
Andrew Davis
abdfe18ddb MDL-44454 core_user: removed unused code from user/index.php 2014-04-07 12:02:15 +08:00
Sam Hemelryk
566889aaa8 MDL-42317 output: reviewed standard/base layouts and converted where a better option was available 2014-04-06 15:57:32 +12:00
Sam Hemelryk
225c418fd2 MDL-41511 blocks: improved how custom block regions were being rendered. 
There is a new theme property 'blockrendermethod' that can be set by the
theme in its config.php and tells Moodle what method it is using to render
blocks in the layout files.
Either blocks, or blocks_for_region.
Then when adding custom block regions to a page content we ensure we use
the same method the theme is using elsewhere.

This is really a hack becuase we (I) didn't properly deprecate
blocks_for_region when I added the blocks method.
 2014-04-06 15:17:47 +12:00
Ankit Agarwal
52dc1de746 MDL-42891 administration: Re-implement incorrect login notification, without using the logtable. 2014-04-01 17:18:15 +08:00
Mark Nelson
cc033d48b5 MDL-44316 core_tag: changed the API to accept a contextid and component 2014-03-22 13:50:08 -07:00
Jetha Chan
93075bf073 MDL-44148 portfolio: set_user_config usage fix 
Amended user/portfolio.php's use of portfolio_plugin_base::set_user_config to be consistent with the API.
 2014-03-18 14:19:36 +08:00
Dan Poltawski
7f42ee92eb Merge branch 'MDL-44440_master' of git://github.com/dmonllao/moodle 2014-03-10 13:45:26 +08:00
David Monllao
1f631c7c63 MDL-44440 behat: Changing , for > as a navigation tree nodes separator 
Using greater than as seems a more natural separator
than the comma when separating nodes which have a
hierarchy relation.
 2014-03-10 13:35:40 +08:00
Dan Poltawski
c13c64b0e1 Merge branch 'MDL-43236_master' of git://github.com/dmonllao/moodle 2014-03-10 12:04:14 +08:00
David Monllao
759b323e0e MDL-43236 behat: Updating references to deprecated methods 2014-03-07 16:05:21 +08:00
David Monllao
a542553d42 MDL-44440 behat: Refactoring features to use I navigate to 
Replacing multiple "I expand node" steps by the
new "I navigate to". Also fixing few I navigate to
when dealing with non-JS.
 2014-03-07 14:46:54 +08:00
Petr Škoda
c6b44cb4f2 MDL-44359 fix explode(', ', regressions from MDL-44255 2014-03-07 08:51:04 +08:00
David Monllao
f083d6145e MDL-43738 behat: Updating features files 
The following used steps were replaced by the ones
added in this issue:
- I fill the moodle form with
- I fill in with
- I select from
- I select radio button
- I check
- I uncheck
- the field should match

Also removing test for deprecated steps:
- the ASD checkbox should be checked
- the ASD checkbox should not be checked
 2014-02-27 18:22:05 +08:00
Damyon Wiese
5c7a266e65 Merge branch '44255-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	user/profile.php
 2014-02-25 14:14:31 +08:00
Damyon Wiese
8da433f045 MDL-44264 Badges: Cleanup imports in previous commit. 2014-02-24 13:48:18 +08:00
Damyon Wiese
9a85b4e053 Merge branch 'MDL-44264' of https://github.com/merrill-oakland/moodle 2014-02-24 13:40:47 +08:00
Damyon Wiese
e848a930d2 Merge branch '44279-27' of git://github.com/samhemelryk/moodle 2014-02-24 13:37:52 +08:00
Damyon Wiese
b80210fcd2 MDL-18633 User: Fixed calls to html_writer on user/profile page. 2014-02-24 13:19:17 +08:00
Sam Hemelryk
a2ed6e69f9 MDL-44255 user: tidied up phpdocs and coding style 2014-02-24 09:23:47 +13:00
Sam Hemelryk
854859e1b0 MDL-42279 user: fixed typo in user_get_user_details_courses 2014-02-21 08:34:49 +13:00
Sam Hemelryk
1d2fa3af5a MDL-44279 user: added unit test to trigger known bug 2014-02-21 08:34:49 +13:00
Eric Merrill
786163a7cb MDL-44264 badges Add badges to the user short profile page. 2014-02-18 15:05:47 -05:00
Daniel Neis Araujo
9d9361e82d MDL-18633 User profile: add last ip field to user view 2014-02-18 09:42:28 -03:00
Michael Aherne
41dcfbf1af MDL-26680 my page My Moodle "reset to default" button 2014-01-21 22:36:24 +00:00
Rajesh Taneja
b8e6c15a99 MDL-42883 Administration: Check sessionkey before taking action on user profile fields 2014-01-06 13:58:18 +08:00
Jerome Mouneyrac
97b659a13f MDL-41075 Remove "Choose..." option from participants page. 2013-12-16 12:07:33 +08:00
David Monllao
fb99ef1ded MDL-42625 behat: Fixing failures 
* Expanding fieldsets before setting the course format
* Ensure editors are loaded moved to expand_all_fieldsets
* Return true rather than false when JS is disabled and
  non-allowed steps should continue without throwing an
  exception.
* Submit create user form after editing it
 2013-12-12 13:41:07 +08:00
Mark Nelson
8bf0f20795 MDL-42932 core_calendar: introduced calendar type system setting 2013-12-09 18:40:46 -08:00
Petr Škoda
0b3bd8cb7f MDL-42097 fix handling of passwords when creating new users 2013-12-05 10:58:31 +08:00
Dan Poltawski
50de5b4c06 Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle 2013-12-04 14:57:24 +08:00
Rajesh Taneja
e70bfef4ff MDL-43028 navigation: fixed section for profilepage 
section for profile page is profilepage and not mypage
 2013-12-04 14:48:30 +08:00
Dan Poltawski
8761a4f15d Merge branch 'MDL-42097-master' of git://github.com/ankitagarwal/moodle 2013-12-03 15:21:09 +08:00
Dan Poltawski
6ca388028e Revert "MDL-42932 core_calendar: introduced calendar type system setting" 
This reverts commit bb32a499e10abc3bb88e715fb0575e5b7fb66e8e.
 2013-12-03 14:57:10 +08:00
Dan Poltawski
aa8abbee14 Revert "MDL-42932 core_lib: added missing $CFG declaration" 
This reverts commit 4c61097cc7138dd18173775ec55fe2c5aed48857.
 2013-12-03 14:57:08 +08:00