mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 10:26:17 +02:00
Code Issues Projects Releases Wiki Activity
64,506 Commits 37 Branches 536 Tags
Commit Graph

64506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
6d87dcebe2 MDL-42401 EditPDF: Allow dragging the edit pdf window. 
Also move the location of the call the centerDialogue so it fires after the drawing region is
added to the window.
 2013-10-24 13:50:58 +08:00
Marina Glancy
90eb4ddd9a Merge branch '42246-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-10-23 17:22:28 +11:00
Damyon Wiese
19becd541a Merge branch 'MDL-42210_master' of git://github.com/grabs/moodle 2013-10-23 14:06:04 +08:00
Damyon Wiese
db812f5e5a Merge branch 'w43_MDL-42208_m26_authunmask' of https://github.com/skodak/moodle 2013-10-23 13:37:24 +08:00
Petr Škoda
a668a7e420 MDL-42208 fix JS get_string usage and remove unnecessary params from auth password unmask init 2013-10-23 07:32:24 +02:00
Dan Poltawski
40f0a3abed Merge branch 'wip-MDL-42278-master' of git://github.com/marinaglancy/moodle 2013-10-23 13:20:08 +08:00
Dan Poltawski
8c8a844f2b Merge branch '42277-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:18:45 +08:00
Dan Poltawski
d0041fb110 Merge branch 'w43_MDL-38743_m26_private' of https://github.com/skodak/moodle 2013-10-23 13:15:48 +08:00
Dan Poltawski
de3d8fda10 Merge branch 'MDL-40531' of https://github.com/stronk7/moodle 2013-10-23 12:37:45 +08:00
Marina Glancy
d82a3b9f76 Merge branch 'MDL-42427-master' of git://github.com/ankitagarwal/moodle 2013-10-23 15:34:47 +11:00
Ankit Agarwal
f3218d15b0 MDL-42427 backup: Fix undefined errors during automated backups 2013-10-23 12:03:13 +08:00
Damyon Wiese
f45d62e792 MDL-41339 Tags - use uppercase for SQL keywords (AS) 2013-10-23 12:00:01 +08:00
Damyon Wiese
549ce3fa76 Merge branch 'wip-mdl-41339' of https://github.com/jennymgray/moodle 2013-10-23 11:50:50 +08:00
Marina Glancy
ab864f2c36 Merge branch 'MDL-42426-master' of git://github.com/damyon/moodle 2013-10-23 13:59:50 +11:00
Marina Glancy
4f10bc6bb0 Merge branch '42301-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:51:00 +11:00
Marina Glancy
63e77f410d Merge branch 'w43_MDL-42414_m26_rev' of https://github.com/skodak/moodle 2013-10-23 13:11:13 +11:00
Marina Glancy
c5df0a63bc Merge branch '42170-26' of git://github.com/samhemelryk/moodle 2013-10-23 11:43:23 +11:00
Marina Glancy
f9c86035c9 Merge branch '42316-26' of git://github.com/samhemelryk/moodle 2013-10-23 11:05:59 +11:00
Marina Glancy
295825feb6 Merge branch 'w43_MDL-37813_m26_filterall' of https://github.com/skodak/moodle 2013-10-23 10:17:00 +11:00
Dan Poltawski
34fb3545ea on demand release 2.6beta+ 
Thanks to all who entered the competition to find the mistake in the
last commit. It was spotted by none other than super-awesome Moodler
Justin Filip.

He collects a beer from me at our next available meeting.
 2013-10-22 23:05:02 +08:00
Dan Poltawski
129ceb5849 on demand release 2.5beta+ 2013-10-22 20:52:44 +08:00
Dan Poltawski
174df12acb Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-10-22 20:51:30 +08:00
Jerome Mouneyrac
6bdb788679 MDL-24380 Chat: autoscroll help popup incorrect and doesn't display fully 2013-10-22 12:35:23 +02:00
Dan Poltawski
8c3ebb1a9f Merge branch 'w43_MDL-42440_m26_authenable' of https://github.com/skodak/moodle 2013-10-22 12:16:53 +02:00
Dan Poltawski
2d79065013 Merge branch 'MDL-42112-master' of git://github.com/damyon/moodle 2013-10-22 12:16:53 +02:00
Dan Poltawski
6f4747d7b4 Merge branch 'MDL-42340-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
	theme/bootstrapbase/style/moodle.css
 2013-10-22 12:16:50 +02:00
Dan Poltawski
d4256630e7 Merge branch '40976-26' of git://github.com/samhemelryk/moodle 2013-10-22 12:14:41 +02:00
Dan Poltawski
3481222e57 MDL-42459 upgrade: fix upgrade step ordering 
Also incremented version to be safe
 2013-10-22 12:14:40 +02:00
Eloy Lafuente (stronk7)
bf928b2933 Merge branch 'MDL-42459-master' of git://github.com/damyon/moodle 
Conflicts:
	version.php
 2013-10-22 12:14:29 +02:00
Dan Poltawski
a8261e2830 Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle 2013-10-22 12:11:48 +02:00
Dan Poltawski
0c7c5e767c Merge branch 'MDL-42115-master' of git://github.com/jamiepratt/moodle 2013-10-22 12:11:45 +02:00
Dan Poltawski
616e57d926 Merge branch 'MDL-40045_master' of https://github.com/markn86/moodle 2013-10-22 12:11:45 +02:00
Marina Glancy
a90e023b4a Merge branch 'MDL-26170_rss' of https://github.com/andyjdavis/moodle 2013-10-22 12:11:44 +02:00
Dan Poltawski
59dca9505b Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle 2013-10-22 12:11:42 +02:00
Dan Poltawski
181b0b3c3e Merge branch 'MDL-42117-master' of git://github.com/andrewnicols/moodle 2013-10-22 12:11:42 +02:00
Damyon Wiese
775a32c9b8 MDL-42459 Atto: Bye bye - see you in the plugins db! 2013-10-22 12:01:56 +08:00
Andrew Davis
54eb02a45c MDL-26170 RSS: fixed RSS cache clearing when items are deleted 2013-10-22 10:29:05 +07:00
Andrew Nicols
d5367fb566 MDL-42117 JavaScript: Ensure that new activities are fully set up 
We don't need to set up anything specifically for toolboxes any more, but
other third-party JS may require additional setup following new module
creation.
 2013-10-22 11:26:44 +08:00
Andrew Nicols
b676db838b MDL-42117 JavaScript: Don't rely on node data for course toolboxes 
The YUI versions of getData and setData do not store the data in the DOM,
but in an instance of YUI. If you make modifications in one instance, but
apply them in another, then the data values are not accessible between
these two instances.

Additionally, there's no benefit to storing the instances on
initialisation - if anything, it increases the load overhead.

This change moves toolboxes to calculating their ancestors on click in the
same way it was done in the initialiser.
 2013-10-22 11:26:36 +08:00
Rajesh Taneja
1c4d953cef MDL-31405 Assignment: removed type in time shift reset status 
Assignment reset shifts time for all assignments and not specific to
assignment type, hence removed type string from reset status
 2013-10-22 11:10:32 +08:00
Marina Glancy
8f9560091f Merge branch 'MDL-42239-master' of git://github.com/ankitagarwal/moodle 2013-10-22 14:08:12 +11:00
Ankit Agarwal
9c7f855b49 MDL-42239 calendar: Fix missing ids issue with mouseover panels 2013-10-22 10:39:32 +08:00
Dan Poltawski
b750557ba0 Merge branch 'MDL-42201_master' of https://github.com/markn86/moodle 2013-10-22 10:25:44 +08:00
Ankit Agarwal
0859a08d37 MDL-42173 administration: Fix alternate name warnings during registration 2013-10-22 10:03:29 +08:00
AMOS bot
f7bff0727f Automatically generated installer lang files 2013-10-22 00:45:38 +00:00
Marina Glancy
83a3e35e56 Merge branch 'wip-MDL-42177-master-three' of git://github.com/abgreeve/moodle 2013-10-22 09:48:57 +11:00
Adrian Greeve
0c76aa984c MDL-42177 libraries: Unit tests for new functions that deal with user name fields. 
functions with unit tests: get_required_user_name_fields, get_enabled_user_name_fields,
get_disabled_user_name_fields.
 2013-10-21 14:15:15 +08:00
Adrian Greeve
1cc3a9aecc MDL-42177 libraries: Additional checking of the fullnamedisplay language string. 
If the language string is missing firstname or lastname, then when displaying the
user edit form it defaults to 'firstname lastname'

Previous logic has been moved out to new functions with unit tests.
 2013-10-21 14:15:15 +08:00
Dan Poltawski
9c5ab08e5a Merge branch 'MDL-34209-master' of git://github.com/andrewnicols/moodle 2013-10-21 13:58:14 +08:00
Jody Steele
add50b5ab0 MDL-38628 mod_assign: Allow a user to specify "No Grade" when grading an assignment submission 2013-10-21 16:47:05 +11:00