mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-13 20:26:32 +01:00
Code Issues Projects Releases Wiki Activity
58,138 Commits 36 Branches 523 Tags
Commit Graph

13223 Commits

Author SHA1 Message Date
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
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
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
Petr Škoda
a11aa38e80 MDL-37111 copy first post files in single type forum using intro options 
This patch also removed the delete button from the first post in single
discussion type forum.

Edit button in the first post leads to the forum edit page now, this should
prevent other problems throwing first post and intro out of sync.
 2012-12-15 11:23:42 +01:00
Damyon Wiese
0c7b691035 MDL-37165 Assignment: Oracle fix for count_submissions_with_status (and friends). 
Oracle does not like the use of AS after a join.
 2012-12-14 15:10:06 +08:00
Dan Poltawski
aa3258d586 Merge branch 'MDL-36897' of git://github.com/timhunt/moodle 2012-12-13 09:54:17 +08:00
Tim Hunt
0fe1b50c29 MDL-36897 quiz review: fixup previous commit. 2012-12-12 08:12:16 +00:00
Mark Nelson
cba235594a MDL-29334 mod_data: if site-wide presets created in <= 1.9 exist convert them to 2.x 2012-12-12 13:18:02 +08:00
Cathal O'Riordan
6d976f3f30 MDL-36644 Assignment: prepend the course upload limit to the options array 
Ensure that the course upload limit is the first option in the list of available choices for the Maximum submission size select.
 2012-12-12 08:56:59 +08:00
Dan Poltawski
7ac94cab86 Merge branch 'master_MDL-35737' of git://github.com/danmarsden/moodle 2012-12-12 08:43:29 +08:00
Eloy Lafuente (stronk7)
4ad65dc2b6 Merge branch 'm24_MDL-36641_Missing_external_package_HTTP_check' of https://github.com/scara/moodle 2012-12-11 22:42:09 +01:00
Eloy Lafuente (stronk7)
771b820285 Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle 2012-12-11 19:56:31 +01:00
Eloy Lafuente (stronk7)
6b9dfe731e MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:11:11 +01:00
Dan Poltawski
70f4fddae5 Merge branch 'MDL-37098' of git://github.com/timhunt/moodle 2012-12-11 17:51:50 +08:00
Tim Hunt
1744033ccb MDL-37098 quiz: event handler fails deleting group with no overrides 
This was a regression from MDL-35717.
 2012-12-11 09:06:19 +00:00
Dan Poltawski
cba50c0088 Merge branch 'MDL-36243' of git://github.com/jmvedrine/moodle 2012-12-11 16:24:10 +08:00
Damyon Wiese
1e4bd9fe25 MDL-30700 Assignment 2.2: Added text_sorting function to tablelib 
Allows oracle to sort by text (clob) columns (should be used sparingly).
 2012-12-11 15:42:24 +08:00
Dan Poltawski
c3c2fc538a Merge branch 'MDL-36712-master' of git://github.com/damyon/moodle 2012-12-11 14:00:25 +08:00
Dan Poltawski
021504b547 Merge branch 'MDL-36591-master' of git://github.com/damyon/moodle 2012-12-11 13:56:28 +08:00
Dan Poltawski
0fd3fb0c83 Merge branch 'MDL-36897' of git://github.com/timhunt/moodle 2012-12-11 13:54:15 +08:00
Dan Poltawski
fa18df40c1 Merge branch 'MDL-36828' of https://github.com/aolley/moodle 2012-12-11 11:44:11 +08:00
Dan Poltawski
74bf44284a Merge branch 'MDL-35476-master' of git://github.com/damyon/moodle 2012-12-11 10:49:12 +08:00
Sam Hemelryk
fc6acfe242 Merge branch 'MDL-36905' of git://github.com/rwijaya/moodle 2012-12-11 15:44:37 +13:00
Sam Hemelryk
9a8b79864a Merge branch 'MDL-36916' of git://github.com/timhunt/moodle 2012-12-11 15:42:13 +13:00
Dan Poltawski
6434a6c76e Merge branch 'MDL-34052-master' of https://github.com/damyon/moodle 2012-12-11 10:39:19 +08:00
Sam Hemelryk
0296e662a3 Merge branch 'w49_MDL-29442_m25_entityutf8' of git://github.com/skodak/moodle 2012-12-11 10:22:19 +13:00
Sam Hemelryk
4e0c4ec70d Merge branch 'MDL-36263-master' of git://github.com/damyon/moodle 2012-12-11 10:17:57 +13:00
Sam Hemelryk
5f27d13454 Merge branch 'MDL-36805-master' of git://git.luns.net.uk/moodle 2012-12-11 09:16:47 +13:00
Dan Poltawski
6aa4fccc74 MDL-36167 fix trailing whitespace 2012-12-10 17:35:58 +08:00
Dan Poltawski
76089dc378 Merge branch 'MDL-36167-master' of git://github.com/damyon/moodle 2012-12-10 17:31:41 +08:00
Damyon Wiese
8f7e1c05af MDL-36263 Assignment: Do not count submissions of unenrolled users 2012-12-10 14:54:24 +08:00