2041 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
19e8e56e7e Merge branch 'MDL-59756-master-2' of git://github.com/junpataleta/moodle 2017-08-15 13:38:01 +02:00
Damyon Wiese
5dd94c811d MDL-59370 behat: Behat fixes for enrolled users
We removed the enrolled users page, so we need to update the behats that were using it.
2017-08-14 11:06:22 +08:00
Damyon Wiese
4b50765bd5 MDL-59370 enrol: Kill the enrol/users page. 2017-08-14 11:06:16 +08:00
Jun Pataleta
00aba5ec9a MDL-59756 enrol: Swap positions of edit and unenrol actions 2017-08-11 10:18:30 +08:00
Jun Pataleta
1453d146b3 MDL-59366 enrol: Nuke manage_enrolments_from_participants.feature
This will be removed soon. Better remove it now since it started to
cause failures after the new course participants page improvements
have landed.
2017-08-04 09:51:28 +08:00
Jun Pataleta
37fc1d4db7 MDL-59366 enrol: Be more specific on which autocomplete is being opened
* Specify that the autocomplete in the student's row in the
  participants table is being opened.
2017-08-04 09:14:30 +08:00
Andrew Nicols
3d4739ab64 MDL-59602 enrol: Correct course name for restored course 2017-08-02 13:02:29 +08:00
Dan Poltawski
e3a2d7a473 Merge branch 'MDL-59366-master' of git://github.com/junpataleta/moodle 2017-08-01 10:36:14 +01:00
Andrew Nicols
5c5b130268 Merge branch 'MDL-58928-alt-attribute-enrolment-edit-delete-icons' of https://github.com/lucaboesch/moodle 2017-08-01 14:54:05 +08:00
Luca Bösch
da15576180 MDL-58928 enrol: delete and edit icon alt attribute 2017-07-31 17:31:07 +02:00
David Monllao
7190f330b4 Merge branch 'MDL-59602_coursenav' of https://github.com/mrmark/moodle 2017-07-31 13:21:09 +02:00
Jun Pataleta
445de896ef MDL-59366 enrol: Add $onlyenabled param in enrol instances getters
* Add param in order allow flexibility for the methods to be able
to fetch only active enrol instances as well.

Part of MDL-59290.
2017-07-28 16:11:56 +08:00
Jun Pataleta
91b099dbed MDL-59369 enrol: Fix add_to_group Behat tests
Tab to the next element after selecting groups in order for
the autocomplete element to close and be able to click on the
"Save changes" link.
2017-07-27 11:17:33 +08:00
Jun Pataleta
06aa592315 MDL-59369 enrol: Behat tests for plugin enrol actions 2017-07-26 09:44:33 +08:00
Jun Pataleta
fd0a43be1b MDL-59369 enrol: Introduce data-action attribute for enrol action links 2017-07-26 09:44:33 +08:00
Jun Pataleta
ea758b85e4 MDL-59369 enrol: Cleanup enrol pages
* Cleanup edit enrolment form.
* Improve edit enrol form validation error message.
* Add modal custom data flag to edit enrolment form to hide action
  buttons if loaded via fragment.
* Point return URLs of edit enrolment and user unenrol pages back to
  participants page.
2017-07-26 09:44:02 +08:00
Jun Pataleta
58c20c8108 MDL-59369 enrol: New ws core_enrol_external::edit_user_enrolment 2017-07-26 09:43:16 +08:00
David Monllao
58f86c4cc5 MDL-59174 enrollib: More flexibility for enrol_get_course_users
Part of MDL-57791 epic.
2017-07-24 08:36:46 +02:00
David Monllao
8970ff91bb MDL-59174 analytics: Analyser queries to enrollib
Part of MDL-57791 epic.
2017-07-24 08:36:46 +02:00
Mark Nielsen
197e2bca5b MDL-59602 behat: make use of new course nav steps 2017-07-21 13:50:47 -07:00
Damyon Wiese
dda64b6f45 MDL-59548 behat: Helpers for autocomplete
Improve the helpers for autocomplete so that:
a) the set field for an auto complete will automatically close the suggestions list.
b) add a new helper to open the suggestions list
c) move the helper for clicking on an element in the suggestions list from tool_lp to core.
2017-07-17 11:10:15 +08:00
Eloy Lafuente (stronk7)
28fcc33944 MDL-59437 behat: old "edit" cog to go to enrollments page is gone
There use to be a little cot to easily navigate from the
participations page to the enrollments page.

In boost it was already hidden, but present and the test was still
working (non-javascript).

With the conversion, the functionality is 100% gone so, right now,
the only way to navigate from participats to enrollments (that will
dissappear with with unification), is using the course admin cog.
2017-07-13 11:48:28 +08:00
Damyon Wiese
af6d23853a MDL-59365 enrol: Behat fixes
Fixes for the new enrol users popup with behat.
2017-07-13 10:55:01 +08:00
David Monllao
eac6f51590 Merge branch 'MDL-59368-master' of git://github.com/damyon/moodle 2017-07-12 16:46:49 +02:00
Damyon Wiese
2cc2001bef MDL-59365 enrol: Teachers can see other users on the site
In order to enrol new users into a course, you need to see users who are not in the current course.
2017-07-12 14:47:11 +08:00
Damyon Wiese
f3ecea3af4 MDL-59368 groups: Peer review fixes
* Fix coalesce on postgres.
* The edit icon's alt shows the HTML entities causing
* enrol/tests/behat/add_to_group.feature Contains a '@doit' tag which I assume is there from testing.
* group/classes/output/user_groups_editable.php
** Missing MOODLE_INTERNAL check.
** Unused variables context_system and moodle_exception.
** The PHPDocs for the constructors are wrong.
** export_for_template() returns an array, not stdClass (according to parent docs).
** Change moodle_exception to coding_exception at the beginning.
* group/lib.php
** Missing docs for core_group_inplace_editable().
* user/classes/participants_table.php
** The docs for the class variables $groups, $course and $context need a '\' beforehand as they are in a namespace.
** I would prefer $this->context = $context; and $this->groups = ... to be done at the end of the constructor with the other class variable assignments.
** You could get rid of the class variable courseid if we are setting course and use $this->course->id instead.
** The function col_groups has @param \stdclass $row but it should be $data
* lib/amd/src/form-autocomplete.js and lib/amd/src/inplace_editable.js
** Some issues here CiBot has pointed out.
* lib/classes/output/inplace_editable.php
** @see should be on a new line.
2017-07-12 10:09:09 +08:00
Damyon Wiese
76c493b3f2 MDL-59368 groups: Add behat for new group edit 2017-07-12 10:07:58 +08:00
Damyon Wiese
d77c73a359 MDL-59365 enrol: Use standard modal
Replace the custom footer with a standard modal.
2017-07-11 13:48:27 +01:00
Damyon Wiese
2e1615f2c0 MDL-59365 eslint: Noop changes for eslint 2017-07-11 13:48:26 +01:00
Damyon Wiese
aa8909f479 MDL-59365 enrol: Make select users first
This is the most important element in the form - make it first.
2017-07-11 13:47:52 +01:00
Damyon Wiese
0fa35b1abc MDL-59365 enrol: Switch the user selector
The user selector was calling the wrong API to get the potential list of users to enrol.

Now it works.
2017-07-11 13:47:46 +01:00
Damyon Wiese
a60e8ba51e MDL-59365 enrol_manual: Rewrite the yui enrolment popup in amd
The add/roles thing was only converted to bootstrap 2/4 markup and the yui left in place.

The modal for adding users to a course was unsavable so I rewrote it with an mform in a popup, still calling
the same (barely) modified ajax script.

The webservice for searching cohorts was taken from admin/tool/lp and moved into /cohort. I added a generic "cohort"
mform element at the same time.

The webservice for searching for users was taken from the original ajax script.
2017-07-11 13:47:26 +01:00
Eloy Lafuente (stronk7)
29af7b0b4c MDL-57432 upgrade: clean < 3.0.0 upgrade steps
This just deletes all the upgrade steps previous to 3.0.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.

Also includes an upgrade step to prevent upgrading from any
version < 2015111600 (v3.0.0) as anti-cheating measure.

Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase.
2017-07-10 09:16:55 +01:00
Eloy Lafuente (stronk7)
58da7e8851 Merge branch 'MDL-57021-master-v2' of git://github.com/danpoltawski/moodle 2017-07-05 12:24:45 +02:00
John Okely
d349b0f0f8 MDL-58286 enrol_ldap: Pass connection to ldap_paged_results_supported
Thanks to Bianco Veigel for the original patch.
2017-07-05 09:46:27 +08:00
Dan Poltawski
dd58863dab MDL-57021 passwords: only use unmask field with shared secrets
When a user is entering a password which isn't returned back to them
then its not correct to use the unmask element - this element was
designed for places where we are storing shared secrets.
2017-06-15 12:59:19 +01:00
Eloy Lafuente (stronk7)
5e27228335 MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts 2017-05-19 19:22:07 +02:00
Eloy Lafuente (stronk7)
d989ee1e03 MDL-58853 versions: bump all versions and requires near release
version = 2017051500 release version
requires= 2017050500 current rc1 version
2017-05-09 02:58:28 +02:00
Helen Foster
06d0aa4432 MDL-58749 lang: Merge English strings from the en_fix language pack
Significant string changes:

* errorinvalidbyhour,core_calendar - correcting number from 59 to 23
* cron_help,core_admin - updated recommendation to run cron every minute
* tour1_content_end, tour1_content_welcome, tour2_content_end,
  tour2_content_welcome all in tool_usertours - removing reference to
  3.2
* invalidsesskey,core_error and invalidsesskey,mod_wiki - more
  understandable error message
* pluginname_help and pluginnamesummary in qtype_essay - explaining that
  the question type can be used for file uploads
* formatnoinline, mustattach and mustrequire in qtype_essay - changing
  the word 'inline' to 'online'
2017-05-03 22:05:51 +02:00
Jake Dallimore
4c7dc6af94 Merge branch 'MDL-58659-master' of git://github.com/jleyva/moodle 2017-04-24 12:02:20 +08:00
Juan Leyva
01c26702d3 MDL-58659 enroll: Add start and end date fields required by overview
Those fields are required to display the courses overview for final
users.
2017-04-20 13:00:15 +02:00
David Monllao
ac0553aa64 Merge branch 'MDL-54901' of git://github.com/stronk7/moodle 2017-04-19 11:30:03 +08:00
David Monllao
3fa64904cd Merge branch 'MDL-58116-master' of https://github.com/barrasroger/moodle-1 2017-04-19 00:49:41 +08:00
barrasroger
499d37755c MDL-58116 core_enrol: fix handling of users on different methods 2017-04-18 13:28:08 +02:00
Eloy Lafuente (stronk7)
55946a892a MDL-54901 phpunit: Change phpunit wwwroot to HTTPS and fix tests
This includes:

- Changing PHPUnit's bootstrap to use https://www...
- Modify all existing expectations to the new wwwroot.
- Amend some tests now with different defaults because of is_https()
- Added a note to main upgrade.php about the change.
2017-04-18 03:40:17 +02:00
Damyon Wiese
473d849fd0 MDL-58493 enrol: Update JS to use font-awesome icon 2017-04-11 11:28:01 +08:00
Eloy Lafuente (stronk7)
aa2b5b214d Merge branch 'wip-MDL-57769-master' of https://github.com/marinaglancy/moodle 2017-04-05 01:31:08 +02:00
Dan Poltawski
1e4e5c52d7 Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle 2017-04-04 17:07:41 +01:00
Andrew Nicols
80ece0847e MDL-58333 enrol: Include course progress in course listing WS
Part of MDL-55611 epic.
2017-04-04 11:01:43 +01:00
Andrew Nicols
930cab683d Merge branch 'master' of https://github.com/koennys/moodle 2017-04-04 11:48:50 +08:00