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
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
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
Petr Škoda
0662bd677c
MDL-29996 remove deprecated stuff from filter code
2012-12-30 17:02:18 +01:00
Dan Poltawski
b20d65f271
Merge branch 'MDL-37037-master' of git://github.com/damyon/moodle
2012-12-24 12:23:03 +08:00
Sam Hemelryk
bef123d608
Merge branch 'MDL-36966-master' of git://github.com/damyon/moodle
2012-12-24 11:16:26 +13:00
Sam Hemelryk
296064bb9a
Merge branch 'wip-MDL-35653-master' of git://github.com/abgreeve/moodle
2012-12-24 09:40:55 +13:00
Thanh Le
d18f78b046
MDL-35794 quiz: config for whether Outcomes are advanced settings
2012-12-22 17:38:45 +00:00
Charles Fulton
4a112ec8c5
MDL-4781 forum: show discussion link when user has ability to view discussion
2012-12-20 05:59:41 -08:00
Eloy Lafuente (stronk7)
92bdda9bd9
Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle
2012-12-20 10:22:46 +01:00
Petr Škoda
cdd651a676
MDL-37171 fix some more E_STRICT issues
...
Credit goes to Mark Nelson, thanks.
2012-12-19 09:54:53 +01:00
Adrian Greeve
9daabc71ea
MDL-35653 - mod/wiki: Force format now lets users edit wiki pages.
...
Thanks to Tõnis Tartes for part of this solution.
When force format was selected in the options, trying to view the
wiki would redirect to the front page with a message saying that
you do not have permission to edit this page. Students had no way
of viewing any entries or creating the first page.
When in force format it skips a page , which would be considered
uncessary for students, but this means that the group id is not set
and this is what is causing most of the problems.
I also have included a check to see if the title is default and whether
the user has permission to view all groups. In these situations the
intermediate page is displayed.
2012-12-19 08:47:26 +08:00
Matt Oquist
e9d87d90cf
MDL-36958 Forum: Replaced hard-coded numbers with proper defines
2012-12-18 17:26:50 +08:00
Damyon Wiese
afa3e637a4
MDL-37037 Assignment Some minor refactoring of the previous patch
...
This just makes the control flow a bit easier to read.
I also added a continue button to take you back to the grading page.
2012-12-18 09:19:23 +08:00
Michael Aherne
5c77835865
MDL-37037 assign Show message if no files to download
2012-12-18 08:54:10 +08:00
Damyon Wiese
64220210de
MDL-35740 Assignment: Change the assignment index page to use a renderer.
...
This also cleans up the patch to prevent students from seeing the number of submissions for the assignment.
2012-12-18 08:44:53 +08:00
Raymond Wijaya
0c631fbef6
MDL-35740 Assignment: Hide the number of assignment submissions for all students that was visible to all students through the activities block
2012-12-18 08:44:53 +08:00
Raymond Wijaya
f81dc1222d
MDL-36966 Assignment: Bug - Student submission appears graded by themselves.
...
Fix a bug when a student editing his submission after it has been graded, it changes the 'graded by' details to the student's name in the feeback summary
2012-12-18 08:39:31 +08:00
Eloy Lafuente (stronk7)
cbef51f54b
Merge branch 'MDL-36842' of git://github.com/timhunt/moodle
2012-12-18 00:17:51 +01:00
Eloy Lafuente (stronk7)
7039c823dc
Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle
2012-12-18 00:13:45 +01:00
Sam Hemelryk
03765b2e9d
Merge branch 'MDL-37035' of git://github.com/adrianfish/moodle
2012-12-18 10:32:10 +13:00
Sam Hemelryk
d135b55323
Merge branch 'w50_MDL-37111_m25_forumsinglefirst' of git://github.com/skodak/moodle
2012-12-18 10:24:53 +13:00
Sam Hemelryk
bdd7b01a33
Merge branch 'MDL-35530' of git://github.com/rwijaya/moodle
2012-12-18 10:07:28 +13:00
Tim Hunt
4475b0ff63
MDL-36842 quiz: update accessrule upgrade.txt file in master.
2012-12-17 17:02:21 +00:00
Adrian Fish
2a457227e2
MDL-37035 Pass user locale after course locale.
2012-12-17 10:25:38 +00:00
Dan Poltawski
0b10485a03
Merge branch 'MDL-37114' of git://github.com/timhunt/moodle
2012-12-17 15:25:22 +08:00
Dan Poltawski
efda4a8340
Merge branch 'MDL-29334_master' of git://github.com/markn86/moodle
2012-12-17 13:47:44 +08:00
Petr Škoda
75427a824c
MDL-37171 fix multiple spreadsheet related PHP4isms
2012-12-15 12:36:40 +01:00
Joseph Rezeau
26efb4888f
MDL-37114 quiz form validation: feedback boundaries.
...
The feedback boundaries must either be a number or a percentage.
We were not correctly validating the non-percentage case.
2012-12-15 10:44:51 +00:00
