Sam Hemelryk e50df55c91 Merge branch 'MDL-40848_master' of git://github.com/totara/openbadges ...

Conflicts:
	theme/base/style/core.css
	theme/bootstrapbase/less/moodle/core.less
	theme/bootstrapbase/style/moodle.css

2013-09-25 16:27:09 +12:00

..

classes

MDL-39961 Events: Replace Legacy events - User

2013-09-02 16:10:05 +08:00

criteria

MDL-41637 badges: Update modules ids retrieval

2013-09-09 11:55:47 +12:00

lib

MDL-40848 badges: Validate backpack connection via Persona

2013-09-16 20:15:32 +12:00

tests

MDL-39961 Events: Replace Legacy events - User

2013-09-02 16:10:05 +08:00

action.php

MDL-40550 badges: Change wording of badge activation message

2013-09-16 15:37:00 +12:00

ajax.php

MDL-31501 rework user session architecture

2013-09-21 13:11:56 +02:00

assertion.php

…

award.php

MDL-39986 badges: Show badge navigation to users with awardbadge capability

2013-07-03 13:13:55 +08:00

backpack_form.php

MDL-40848 badges: Validate backpack connection via Persona

2013-09-16 20:15:32 +12:00

backpack.js

MDL-40848 badges: Validate backpack connection via Persona

2013-09-16 20:15:32 +12:00

backpackconnect.php

MDL-40848 badges: Validate backpack connection via Persona

2013-09-16 20:15:32 +12:00

badge.php

MDL-38837 badges: Check for http or https in badges backpack support

2013-07-18 13:38:18 +12:00

criteria_action.php

MDL-40550 badges: Change wording of badge activation message

2013-09-16 15:37:00 +12:00

criteria_form.php

…

criteria_settings.php

MDL-40550 badges: Change wording of badge activation message

2013-09-16 15:37:00 +12:00

criteria.php

MDL-40550 badges: Change wording of badge activation message

2013-09-16 15:37:00 +12:00

cron.php

…

edit_form.php

…

edit.php

MDL-40471 badges: Fixes around badge capabilities and navigation

2013-09-04 11:03:35 +12:00

external.php

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

index.php

MDL-40550 badges: Change wording of badge activation message

2013-09-16 15:37:00 +12:00

mybackpack.php

MDL-40924 badges: Add caching to external badges

2013-09-02 13:40:41 +08:00

mybadges.php

MDL-38837 badges: Check for http or https in badges backpack support

2013-07-18 13:38:18 +12:00

newbadge.php

MDL-40471 badges: Fixes around badge capabilities and navigation

2013-09-04 11:03:35 +12:00

overview.php

MDL-39209 badges: Fix course badges page access and navigation when course badges are disabled

2013-05-10 08:41:22 +12:00

preferences_form.php

…

preferences.php

…

recipients.php

MDL-40550 badges: Change wording of badge activation message

2013-09-16 15:37:00 +12:00

renderer.php

MDL-40550 badges: Change wording of badge activation message

2013-09-16 15:37:00 +12:00

view.php

MDL-39209 badges: Fix course badges page access and navigation when course badges are disabled

2013-05-10 08:41:22 +12:00