103 Commits

Author SHA1 Message Date
Sam Hemelryk
0527e02390 Merge branch 'MDL-43774_master' of https://github.com/totara/openbadges 2014-02-10 15:21:41 +13:00
Sam Hemelryk
fbf1f6fdea Merge branch 'MDL-43978_master' of https://github.com/totara/openbadges 2014-02-10 09:23:51 +13:00
Yuliya Bozhko
ab8aa5828f MDL-43774 badges: Stop overriding default course navigation 2014-02-05 10:46:34 +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
Russell Smith
74b63eae76 MDL-43440 unit testing: Use cmid in unit tests when it should be used.
instance is has been used instead of cmid.  This works as all id's are 1
in most cases, but not always.

accesslib_clear_all_caches_for_unit_testing was updated to clear the
$USER->access cache which would fail test when the wrong user's data was used.
2014-01-25 08:57:32 +11:00
Damyon Wiese
f329801959 Merge branch 'MDL-41810_master' of https://github.com/totara/openbadges
Conflicts:
	badges/upgrade.txt
2014-01-21 13:06:30 +08:00
David Monllao
561e9bb92e MDL-43480 behat: Switching @_only_local and @_alerts to @_file_upload and @_alert 2014-01-17 10:41:37 +08:00
Yuliya Bozhko
7f964cfdc7 MDL-43621 badges: Don't display deleted users in badge recipients list 2014-01-15 09:31:45 +13:00
Yuliya Bozhko
343534a855 MDL-41810 badges: Remove hardcoded references to backpack.openbadges.org 2014-01-08 14:55:30 +13:00
Damyon Wiese
21197e9d4a Merge branch 'MDL-43399-master' of git://github.com/mouneyrac/moodle 2014-01-06 16:13:44 +08: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
Sam Hemelryk
a0e1168751 Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges 2013-12-19 16:12:46 +13:00
Yuliya Bozhko
acfe72293f MDL-42965 badges: Fix empty string comparison for Oracle 2013-12-19 10:26:44 +13:00
Jerome Mouneyrac
8e4b9a45b1 MDL-43399 Badge: the Choose... option can still be selected once a role is choosen. 2013-12-16 14:33:02 +08:00
Sam Hemelryk
c57864b76f Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges 2013-12-16 13:47:57 +13:00
Yuliya Bozhko
455d13b7e4 MDL-40551 badges: Support fully deleting badges 2013-12-16 09:29:38 +13:00
David Monllao
d1e55a47be MDL-42625 behat: Step definitions + related changes in features
In general aiming for compatibility with multiple browsers,
firefox, chrome and phantomjs to be more specific.

* Removing hardcoded waits
* Adding @_alert, @_switch_window and @_switch_frame tags,
  to label actions that different drivers have problems with.
* Adding missing @_files_upload and @_only_local tags to features that
  uploads files.
* Fixing a few wait for page ready what specified miliseconds.
* New methods to ensure elements (usual selectors), sections and editors
  are ready to interact with
* Changing the select an option implementation to deal with the different
  drivers implementations when listening to JS events.
2013-12-06 13:10:24 +08:00
Marina Glancy
07622451a3 MDL-42174 behat: deprecate upload file to filepicker step in favour of filemanager 2013-12-05 21:00:25 +11:00
Yuliya Bozhko
c8d2f392c5 MDL-42965 badges: Improve badge criteria review performance 2013-12-05 14:47:55 +13:00
Yuliya
be2b37cf4b MDL-39923 badges: Fix unit tests 2013-11-07 21:48:01 +13:00
Yuliya Bozhko
f5d17c14ea MDL-39923 badges: Send badge messages through internal messaging system 2013-11-07 14:49:27 +13:00
David Monllao
a57263d19d MDL-42332 behat: Adding a wait to let AJAX finish the request
The Mark as completed performs an AJAX request,
we need to give time to let it finish.
2013-11-05 17:13:20 +08:00
Jerome Mouneyrac
066ef320af MDL-42332 Automate MDLQA-5260 and MDLQA-5261 - A badge can be awarded based on activity and course completion + add i_trigger_cron behat step 2013-11-04 17:17:58 +08:00
Jerome Mouneyrac
68c13c6804 MDL-42331 Automate MDLQA-5258 - A teacher can add and allocate a course badge 2013-11-04 17:15:44 +08:00
Jerome Mouneyrac
844d74d788 MDL-42330 Automate MDLQA-5257 - An admin can award a site badge 2013-11-04 16:18:32 +08:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Marina Glancy
7fbe33fcf1 MDL-42400 generator: module generators call add_moduleinfo instead of direct inserts 2013-10-26 14:00:23 +11:00
Petr Škoda
d5814f4e22 MDL-41811 simplify the admin tree detection logic and fix navigation in multiple areas 2013-10-21 14:17:55 +08:00
Rajesh Taneja
0d206054f8 MDL-41811 Navigation: set admin navigation required in badges 2013-10-21 14:17:53 +08:00
Petr Škoda
e56c107da8 MDL-41811 tweak custom admin pages to force loading of admin tree 2013-10-21 14:17:53 +08:00
Eloy Lafuente (stronk7)
11182e2eb1 Merge branch 'w42_MDL-42224_m26_msgredir' of https://github.com/skodak/moodle 2013-10-16 01:23:01 +02:00
Eloy Lafuente (stronk7)
9bb34fb781 Merge branch 'MDL-42226_master' of https://github.com/markn86/moodle 2013-10-15 02:09:11 +02:00
Mark Nelson
61f039ce4b MDL-42225 badges: retrieve all the name fields when viewing the recipient list 2013-10-14 12:01:20 +08:00
Mark Nelson
5241526d20 MDL-42226 badges: retrieve all the name fields when viewing an issued badge 2013-10-14 11:59:41 +08:00
Petr Škoda
f007e89961 MDL-42224 clean up message and email redirection testing 2013-10-12 13:59:07 +02:00
Sam Hemelryk
5624b054d4 MDL-42072 badges: fixed cookie use 2013-10-11 13:49:02 +13:00
Damyon Wiese
4600853128 Merge branch 'MDL-41659_master' of https://github.com/totara/openbadges 2013-10-09 13:30:40 +08:00
Sam Hemelryk
6ac0b01175 Merge branch 'MDL-42072_master' of https://github.com/totara/openbadges
Conflicts:
	badges/assertion.php
2013-10-07 15:40:48 +13:00
Yuliya Bozhko
5dcda2f871 MDL-41659 badges: Display course/site names through format_string() 2013-10-02 08:58:02 +13:00
Yuliya Bozhko
f85ce0d900 MDL-42072 badges: Fix output and headers in badges ajax scripts 2013-10-01 16:50:54 +13:00
Sam Hemelryk
7da590c11b Merge branch 'MDL-40572_master' of https://github.com/totara/openbadges 2013-10-01 11:05:59 +13: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
Marina Glancy
0aab5cbc59 Merge branch 'MDL-40550_master' of https://github.com/totara/openbadges 2013-09-24 21:42:20 +10:00
Yuliya
853e506a1b MDL-40572 badges: Update badge assertion to use new specification 2013-09-24 12:29:54 +12:00
Petr Škoda
d79d5ac276 MDL-31501 rework user session architecture
List of changes:
 * New OOP API using PHP namespace \core\session\.
 * All handlers now update the sessions table consistently.
 * Experimental DB session support in Oracle.
 * Full support for session file handler (filesystem locking required).
 * New option for alternative session directory.
 * Official memcached session handler support.
 * Workaround for memcached version with non-functional gc.
 * Improved security - forced session id regeneration.
 * Improved compatibility with recent PHP releases.
 * Fixed borked CSS during install in debug mode.
 * Switched to file based sessions in new installs.
 * DB session setting disappears if DB does not support sessions.
 * DB session setting disappears if session handler specified in config.php.
 * Fast purging of sessions used in request only.
 * No legacy distinction -  file, database and memcached support the same functionality.
 * Session handler name included in performance info.
 * Fixed user_loggedin and user_loggedout event triggering.
 * Other minor bugfixing and improvements.
 * Fixed database session segfault if MUC disposed before $DB.

Limitations:
 * Session access time is now updated right after session start.
 * Support for $CFG->sessionlockloggedinonly was removed.
 * First request does not update userid in sessions table.
 * The timeouts may break badly if server hosting forces PHP.ini session settings.
 * The session GC is a lot slower, we do not rely on external session timeouts.
 * There cannot be any hooks triggered at the session write time.
 * File and memcached handlers do not support session lock acquire timeouts.
 * Some low level PHP session functions can not be used directly in Moodle code.
2013-09-21 13:11:56 +02: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
Sam Hemelryk
efc2c51712 Merge branch 'MDL-41637_master' of https://github.com/totara/openbadges 2013-09-16 13:51:12 +12:00
Sam Hemelryk
c4f5f0ee59 Merge branch 'MDL-40471_master' of https://github.com/totara/openbadges 2013-09-11 08:42:37 +12:00
Yuliya Bozhko
4c3f809b21 MDL-41637 badges: Update modules ids retrieval 2013-09-09 11:55:47 +12:00