mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-11 11:23:52 +02:00
Code Issues Projects Releases Wiki Activity
63,666 Commits 36 Branches 530 Tags
Commit Graph

54 Commits

Author SHA1 Message Date
Sam Hemelryk
c4f5f0ee59 Merge branch 'MDL-40471_master' of https://github.com/totara/openbadges 2013-09-11 08:42:37 +12:00
Mark Nelson
1eee7ee3a0 MDL-40924 badges: added a print_error call to prevent PHP notices when no badges are found 2013-09-05 10:05:37 +08:00
Yuliya Bozhko
a72c2cd681 MDL-40471 badges: Fixes around badge capabilities and navigation 2013-09-04 11:03:35 +12:00
Rajesh Taneja
bb78e249cd MDL-39961 Events: Replace Legacy events - User 
This change includes:
* Added user_updated event, replacing old event
* Added user_created event, replacing old event
* Added user_deleted event, replacing old event
* Added user_loggedout event, replacing old event
* Added user_enrolment_created event, replacing old event
* Added user_enrolment_deleted event, replacing old event
* Added user_enrolment_updated event, replacing old event
 2013-09-02 16:10:05 +08:00
Yuliya Bozhko
737a352ff8 MDL-40712 badges: Display recipient information 2013-09-02 13:43:51 +08:00
Yuliya Bozhko
2d3c0faef1 MDL-40924 badges: Add caching to external badges 2013-09-02 13:40:41 +08:00
Dan Poltawski
144f35d9a2 Merge branch 'MDL-41136-master' of git://github.com/FMCorz/moodle 2013-08-20 17:51:18 +08:00
Rajesh Taneja
1cb1e5fe32 MDL-39955 completion: Added unittest for course_completed event 2013-08-13 09:43:38 +08:00
Rajesh Taneja
06f8ea7bf4 MDL-39955 completion: Added course_completed event 2013-08-13 09:43:38 +08:00
Frederic Massart
fe5204f92c MDL-41136 badges: Prevent extra loading due to unnecessary includes 2013-08-12 13:31:21 +08:00
Rajesh Taneja
cdc541990e MDL-39955 completion: Added unittest for course_module_completion_updated event 2013-08-09 17:06:12 +08:00
Rajesh Taneja
137d94f335 MDL-39955 completion: Added course_module_completion_updated event 
Conflicts:

	lib/tests/completionlib_advanced_test.php
 2013-08-09 17:04:34 +08:00
Petr Škoda
8252b7c291 MDL-40901 standardise core test case class and file names 
This finally allows us to type only the class name when executing individual core test cases.
 2013-08-04 22:10:31 +02:00
Sam Hemelryk
6cef3dfe8e Merge branch 'MDL-39461_dev' of https://github.com/totara/openbadges 2013-07-30 08:59:58 +12:00
Yuliya Bozhko
3752d8236d MDL-39461 badges: Fix cURL expectation failed error when trying to connect to backpack 2013-07-23 08:21:04 +12:00
Dan Poltawski
27e2400782 Merge branch 'MDL-38837_dev' of https://github.com/totara/openbadges 2013-07-22 15:01:26 +08:00
Yuliya Bozhko
2c9108611d MDL-38837 badges: Check for http or https in badges backpack support 2013-07-18 13:38:18 +12:00
Eloy Lafuente (stronk7)
e780e5cb8f Merge branch 'MDL-40112_master' of https://github.com/totara/openbadges 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-07-16 01:29:01 +02:00
Damyon Wiese
a6673a8b04 Merge branch 'MDL-40369-master' of git://github.com/FMCorz/moodle 2013-07-09 15:28:31 +08:00
Yuliya Bozhko
e50220f840 MDL-40112 badges: Drop unused image field from badge table 2013-07-05 09:18:59 +12:00
Frederic Massart
a8dd22a7d7 MDL-40369 theme: Fix core using deprecated icons 2013-07-03 16:47:35 +08:00
Yuliya Bozhko
19a9f2eada MDL-39986 badges: Show badge navigation to users with awardbadge capability 
Also fixes an arror when a user with this capability tries to award a badge,
but their role is not among the criteria set up for a badge
 2013-07-03 13:13:55 +08:00
Yuliya Bozhko
111c5fd93f MDL-40022 badges: Fix missing calls to setType in course criteria settings 2013-06-18 11:38:22 +12:00
Damyon Wiese
826cf99fb8 Merge branch 'MDL-39189_master' of git://github.com/totara/openbadges 2013-05-13 15:10:49 +08:00
Damyon Wiese
a02e36d682 Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges 2013-05-13 14:59:37 +08:00
Yuliya Bozhko
85d7399e20 MDL-39209 badges: Fix course badges page access and navigation when course badges are disabled 2013-05-10 08:41:22 +12:00
Yuliya Bozhko
71fd443b34 MDL-39189 badges: Allow users with multiple roles choose their role when awarding a badge 2013-05-10 08:33:45 +12:00
Eloy Lafuente (stronk7)
474e0d3cd2 Merge branch 'MDL-39397_master' of git://github.com/totara/openbadges 2013-05-09 00:20:06 +02:00
Yuliya Bozhko
7deff81f80 MDL-39397 badges: Handle course badges when course is deleted 2013-05-08 16:12:44 +12:00
Eloy Lafuente (stronk7)
ddb8041433 MDL-39538 take rid of unused global 2013-05-07 21:43:06 +02:00
Eloy Lafuente (stronk7)
5304ded836 Merge branch 'wip-MDL-39538-master' of git://github.com/marinaglancy/moodle 2013-05-07 21:38:24 +02:00
Marina Glancy
4c3f33dc0c MDL-39538 use of deprecated function make_categories_list() 2013-05-07 16:15:25 +10:00
Damyon Wiese
e0fc61f993 Merge branch 'MDL-39162' of git://github.com/totara/openbadges 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-07 10:41:44 +08:00
Yuliya Bozhko
f8ba185ac5 MDL-39162: Add badges CSS to bootstrap theme 2013-05-06 16:20:02 +12:00
Andrew Davis
36388ba832 MDL-39480 core_badge: prevented a php notice 2013-05-04 11:58:01 +08:00
Damyon Wiese
9c898f682a Merge branch 'MDL-39207_master' of git://github.com/totara/openbadges 2013-05-02 14:44:20 +08:00
Yuliya Bozhko
265b866fe5 MDL-39207 badges: Generate badge assertions using user's backpack email if it is set 2013-05-02 16:05:11 +12:00
Dan Poltawski
dd4a197e0f MDL-39207 badges: don't use curl version depedent constant 
It seems that CURLOPT_CONNECTTIMEOUT_MS is depdendent on the version
of curl compiled against. We don't need milliseconds here anyway, so
switch to the seconds value.
 2013-05-01 07:21:58 +01:00
David Monllao
550d842e3c MDL-39232 behat Normalize feature tags according to component names 2013-04-30 11:54:47 +08:00
David Monllao
9b1dbe16db MDL-39232 behat: Adding @_only_local tag 
Tests which requires files to be uploaded should
be tagged as @_only_local.
 2013-04-30 11:54:47 +08:00
Yuliya Bozhko
9b0f001445 MDL-39049 Badges: Fix error when awarding a badge from recipients page 2013-04-17 17:03:19 +08:00
Yuliya Bozhko
e280531436 MDL-39063 badges: Improve external backpack usability and workflow 2013-04-16 10:47:40 +12:00
Dan Poltawski
7e155b96fb Merge branch 'wip-MDL-38309-m25' of git://github.com/marinaglancy/moodle 2013-04-15 10:24:20 +01:00
Marina Glancy
a5f82c5b21 MDL-38309 Substitute usage of print_tabs() with renderable tabtree 2013-04-15 12:13:13 +10:00
Dan Poltawski
f4f0a085d8 Merge branch 'MDL-39011_master' of github.com:totara/openbadges 2013-04-12 10:45:00 +08:00
Dan Poltawski
f4686f5df9 Merge branch 'MDL-39049_master' of github.com:totara/openbadges 2013-04-12 10:30:10 +08:00
Dan Poltawski
315e2ad133 Merge branch 'integration_MDL-38997' of github.com:totara/moodle 2013-04-12 09:59:49 +08:00
Yuliya Bozhko
04da1a5ac2 Fix error when awarding a badge from recipients page 2013-04-10 11:00:08 +12:00
Yuliya Bozhko
8d107e982d Fix missing form element setType() issue in /badges/mybackpack.php 2013-04-08 12:31:36 +12:00
Simon Coggins
60d72efb4e MDL-38997 badges: Add checks to fix notices if badge settings not yet configured 2013-04-06 14:24:48 +13:00