moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54573 commits 37 branches 540 tags 1.3 GiB
Commit graph

54573 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Hemelryk
a2aba3f612 Merge branch 'w21_MDL-18763_m23_avatar512' of git://github.com/skodak/moodle 2012-05-28 16:50:46 +12:00
Rossiani Wijaya
8d5745fa92 MDL-32766: course view section log: fixed typo for course_sections table 
Conflicts:

	version.php
 2012-05-28 16:46:29 +12:00
Dan Poltawski
287451dcd4 Revert "MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php" 
Breaking unit tests.

This reverts commit 4be0947bbe.
 2012-05-28 12:37:50 +08:00
Dan Poltawski
83ae05f620 Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle 2012-05-28 12:16:12 +08:00
Aaron Barnes
424a19b106 MDL-28949 course completion: Database structure fixes 2012-05-28 16:13:25 +12:00
Marina Glancy
5e11746696 MDL-33218 fixing filemanager/filepicker look in IE 
now all YUI dialogues are under the div with id #filesskin. This way we can avoid using !important in CSS and use #filesskin instead. It will have priority over YUI skin in all browswers including IE (!important does not work in IE).

Conflicts:

	files/renderer.php
	theme/base/style/filemanager.css
 2012-05-28 11:54:33 +08:00
Dan Poltawski
131bd2f68f Merge branch 'MDL-33192-master-1' of git://git.luns.net.uk/moodle 2012-05-28 11:47:22 +08:00
Barbara Ramiro
6077e3813c MDL-33218 Filemanager and Filepicker IE issue 2012-05-28 11:44:51 +08:00
Damyon Wiese
2c6a3dbfca MDL-33319: Support quickgrading in feedback plugins 2012-05-28 11:10:09 +08:00
Sam Hemelryk
d8a05d83b5 Merge branch 'MDL-32752-master-1' of git://git.luns.net.uk/moodle 2012-05-28 14:56:06 +12:00
Sam Hemelryk
681789b4c1 Merge branch 'MDL-33331-master' of git://github.com/micaherne/moodle 2012-05-28 14:52:47 +12:00
Sam Hemelryk
bb0eaec490 Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/magazine/config.php
 2012-05-28 14:49:12 +12:00
Sam Hemelryk
9757d47ebf Merge branch 'MDL-33084_strict_calc' of git://github.com/andyjdavis/moodle 2012-05-28 14:07:59 +12:00
Sam Hemelryk
d9ce6f6442 Merge branch 'MDL-32380_master' of git://github.com/kordan/moodle 2012-05-28 14:03:20 +12:00
Rajesh Taneja
33fcc04082 MDL-33347 course: section move is visible without ajax 2012-05-28 09:59:48 +08:00
Sam Hemelryk
48cb6e0b1c Merge branch 'MDL-33364' of git://github.com/stronk7/moodle 2012-05-28 13:51:22 +12:00
Sam Hemelryk
064cac7866 MDL-27675 mod_feedback: Tidy up of phpdocs and scope within feedback mod 2012-05-28 13:38:36 +12:00
Sam Hemelryk
a09a9be812 Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle 2012-05-28 13:37:59 +12:00
Dan Poltawski
4ad85bd857 MDL-33359 - mtrace: dont output to STDOUT in unit tests 
This allows us to use phpunit output buffering functions
 2012-05-28 09:36:12 +08:00
Eloy Lafuente (stronk7)
fde4c60911 MDL-33364 automated backup: return and log each course result correctly 2012-05-28 02:44:24 +02:00
Sam Hemelryk
08e0aaa173 Merge branch 'MDL-33191' of git://github.com/lazydaisy/moodle 2012-05-28 11:22:12 +12:00
Sam Hemelryk
c31081d0a4 Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle 
Conflicts:
	version.php
 2012-05-28 11:19:06 +12:00
Sam Hemelryk
c994797ea9 Merge branch 'MDL-33120' of git://github.com/stronk7/moodle 2012-05-28 11:12:36 +12:00
Sam Hemelryk
63f2813497 Merge branch 'dev_MDL-33147_transaction' of git://github.com/dongsheng/moodle 2012-05-28 11:04:43 +12:00
Sam Hemelryk
7824c9d820 Merge branch 'MDL-33325-master' of git://github.com/ankitagarwal/moodle 2012-05-28 10:52:24 +12:00
eLeDia GmbH (Andreas Grabs)
1cb73662b2 MDL-27675 - Feedback module abuses data_submitted 2012-05-28 00:40:05 +02:00
Andreas Grabs
9a2c4dbd00 MDL-27675 - Feedback module abuses data_submitted 2012-05-28 00:40:04 +02:00
Dan Marsden
d2e3a1b4f9 MDL-27368 Clean up invalid course completion records 
keep oldest timestamps from all records
 2012-05-28 08:55:57 +12:00
Eloy Lafuente (stronk7)
a60d964abc MDL-33120 book: changes in code based on amended strings 
- Replace numberingoptions_help by numberingoptions_desc.
- Delete the faq code and related styles.
- Bump version to force lang/style refresh.
 2012-05-27 17:42:53 +02:00
Helen Foster
9e302b63b9 MDL-33120 book: Amend module strings 
Al the changes are fixes but numberingoptions_help
that is one change of string key too, hence we instruct AMOS to move it.

AMOS BEGIN
 MOV [numberingoptions_help,mod_book],[numberingoptions_desc,mod_book]
AMOS END
 2012-05-27 17:31:31 +02:00
Charles Fulton
80c27aab8c MDL-27559 opendir: validate directory pointer on open 2012-05-25 08:52:12 -07:00
Ruslan Kabalin
a252a14835 MDL-33192: Prevent global DDM conflicting with others drag-drop instances. 2012-05-25 16:33:39 +01:00
Ruslan Kabalin
9f3015ecf8 MDL-32824: Make dragdrop work correctly with section titles/links 
Initially, the default section title was swapped within the course format
javascript functions. Though some section titles may be custom and does not
require swapping, in addition they may have links to single section view. This
introduces some callback functions for define what needs to be done in
sections libs and js files.
 2012-05-25 11:39:44 +01:00
Dan Poltawski
4631e39533 on-demand release 2.3dev 2012-05-25 18:07:10 +08:00
Dan Poltawski
cc8801e33d Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-05-25 18:04:43 +08:00
Dan Poltawski
e7b7cd5b98 Merge branch 'w21_MDL-33075_m23_phpunitclassreflex' of git://github.com/skodak/moodle 2012-05-25 15:25:30 +08:00
Aparup Banerjee
66905a4cf7 Merge branch 'MDL-33196' of git://github.com/rwijaya/moodle 2012-05-25 14:13:21 +08:00
Aparup Banerjee
b74ad708b1 Merge branch 'MDL-33307' of git://github.com/danpoltawski/moodle 2012-05-25 12:08:03 +08:00
Aparup Banerjee
09cb95f861 MDL-33324 Filepicker : fixed syntax. 2012-05-25 11:44:04 +08:00
Aparup Banerjee
0479a2873e MDL-33324 Filepicker : removed redundant parantheses. 2012-05-25 11:25:57 +08:00
Aparup Banerjee
708738cd73 Merge branch 'wip-MDL-33324-master' of git://github.com/marinaglancy/moodle 2012-05-25 11:25:25 +08:00
Dan Poltawski
c86d6be226 Merge branch 'MDL-29924-master' of git://github.com/FMCorz/moodle 2012-05-25 11:14:22 +08:00
Dan Poltawski
c46da75917 MDL-28557 - calendar: fix trivial whitespace issue 2012-05-25 11:08:14 +08:00
Dan Poltawski
ccee3cd67f Merge branch 'MDL-28557' of git://github.com/bostelm/moodle 2012-05-25 11:07:14 +08:00
Dan Poltawski
9a16bd1798 Merge branch 'w22_MDL-33114_m23_tinymce3511' of git://github.com/skodak/moodle 2012-05-25 11:00:53 +08:00
Dan Poltawski
588d3a7e1f Merge branch 'MDL-33135-master-3' of git://git.luns.net.uk/moodle 2012-05-25 10:55:49 +08:00
Dan Poltawski
ada7dbd93a Merge branch 'w21_MDL-27575_m23_skype' of git://github.com/skodak/moodle 2012-05-25 10:44:47 +08:00
Dan Poltawski
10a9d27d74 Merge branch 'w21_MDL-33034_m23_roletests' of git://github.com/skodak/moodle 2012-05-25 10:37:48 +08:00
Dan Poltawski
488656491d MDL-29836 webservice: version bump to pickup new string 2012-05-25 10:36:43 +08:00
Vadim Dvorovenko
5e963820a5 MDL-29836 webservices: use individual string 
To allow accurate transalation
 2012-05-25 10:33:02 +08:00