Dan Poltawski
9f780282fa
MDL-31682 - fix for online text assignments
2013-01-17 15:48:29 +08:00
Dan Poltawski
361dfe6572
Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle
2013-01-17 13:47:25 +08:00
Rajesh Taneja
e9c55e3993
MDL-29534 Forum: Fixed userfrom reference problem
2013-01-17 13:45:01 +08:00
Dan Poltawski
f2c87dd530
Merge branch 'MDL-37546-master' of github.com:damyon/moodle
2013-01-16 13:49:34 +08:00
Damyon Wiese
f93fdcef86
MDL-37546 Assignment fix assign_get_recent_mod_activity code cleanup regression.
2013-01-16 13:48:15 +08:00
Marina Glancy
a3f66bdeac
MDL-36968 Move function print_recent_activity() to the block recent_activity
2013-01-16 16:13:04 +11:00
Eloy Lafuente (stronk7)
493d8f781c
Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle
...
Conflicts:
message/tests/externallib_test.php
2013-01-15 21:50:31 +01:00
Dan Poltawski
864ff70c74
Merge branch 'MDL-36534' of git://github.com/timhunt/moodle
2013-01-15 14:44:28 +08:00
Dan Poltawski
0a9b944a15
Merge branch 'MDL-36587-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/assign/locallib.php
2013-01-15 11:19:40 +08:00
Sam Hemelryk
2a6dbdcaee
Merge branch 'MDL-37378' of git://github.com/timhunt/moodle
2013-01-15 10:43:08 +13:00
Sam Hemelryk
0fe5a201c0
Merge branch 'MDL-37030-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/assign/locallib.php
mod/assign/submission/onlinetext/locallib.php
2013-01-15 10:37:54 +13:00
Sam Hemelryk
2d971403e6
MDL-31682 mod_assign: fixed since version on new service.
2013-01-15 10:27:40 +13:00
Sam Hemelryk
ddca5610d3
Merge branch 'MDL-31682' of git://github.com/Lightwork-Marking/moodle
...
Conflicts:
mod/assign/version.php
2013-01-15 10:21:20 +13:00
Tim Hunt
5574862063
MDL-36534 question editing: clean up lang strings.
...
There were a number of lang strings in suboptimal places.
This commit fixes that, and also removed some unused strings.
AMOS BEGIN
MOV [addmorechoiceblanks,qtype_multichoice],[addmorechoiceblanks,question]
MOV [youmustenteramultiplierhere,qtype_calculated],[youmustenteramultiplierhere,qtype_numerical]
AMOS END
2013-01-14 14:52:49 +00:00
Dan Poltawski
5c2aacc21c
Merge branch 'MDL-37143-master' of git://github.com/mouneyrac/moodle
2013-01-14 15:34:29 +08:00
Dan Poltawski
bf5f8a4f60
Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle
2013-01-14 14:59:22 +08:00
Sam Hemelryk
110178c5c2
Merge branch 'MDL-37048-master' of git://github.com/ankitagarwal/moodle
2013-01-14 14:08:56 +13:00
Sam Hemelryk
8b2d3f1bef
Merge branch 'wip-MDL-35885-master' of git://github.com/phalacee/moodle
2013-01-14 13:40:06 +13:00
Sam Hemelryk
c2e2da2e69
Merge branch 'master_MDL-37394' of git://github.com/danmarsden/moodle
2013-01-14 11:46:13 +13:00
Tim Hunt
816138b4f2
MDL-37378 quiz restore: timecheckstate not in old backups.
...
We need to avoid a notice. If the value is missing, setting it to 0 is
fine. It will get sorted out the next time cron is run.
2013-01-11 13:17:13 +00:00
Dan Marsden
7b63805531
MDL-37394 SCORM: Aicc direct url fails with new nav as it has a single sco with no children - allow these to be navigated correctly.
2013-01-11 23:45:23 +13:00
Jason Fowler
beff3a9dd5
MDL-35885 - Wiki - add a legend element to the search wikis form
2013-01-11 15:29:35 +08:00
Damyon Wiese
798a060b04
MDL-32341 calendar: get_file_by_hash() expects a hash
2013-01-11 11:55:55 +08:00
Eloy Lafuente (stronk7)
72a504dc2a
Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle
2013-01-10 11:13:13 +01:00
Mark Nelson
941294ef43
MDL-36741 mod_forum: fixed the function forum_rss_newstuff that was using count_records_sql incorrectly as well as generating RSS content when no data exists
2013-01-10 17:59:40 +08:00
Mark Nelson
faf3016f35
MDL-37247 mod_forum: removing unnecessary variable in the get_forums web service
2013-01-10 13:45:45 +08:00
Mark Nelson
0c246ae5d9
MDL-37247 mod_forum: perform conditional checks before returning forums via web service
2013-01-10 12:47:23 +08:00
Rajesh Taneja
a7a1e05ff9
MDL-29534 Forum: if forum_replytouser is not set then send forum email using noreplyaddress.
2013-01-09 14:50:32 +08:00
Jerome Mouneyrac
fb695f6e3d
MDL-37354 clean return value for each externallib PHPUnit tests
2013-01-09 13:47:01 +08:00
Sam Hemelryk
7316589831
MDL-36904 mod_assign: Fixed whitespace issue
2013-01-09 12:33:29 +13:00
Sam Hemelryk
6f51092fbe
Merge branch 'MDL-35413-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/assign/locallib.php
2013-01-09 11:59:43 +13:00
Sam Hemelryk
f44e7d0a77
Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
...
Conflicts:
user/view.php
2013-01-09 09:34:22 +13:00
Isaac Marco Blancas
228e09cdd1
MDL-29534 Forum: If forum_replytouser is not set then don't display from user email"
2013-01-08 16:16:02 +08:00
Dan Poltawski
7378493ee9
Merge branch 'MDL-37247_master' of git://github.com/markn86/moodle
2013-01-08 12:50:44 +08:00
Mark Nelson
2b9fe87dca
MDL-37247 mod_forum: adding webservice function to allow for the retrieval of forum instances
2013-01-08 12:19:49 +08:00
Sam Hemelryk
b68fb448ef
Merge branch 'wip-mdl-36958' of git://github.com/rajeshtaneja/moodle
2013-01-08 14:07:03 +13:00
Eloy Lafuente (stronk7)
17e5c6e8d2
Merge branch 'MDL-35794' of git://github.com/timhunt/moodle
2013-01-07 22:40:00 +01:00
Damyon Wiese
e00b5c454c
MDL-37244 Assignment: Submission comments plugin does not implement comments callbacks.
...
This allows anyone to view or modify anyone elses submission comments.
2013-01-07 10:48:26 +08:00
Sam Hemelryk
dd89f61e68
Merge branch 'w51_MDL-29996_m25_oldfilters' of git://github.com/skodak/moodle
2013-01-07 15:22:37 +13:00
Simon Coggins
fd1d829500
MDL-35991 - use PARAM_LOCALURL for local urls
2013-01-07 10:09:20 +08:00
Dan Poltawski
f7551c2e62
Merge branch 'MDL-36667-master' of git://github.com/damyon/moodle
2013-01-07 09:42:31 +08:00
Sam Hemelryk
5fc4ac8549
Merge branch 'MDL-36855-master' of git://github.com/ankitagarwal/moodle
2013-01-07 12:05:26 +13:00
Sam Hemelryk
99f64911ee
Merge branch 'wip-MDL-7660-master' of git://github.com/abgreeve/moodle
2013-01-07 11:40:11 +13:00
Sam Hemelryk
b8e551a89e
Merge branch 'MDL-4781-master' of https://github.com/mackensen/moodle
2013-01-07 11:14:47 +13:00
Sam Hemelryk
083d5f8a48
Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle
2013-01-07 09:15:53 +13:00
Damyon Wiese
47f48152f7
MDL-35413 Assignment: Add unit tests (lots of them).
2013-01-04 15:51:08 +08:00
Damyon Wiese
e5403f8c44
MDL-36904 Assignment: Fix all errors and warnings from codechecker
2013-01-04 15:46:15 +08:00
Damyon Wiese
d6c673ed4e
MDL-36712: Assignment - Do not always send feedback available emails when grade is created
...
The entry in the assign_grades table contains grades feedback and other settings such as locked.
Only send the student an email about new feedback if it is actually grades or feedback that
has been added. This is done by using another state for the mailed flag (2) which means "unset".
2013-01-04 14:46:14 +08:00
Adrian Greeve
173c6f2c8b
MDL-7660 - mod_data: Changed the filepicker to filemanager for field elements.
...
This allows users to delete their files or pictures when editing their entries
which was previously unavailable.
Also the use of the filemanager allows for drag and drop to be active.
2013-01-04 12:17:47 +08:00
Ankit Agarwal
40652808e3
MDL-36855 scorm: update to api get_scorm_question_count()
...
get_scorm_question_count() should return 0 not 1 when no attempt is made in a scorm by any student
2013-01-03 14:40:36 +08:00