mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity
67,909 Commits 36 Branches 527 Tags
Commit Graph

12041 Commits

Author SHA1 Message Date
Marina Glancy
9ff40d83b5 Merge branch 'w17_MDL-41185_m27_courselog' of git://github.com/skodak/moodle 2014-04-22 12:26:24 +08:00
Adrian Greeve
68a7235889 MDL-41185 events: Added events for different course view pages 2014-04-21 17:39:18 +08:00
Frederic Massart
d9a4f52927 MDL-42761 badges: Remove H2s from help popup 2014-04-17 12:46:07 +08:00
Petr Škoda
d409944a95 MDL-44911 use unknown_logged class when viewing unknown events in reports 2014-04-14 11:59:00 +08:00
Dan Poltawski
34f7e31ffb Merge branch 'MDL-40063_master' of https://github.com/markn86/moodle 2014-04-11 14:31:27 +08:00
Mark Nelson
58940b190a MDL-40063 mod_quiz: replaced 'addcategory' add_to_log call with an event 2014-04-10 20:38:34 -07:00
Dan Poltawski
1b9a1e8128 Merge branch 'MDL-29572_master' of https://github.com/jrchamp/moodle 2014-04-09 11:38:42 +08:00
Sam Hemelryk
e97b942223 Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle 2014-04-09 11:26:33 +12:00
Sam Hemelryk
da98185a58 Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle 2014-04-09 10:09:02 +12:00
Marina Glancy
d175d25adc Merge branch 'MDL-44881-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-08 16:55:49 +08:00
Jason Fowler
0d5bfb9c65 MDL-44881 Filepicker: Fix alignment and padding on file-select dialog 2014-04-08 14:44:50 +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
Damyon Wiese
1e16a58525 Merge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle 2014-04-08 10:09:21 +08:00
James McQuillan
597662335d MDL-22999 core_grades: Added ability to configure maximum grade value both globally and for each graded-activity. 2014-04-07 16:02:37 -04:00
sam marshall
6a601097a0 MDL-44070 Conditional availability enhancements (5): deprecate old lib 
The old conditionlib.php, which is replaced by the new availability
API, has been deprecated.

* Code which uses the key functions (is_available,
  get_full_information) should still work. These now show
  deprecated warnings and then pass through to equivalents in the
  new API.
* I have created new unit tests for these functions.
* The old language file has been removed (reused strings already
  moved with AMOS).
* Most other functions throw exceptions because it was impossible
  (due to fundamental API differences) or difficult to reimplement.
* I don't really expect that non-core code (outside unit tests) will
  have used any of the other functions.
 2014-04-07 20:11:45 +01:00
sam marshall
d3db4b037c MDL-44070 Conditional availability enhancements (2): subsystem, API 
This commit defines the new /availability root folder, with
/availability/classes, /availability/tests, and
/availability/condition where the condition plugins will live.
Condition plugin prefix is availability_, e.g. availability_date.

Rationale for this organisation:

1. I was originally going to put this in /lib/availability but
   it has been pointed out that putting even more junk in lib
   is probably bad.
2. 'availability' and 'condition' are the two names used in code
   to refer to this system ($CFG->enableavailability).
3. The prefix has to be short enough to allow database tables
   (although in practice I assume that condition plugins will not
   normally contain database tables).

The new API includes a Boolean tree structure that controls the
availability of an item.

AMOS BEGIN
 CPY [availabilityconditions,core_condition],[restrictaccess,core_availability]
 CPY [enableavailability,core_condition],[enableavailability,core_availability]
 CPY [configenableavailability,core_condition],[enableavailability_desc,core_availability]
AMOS END
 2014-04-07 20:11:33 +01:00
shashirepo
600be271c6 MDL-39833 course: require token change 
MDL-39833 course: require token change
 2014-04-05 12:29:47 +05:30
Eric Merrill
288e7b0921 MDL-36141 course Define role to limit access to Other users. 2014-04-04 14:58:48 -04:00
Mark Nelson
d999407125 MDL-40908 core_tag: created an 'item_untagged' event 2014-04-03 20:26:22 -07:00
Mark Nelson
bf2ae267ca MDL-40908 core_tag: created a 'tag_created' event 2014-04-03 18:15:32 -07:00
Mark Nelson
db456ec1a5 MDL-40908 core_tag: created a 'tag_deleted' event 2014-04-03 18:15:32 -07:00
Mark Nelson
097bd4cdae MDL-40908 core_tag: created a 'tag_unflagged' event 2014-04-03 18:15:32 -07:00
Mark Nelson
6298494d73 MDL-40908 core_tag: replaced 'flag' add_to_log call with an event 2014-04-03 18:15:32 -07:00
Mark Nelson
cfa2c6e198 MDL-40908 core_tag: replaced 'add' add_to_log call with an event 2014-04-03 18:15:31 -07:00
Mark Nelson
09fce43469 MDL-40908 core_tag: replaced 'update' add_to_log calls with an event 2014-04-03 18:15:31 -07:00
Marina Glancy
ac32e42827 Merge branch 'MDL-42891-master' of git://github.com/ankitagarwal/moodle 2014-04-02 14:54:59 +08:00
Ankit Agarwal
2b0c88e2f6 MDL-42891 adminstration: update strings and display for login fails 2014-04-02 14:18:25 +08:00
Eloy Lafuente (stronk7)
929e32489f Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle 2014-04-02 01:12:52 +02:00
Marina Glancy
b3d75528de Merge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle 2014-04-01 17:40:35 +08:00
Ankit Agarwal
53b9e63b80 MDL-42891 administration: Replace use of logtable in notify_login_failures() with new logging apis 2014-04-01 17:35:01 +08:00
Ankit Agarwal
52dc1de746 MDL-42891 administration: Re-implement incorrect login notification, without using the logtable. 2014-04-01 17:18:15 +08:00
Ankit Agarwal
b63f773296 MDL-44717 events: Fix multiple issues in events 
Fix various incorrect urls
Fix incorrect phpdocs and other minor code style issues
Fix missing/incorrect strings

AMOS BEGIN
 MOV [eventblogassociationcreated, core_blog],[eventblogassociationadded, core_blog]
AMOS END
 2014-04-01 15:08:34 +08:00
Adrian Greeve
7ed25f480b MDL-44717 events: Fix for the name strings in various events. 
AMOS BEGIN
 MOV [eventnoteupdate, core_notes],[eventnoteupdated, core_notes]
AMOS END
 2014-04-01 14:45:05 +08:00
Petr Škoda
ffe60f5bbd MDL-40910 add new core event user_graded 
This event is triggered when teacher manually edits the grade in gradebook.
 2014-03-29 15:34:11 +08:00
Ankit Agarwal
f0a0f3c2bd MDL-44596 logging: Improve management interfaces for reports and stores 
This patch methods to the manager that uses callbacks from reports to determine how reports and stores are compatible with each other. This information is then displayed in the management pages.
 2014-03-26 09:12:42 +08:00
Andrew Nicols
6bf267776c MDL-28261 Javascript: Check for a working connection in SCORM activities 2014-03-24 23:48:32 +08:00
Jonathan Champ
643e341cc0 MDL-29572 Grade Import: Avoid creating invalid temporary rows; Provide feedback on error 2014-03-22 21:41:20 -04:00
Ankit Agarwal
451c0e9e6a MDL-40915 events: Add events for calendar actions 
Added a calendar_event_created
 Added a calendar_event_updated
 Added a calendar_event_deleted
 2014-03-21 16:33:19 +08:00
Marina Glancy
5cff835bd6 Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle 2014-03-19 21:22:25 +01:00
Ankit Agarwal
2f4cf9a1da MDL-42890 backups: Updated help string to indicate logging is required 2014-03-19 15:40:53 +08:00
Marina Glancy
fabc88f0bb Merge branch 'MDL-29807' of git://github.com/jleyva/moodle 2014-03-18 13:52:45 +08:00
Sam Hemelryk
72d80b598d Merge branch 'MDL-44433-master' of git://github.com/danpoltawski/moodle 2014-03-18 14:35:55 +13:00
Petr Škoda
b7679cdbfb MDL-41115 fix username field label when allowing login via email 
Thanks Marina for spotting this!
 2014-03-17 17:34:45 +08:00
Juan Leyva
0a8ab74728 MDL-29807 Control to avoid duplicate shortnames 2014-03-17 09:53:45 +01:00
Petr Škoda
50f5c84359 MDL-41115 add option to allow login via email 2014-03-14 11:25:09 +08:00
Dan Poltawski
f28b83ecea MDL-33653 quiz: remove unused string 2014-03-13 18:33:30 +01:00
Sam Hemelryk
e9c78971b5 Revert "MDL-40699 Language - Add option to Override Moodle's default behaviour to reset the UI language on logout" 
This reverts commit 08174740fbdc5d0a86d67c3736d4c78dced11331.
 2014-03-13 18:33:29 +01:00
Sam Hemelryk
2d1823eb51 MDL-43497 role: added missing string 2014-03-13 18:33:28 +01:00
Sam Hemelryk
b679a1760a Merge branch 'MDL-40699-UI-language-changes-when-logging-out-of-Moodle' of git://github.com/michael-milette/moodle 2014-03-13 18:33:20 +01:00
Dan Poltawski
454db7d467 Merge branch 'MDL-33653' of git://github.com/timhunt/moodle 2014-03-13 18:31:52 +01:00