Commit graph

56665 commits

Author SHA1 Message Date
Damyon Wiese
3f1b2800ae 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".

Conflicts:

	mod/assign/feedback/file/importziplib.php
	mod/assign/feedback/file/locallib.php
	mod/assign/feedback/offline/locallib.php
	mod/assign/locallib.php
2013-01-04 15:02:50 +08:00
Jerome Mouneyrac
7441838054 MDL-37355 Fix the REST server that didn't send back the cleaned values 2013-01-04 14:39:10 +08:00
Andrew Davis
d674a0e16f MDL-29327 core_grade: removing some code that is messing up the categories and items screen when no grade categories are used 2013-01-04 08:58:25 +08:00
Ankit Agarwal
7f7e18c3a2 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:42:18 +08:00
Ankit Agarwal
2e505a05d1 MDL-27884 Implement proper username validation during csv import 2013-01-02 14:10:16 +08:00
Ankit Agarwal
f439b4242c MDL-27884 blocks: Correcting config title string
AMOS BEGIN
 CPY [configtitle,block_html],[configtitle,block_tags]
AMOS END

Conflicts:

	blocks/tags/edit_form.php
	blocks/tags/lang/en/block_tags.php
2013-01-02 10:54:51 +08:00
AMOS bot
c2f393b2b5 Automatically generated installer lang files 2013-01-01 00:43:01 +00:00
Eloy Lafuente (stronk7)
10ad21dc9a weekly release 2.3.3+ 2012-12-30 01:05:13 +01:00
Petr Škoda
00f9bca84a MDL-36893 fix mnet E_STRICT issue 2012-12-27 14:33:37 +01:00
Petr Škoda
575d91977e MDL-37128 fix E_STRICT rss restore issue 2012-12-27 13:41:20 +01:00
Petr Škoda
a340e04df7 MDL-37301 fix missing AS in select
This was breaking pg 8.3. Credit goes to Thomas Robb, thanks.
2012-12-26 22:27:34 +01:00
Dan Poltawski
48d53d9fd6 Merge branch 'MDL-35569-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2012-12-24 11:43:41 +08:00
Dan Poltawski
cd665c200d Merge branch 'w51_MDL-37233_m23_skype' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-24 11:34:55 +08:00
Dan Poltawski
1cb195dabc Merge branch 'wip-MDL-37290-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE 2012-12-24 10:55:37 +08:00
Dan Poltawski
ca0cbfd4db Merge branch 'w51_MDL-37283_m23_spell' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-24 10:35:47 +08:00
Sam Hemelryk
76dee48562 MDL-37290 course: fixed up navbar when editing categories 2012-12-24 13:06:25 +13:00
Sam Hemelryk
185eff01fa Merge branch 'wip-MDL-35833-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE 2012-12-24 11:43:37 +13:00
Sam Hemelryk
fec305739d Merge branch 'MDL-36966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2012-12-24 11:16:07 +13:00
Sam Hemelryk
2c292b48da Merge branch 'wip-MDL-35653-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE 2012-12-24 09:40:36 +13:00
Petr Škoda
a3243760c2 MDL-37283 import tinymce spellchecker 2.0.6.1 2012-12-22 16:48:13 +01:00
Tim Hunt
18651b0bfa MDL-37068 qformat_learnwise: fix UTF8 and other issues. 2012-12-22 15:15:20 +00:00
Thanh Le
e349d18435 MDL-35794 quiz: config for whether Outcomes are advanced settings 2012-12-22 15:15:13 +00:00
Thanh Le
5b8d9521ee MDL-35792 question preview: way to update options without restarting.
It is useful, and possible, to update the display options without
restarting the question. You now only have to restart if you are
changing the maximum mark or the behaviour.
2012-12-22 15:15:06 +00:00
Petr Škoda
8d5769593d MDL-37281 fix other users current navigation node 2012-12-22 14:59:40 +01:00
Petr Škoda
92fc5a670d MDL-37152 remove bogus $mail->IsSMTP() breaking non-smtp mailing
Credit goes to Aurelijus Bruzas, thanks.
2012-12-22 14:48:47 +01:00
Petr Škoda
c92a386ba4 MDL-37254 add missing AS keyword 2012-12-22 14:13:19 +01:00
Petr Škoda
7ea870a33e MDL-37233 do not show skype status icon on https sites
Funny that the same company that implemented the IE security warnings is unable to set up SSL on the Skype status server…
2012-12-21 17:28:05 +01:00
Petr Škoda
8cc55f3058 MDL-37191 do not timeout when uninstalling plugins 2012-12-21 16:00:59 +01:00
Petr Škoda
ea0f9a277c MDL-36212 rework html entity conversions
This should resolve all html entity conversion problems in different PHP versions.
2012-12-20 22:49:20 +01:00
Eloy Lafuente (stronk7)
4a76321356 weekly release 2.3.3+ 2012-12-20 21:12:09 +01:00
Eloy Lafuente (stronk7)
e84b8c3f5c Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE 2012-12-20 20:57:28 +01:00
Jason Fowler
0fa9c9ff12 MDL-35833 - Blocks - Adding alt and title attributes to the docked-block panel close button 2012-12-20 10:41:47 +08:00
Tim Hunt
c0267dc549 MDL-32245 question bank: update URL after moving question between categories.
Also, improve the URL when you go to edit the questions in a category.
2012-12-20 12:12:37 +13:00
Andrew Robert Nicols
1365b07390 MDL-36934 Only set the autosubmit class on selects when required
The url_select class can optionally show a button (much like the non-JS
fallback). In this case, the autosubmit nature of the form shouldn't be
enforced and it should only submit on the button.
2012-12-19 12:27:17 +00:00
Adrian Greeve
eb883f0fa4 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:54:12 +08:00
Eloy Lafuente (stronk7)
9af7c81879 Merge branch 'w50_MDL-36245_m23_convert' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-18 23:43:06 +01:00
Andrew Robert Nicols
5eadb30e07 MDL-35569 AJAX Move auto-submitting selects to separate YUI module
sam note: Some changes removed from 2.4 version (deprecation warning, lib/upgrade.txt).
2012-12-18 13:56:26 +00:00
Matt Oquist
d032ed7b0c MDL-36958 Forum: Replaced hard-coded numbers with proper defines 2012-12-18 17:24:34 +08:00
Dan Poltawski
2ea7723c53 Merge branch 'MDL-37014_webdav_folders_23' of git://github.com/davosmith/moodle into MOODLE_23_STABLE 2012-12-18 14:52:41 +08:00
Dan Poltawski
568349fee7 MDL-36259 - change case of table alias to match definition 2012-12-18 14:27:13 +08:00
Dan Poltawski
60b5ffebf5 Merge branch 'MDL-36259_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-12-18 14:26:10 +08:00
Dan Poltawski
8d8158ea9c Merge branch 'MDL-30899_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE 2012-12-18 09:11:31 +08:00
Raymond Wijaya
4c1d7cf9b6 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:47:14 +08:00
Dan Poltawski
2e791b966d Merge branch 'MDL-35740-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2012-12-18 08:45:48 +08:00
Eloy Lafuente (stronk7)
af794e19f3 Merge branch 'MDL-36842_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-12-18 00:19:55 +01:00
Eloy Lafuente (stronk7)
877960cfdf Merge branch 'w50_MDL-37171_m23_outdatedexcel' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-18 00:14:04 +01:00
Adrian Fish
2ad0b3a12a MDL-37035 Pass user locale after course locale. 2012-12-18 10:32:29 +13:00
Sam Hemelryk
59fc0958d6 Merge branch 'w50_MDL-37111_m23_forumsinglefirst' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-18 10:24:32 +13:00
Sam Hemelryk
b3f46160b4 Merge branch 'MDL-37176_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE 2012-12-18 10:12:11 +13:00
Sam Hemelryk
5c65ad28b4 Merge branch 'MDL-35530_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2012-12-18 10:07:03 +13:00