mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-01 06:22:39 +01:00
Code Issues Projects Releases Wiki Activity
60,786 Commits 36 Branches 523 Tags
Commit Graph

1913 Commits

Author SHA1 Message Date
Damyon Wiese
e0cded5d44 Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle 2013-04-16 14:32:53 +08:00
Damyon Wiese
986adc066c MDL-39092 Yuilib - remove more -coverage.js files 
Also slight tweak to the readme for someone who does not know shifter.
 2013-04-15 09:02:11 +08:00
Dan Poltawski
e8c7506a45 Merge branch 'MDL-37537' of git://github.com/srynot4sale/moodle 2013-04-12 10:26:05 +08:00
Eloy Lafuente (stronk7)
77b0357faf MDL-38887 block nav: reshifter module 2013-04-09 10:28:24 +02:00
Aparup Banerjee
eeb47dbd30 Merge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle 2013-04-09 14:21:22 +08:00
Damyon Wiese
10c56dc137 MDL-35608 Completion status block - use html_writer::link 
Just changing 2 calls from html_writer::tag to html_writer::link.
 2013-04-09 13:59:48 +08:00
Damyon Wiese
9adb30759f Merge branch 'wip-MDL-35608-master' of git://github.com/phalacee/moodle 2013-04-09 13:59:45 +08:00
Dan Poltawski
e26b02ddad Merge branch 'wip-MDL-38593-master' of git://github.com/marinaglancy/moodle 2013-04-09 11:46:27 +08:00
Marina Glancy
30142c1905 MDL-38593 Merge code from /course/category.php into /course/index.php 2013-04-09 12:21:05 +10:00
Jason Fowler
f982303d62 MDL-35608 - Blocks - Updating the Completion Status block to use HTML Writer 2013-04-09 09:50:08 +08:00
Marina Glancy
938c7dd3bc MDL-38887 dim hidden branches in navigation expanded via AJAX requests 2013-04-08 11:05:37 +10:00
Petr Škoda
d958e6bd70 MDL-34222 import simplepie 1.3.1 2013-04-07 15:35:27 +02:00
Aaron Barnes
15b97a9f21 MDL-37537 completion: Fix incorrect lang string reference in block 2013-04-06 23:33:19 +13:00
Eloy Lafuente (stronk7)
7191a59fc9 Merge branch 'MDL-38615_master' of git://github.com/dmonllao/moodle 2013-04-03 17:12:04 +02:00
David Monllao
238a6572c9 MDL-38855 blocks: Fix missing setType calls 2013-04-03 11:11:01 +08:00
David Monllao
7fcf94cb1a MDL-38615 behat: New test 
According to MDLQA-1160, a manager
can configure a block to display
throughout the site.
 2013-04-03 10:33:24 +08:00
Eloy Lafuente (stronk7)
80430739d9 Merge branch 'MDL-38785_master' of git://github.com/dmonllao/moodle 2013-04-02 20:41:00 +02:00
Yuliya Bozhko
278065528a MDL-35073 badges: Open badges integration 
The badges feature allows to integrate Mozilla "Open Badges" to issue, assign,
manage and display digital badges in Moodle. This feature supports:
-- badge creation and issuing based on criteria
-- badge baking and verification service
-- direct pushing of internal badges to external backpack
-- interanl and external badge display in Moodle
-- Moodle block to display latest badges
 2013-04-02 15:49:02 +08:00
David Monllao
2cca40c82b MDL-38785 behat: Steps definitions to add and delete comments 2013-04-02 12:07:19 +08:00
David Monllao
1fb1ccd545 MDL-38785 behat: New tests 
According to MDLQA-943, users can
add comments via a comments block
 2013-04-02 12:07:19 +08:00
Eloy Lafuente (stronk7)
68adfee6d4 Merge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle 2013-04-01 13:17:20 +02:00
David Monllao
1c00d6f636 MDL-38788 behat: Add a block and add an activity steps definitions compatible with JS disabled 2013-04-01 11:18:33 +08:00
David Monllao
c94a0d1890 MDL-38788 behat: New tests with Javascript disabled 
Add a block and add an activity/resource
tests. The add an activity with JS disabled
test includes MDLQA-2446 automation.
 2013-04-01 11:17:45 +08:00
Eloy Lafuente (stronk7)
50206449b6 Merge branch 'MDL-38516-m' of https://github.com/andrewnicols/moodle 2013-03-27 23:56:57 +01:00
Andrew Robert Nicols
81c8a42040 MDL-38516 JavaScript: Migrate moodle-block_navigation-navigation to use Shifter 2013-03-27 22:27:48 +00:00
Eloy Lafuente (stronk7)
4efcfaa3ae Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle 
Conflicts:
	lib/upgrade.txt
 2013-03-26 23:04:48 +01:00
Marina Glancy
e1d54562ce MDL-38147 deprecated get_categories(), change usage to coursecat 2013-03-25 13:23:06 +11:00
Petr Škoda
77a5c09354 MDL-37742 simplify dirty one-space oracle hack 2013-03-24 13:43:18 +01:00
Sam Hemelryk
1d8a1a87de MDL-38055 course: fixed double encoding of title properties 2013-03-20 17:27:08 +13:00
David Monllao
7532ea010a MDL-38346 behat: Quick fix to remove nasty strings 2013-03-12 15:17:23 +08:00
David Monllao
37652a9cb9 MDL-38352 behat: Updating tests 
According to non-escaped double quotes
in TableNodes. Also refactoring previous
test affected by the issue.
 2013-03-11 12:52:13 +08:00
Damyon Wiese
3d231eda76 Revert "MDL-38055 block_courseoverview: fixed formatting of course fullname" 
This reverts commit a9ff59979fbda8d26214013eb8da7440614d2bd5.
This reverts commit 4e83302f6f6b95504cc33e7a75e3694750b5621e.

This issue has failed testing and will be delayed
 2013-03-07 10:30:37 +08:00
Eloy Lafuente (stronk7)
641577eb32 Merge branch 'MDL-38352-en_fix' of git://github.com/mudrd8mz/moodle 2013-03-06 17:26:37 +01:00
Helen Foster
ca084ef149 MDL-38352 Merge English strings from the en_fix language pack 2013-03-06 16:44:39 +01:00
David Monllao
e8a88ebbd8 MDL-37958 behat: Avoid problems with Background cached steps 2013-03-06 15:49:37 +08:00
Eloy Lafuente (stronk7)
88906d068d Merge branch 'MDL-37958_master' of git://github.com/dmonllao/moodle 2013-03-05 19:28:14 +01:00
Sam Hemelryk
a9ff59979f MDL-38055 block_courseoverview: fixed formatting of course fullname 2013-03-04 09:31:35 +13:00
David Monllao
b9d551e17d MDL-37958 behat: Tests for permissions management 2013-03-01 09:52:10 +08:00
Eloy Lafuente (stronk7)
8615b484b2 Merge branch 'MDL-38001-master' of git://github.com/mouneyrac/moodle 2013-02-25 23:51:20 +01:00
Damyon Wiese
a3e57810c6 Merge branch 'wip-MDL-36287-m25' of git://github.com/samhemelryk/moodle 2013-02-25 15:49:13 +08:00
Sam Hemelryk
068ad19988 MDL-36287 block_navigation: ajax loading events are now delegated 2013-02-22 14:18:36 +13:00
Jerome Mouneyrac
ff855b9b19 MDL-38001 rename the download button into install button 2013-02-20 11:39:47 +08:00
Damyon Wiese
cfd2addf3f Merge branch 'wip-mdl-37329-new' of git://github.com/rajeshtaneja/moodle 2013-02-20 08:54:57 +08:00
Damyon Wiese
b27fc5b64f Merge branch 'wip-MDL-33774-master' of git://github.com/marinaglancy/moodle 2013-02-19 12:36:40 +08:00
Dan Poltawski
9c70147d54 Merge branch 'MDL-31983-master' of git://github.com/FMCorz/moodle 2013-02-18 15:54:22 +08:00
Frederic Massart
dd1c2f5a02 MDL-31983 navigation: Renaming the Settings block to Administration 
AMOS BEGIN
 CPY [administration,core],[pluginname,block_settings]
AMOS END
 2013-02-18 15:48:12 +08:00
Rajesh Taneja
db47f68f28 MDL-37329 Navigation: Navigation node My Courses will only show enrolled courses 2013-02-15 17:55:28 +08:00
Eloy Lafuente (stronk7)
9e7e1b1c9e MDL-38040 Clean core from CRLFs 2013-02-15 02:13:32 +01:00
Marina Glancy
9ecb50e6e3 MDL-33774 instead of checking that activity is label we check that it has view url 2013-02-14 19:46:19 +11:00
Damyon Wiese
2262c52122 Merge branch 'MDL-37012-master' of git://github.com/mouneyrac/moodle 2013-02-12 14:39:20 +08:00