Commit Graph

57 Commits

Author SHA1 Message Date
Helen Foster a5591614d5 MDL-62354 lang: Merge English strings from the en_fix language pack
Significant string changes:

* publishstate_help, core_notes - including GDPR guidance
* contactdataprotectionofficer_desc, tool_dataprivacy - removing mention
  of link on privacy policy page as it is not yet implemented
2018-05-09 22:39:21 +02:00
Andrew Nicols 06cab84176 Merge branch 'MDL-62167-master' of git://github.com/FMCorz/moodle 2018-05-01 11:10:31 +08:00
Frédéric Massart d498287fd7 MDL-62167 core_badges: Implement privacy API 2018-04-27 10:49:48 +08:00
Helen Foster 970c1a4bf1 MDL-62181 lang: Merge English strings from the en_fix language pack
Significant string changes:

* sitepolicies, core_admin - 'Site policies' changed to 'Site security
  settings'
* processexpirationstask, enrol_paypal - more explanatory name
* sitepolicy_help and sitepolicyguest_help, core_admin - setting will
  only have an effect if the site policy handler is set to default
* sitepolicyhandler_desc,core_admin - improved wording
* pathtodot_help, core_admin - Windows and Mac paths
* debugstringids_desc, core_admin - improved explanation
2018-04-24 22:05:30 +02:00
Stephen Bourget 75653a3068 MDL-55491 badges: Add cohort as badge criteria 2018-04-09 11:03:30 +02:00
Eugene Venter abc07b53a7 MDL-55491 badges: Add cohort as badge criteria
commissioned by NZ Customs Service
2018-04-09 10:23:50 +02:00
Helen Foster 700522badd MDL-61046 lang: Merge English strings from the en_fix language pack
Significant string changes:

* pluginname_desc, enrol_category - improved explanation
* pathtopythondesc, core_admin - mentioning Python version
* configdeleteunconfirmed, core_admin - setting applies to more than
  just email-based self-registration
2018-01-04 11:30:54 +01:00
Stephen Bourget a7370e0dd0 MDL-59875 Badges: Allow badges to be criteria for other badges 2017-11-28 08:03:02 -05: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 29631e628f MDL-57429 badges: handle curl problems nicely during connection creation
- Properly validate the displayer API response before sending the
verification email.
- Properly validate the displayer API response before creating the
saved connection.
2017-03-23 11:27:15 +08:00
Jake Dallimore 80e8e0061e MDL-57429 badges: lang string deprecation for new email verify process
Deprecated those lang strings used in the old Persona login process.
2017-03-16 09:35:14 +08:00
Jake Dallimore 091eaab0da MDL-57429 badges: add email verification for openbackpack connections
With the Persona provider now out of commission, no new connections to
the Mozilla openbackpack can be created. This patch adds an email
verification step to core to restore the openbackpack functionality.
2017-03-16 09:35:12 +08:00
Matt Davidson b7374faca6 MDL-43230 badges: manually revoke awarded badges
A user can be manually awarded a badge, but if given by mistake an
awarded badge cannot be removed.
2016-10-12 05:06:38 +00:00
Stephen Bourget 2ce8cf628f MDL-55239 Badges: Additional events for badges 2016-08-11 21:16:35 -04:00
Stephen Bourget a0e13871cf MDL-45734 Badges: Add additional events 2016-07-29 21:51:05 -04:00
Helen Foster 25558b808e MDL-55002 lang: Merge English strings from the en_fix language pack 2016-06-27 22:03:40 +02:00
Helen Foster da6ecfd8c1 MDL-52018 lang: Merge English strings from the en_fix language pack 2015-11-02 22:12:06 +01:00
Ankit Agarwal 1785f52cf6 MDL-48470 strings: Remove deprecated strings 2015-05-18 14:45:03 +05:30
John Okely ad13aff7c4 MDL-49983 lang: Remove language strings that were added in 2.9 2015-05-05 11:35:21 +08:00
John Okely 4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
Frederic Massart c7d5ca8d16 MDL-49981 badges: Missing link to manage your badges 2015-04-28 10:13:36 +01:00
Ankit Agarwal b19cc4ef25 MDL-45898 myprofile: Redesign my profile page
Part of MDL-45774.

Contributions by John Okely, Jetha Chan and Damyon Wiese (squashed branch).

AMOS BEGIN
CPY [coursebadges,core_badges], [badges,core_badges]
AMOS END
2015-04-10 17:17:32 +08:00
Damyon Wiese 4e1f60478a MDL-49635 Navigation: Site pages consistent headers + navigation for preferences
Preferences pages cancel and continue buttons should lead back to preferences page.

Site pages should have consistent headers and breadcrumbs.

Hide the "Preferences" node in the navigation.

Part of MDL-45774
2015-04-10 17:17:07 +08:00
Yuliya Bozhko 3784d3be98 MDL-49543 badges: Add description to the badge criteria
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2015-03-23 08:47:49 +13:00
James Ballard 483cfd763d MDL-48142 core_badge: add badge awarded event 2015-02-17 09:37:35 +08:00
Sam Hemelryk bb554eb4ef MDL-48335 phpdoc: cleaned up @package in lang files 2014-11-22 11:03:46 +13:00
Marina Glancy c78cf06d9e MDL-46585 lang: 6 unused strings 'hidden' are deprecated
Strings are not used in the components where they are defined.
If they are used in other components they should be defined in appropriate locations
since the translation may depend on the subject that is being hidden.
2014-09-12 10:15:43 +08:00
Frederic Massart d9a4f52927 MDL-42761 badges: Remove H2s from help popup 2014-04-17 12:46:07 +08:00
Eloy Lafuente (stronk7) 170c87d808 Merge branch 'MDL-44425-en_fix' of git://github.com/mudrd8mz/moodle 2014-03-06 00:35:28 +01:00
Helen Foster fcca760ae7 MDL-44425 Merge English strings from the en_fix language pack 2014-03-05 13:29:32 +01:00
Yuliya Bozhko 762b2a6b9e MDL-41585 badges: Add a note that badge recipient is a deleted user
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2014-02-24 14:57:40 +13:00
Yuliya Bozhko 3193b97e05 MDL-43978 badges: Fix lang string 2014-02-07 09:11:15 +13:00
Yuliya Bozhko a2a114bd6a MDL-43978 badges: Display error message to guest users viewing "My Badges" page 2014-02-05 09:52:32 +13:00
Eloy Lafuente (stronk7) 577432283c Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle 2014-01-10 10:08:34 +01:00
Helen Foster 480fca77b3 MDL-43590 Merge English strings from the en_fix language pack 2014-01-09 01:06:01 +01:00
Sam Hemelryk 61a79e01fc Merge branch 'MDL-40551_master' of https://github.com/totara/openbadges
Conflicts:
	badges/upgrade.txt
2014-01-06 12:00:11 +13:00
Yuliya Bozhko 455d13b7e4 MDL-40551 badges: Support fully deleting badges 2013-12-16 09:29:38 +13:00
Damyon Wiese d5c0f0453c Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges
Conflicts:
	version.php
2013-11-11 10:17:07 +08:00
Yuliya Bozhko f5d17c14ea MDL-39923 badges: Send badge messages through internal messaging system 2013-11-07 14:49:27 +13:00
Helen Foster 5a25566060 MDL-42728 Merge English strings from the en_fix language pack 2013-11-05 23:41:44 +01:00
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
Simon Coggins f6ebcd34f2 MDL-40848 badges: Validate backpack connection via Persona
Instead of trusting that the user owns the email address they
supply, we now require them to login via Persona before
connecting them to the backpack
2013-09-16 20:15:32 +12:00
Yuliya Bozhko 4d7d17ddcc MDL-40550 badges: Change wording of badge activation message
Add confirmation check when activating badge from management page
2013-09-16 15:37:00 +12: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
Yuliya Bozhko 2c9108611d MDL-38837 badges: Check for http or https in badges backpack support 2013-07-18 13:38:18 +12:00
Helen Foster 77fc81f3ee MDL-40439 Merge English strings from the en_fix language pack 2013-07-02 11:42:10 +02:00
Eloy Lafuente (stronk7) 522b5faf60 Merge branch 'MDL-39642-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
	lang/en/badges.php
2013-05-13 12:07:55 +02:00
Helen Foster 9f3e096899 MDL-39642 Merge English strings from the en_fix language pack 2013-05-13 09:58:43 +02:00
Damyon Wiese 826cf99fb8 Merge branch 'MDL-39189_master' of git://github.com/totara/openbadges 2013-05-13 15:10:49 +08:00