Eloy Lafuente (stronk7)
|
926b08ca4b
|
Merge branch 'MDL-33623' of git://github.com/danpoltawski/moodle
|
2012-06-19 03:05:52 +02:00 |
|
Dan Poltawski
|
3248a1e1e4
|
Merge branch 'MDL-33794' of git://github.com/stronk7/moodle
Conflicts:
mod/assign/version.php
|
2012-06-18 16:08:39 +08:00 |
|
Dan Poltawski
|
f715dc3fd5
|
Merge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle
|
2012-06-18 15:35:05 +08:00 |
|
Frederic Massart
|
a41b1d96b6
|
MDL-33775 Course: fix redirect to course/section in paged mode
|
2012-06-18 15:10:33 +08:00 |
|
Eloy Lafuente (stronk7)
|
c5e783e512
|
MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700
|
2012-06-18 02:37:00 +02:00 |
|
Eloy Lafuente (stronk7)
|
b37681d59c
|
Merge branch 'MDL-33726' of git://github.com/danpoltawski/moodle
|
2012-06-15 12:16:56 +02:00 |
|
Andrew Robert Nicols
|
8ff6c5ee51
|
MDL-33769 Switch Submit and Cancel buttons around on Activity Chooser
|
2012-06-15 08:16:11 +01:00 |
|
Dan Poltawski
|
f898b935af
|
Merge branch 'MDL-33730' of git://github.com/mouneyrac/moodle
|
2012-06-15 11:07:48 +08:00 |
|
Jerome Mouneyrac
|
7a38450680
|
MDL-33730 missing description field cause error when call is done on default values
|
2012-06-14 18:16:03 +08:00 |
|
Dan Poltawski
|
00c41b4083
|
MDL-33726 course: don't list labels in section summary
Its a special 'non-activity' kind of activity ;-)
|
2012-06-14 17:24:49 +08:00 |
|
Frederic Massart
|
76055f5de4
|
MDL-33442 Course: actions bring you back where you came from
|
2012-06-14 17:07:57 +08:00 |
|
Sam Hemelryk
|
778121751d
|
Merge branch 'MDL-32767' of git://github.com/danpoltawski/moodle
|
2012-06-14 16:37:08 +12:00 |
|
Sam Hemelryk
|
f90848689c
|
Merge branch 'MDL-33554' of git://github.com/mouneyrac/moodle
|
2012-06-14 11:20:16 +12:00 |
|
Dan Poltawski
|
4413b48000
|
Merge branch 'MDL-33581' of git://github.com/mouneyrac/moodle
|
2012-06-13 17:45:27 +08:00 |
|
Sam Hemelryk
|
463ccee1de
|
Merge branch 'MDL-33128-master-1' of git://git.luns.net.uk/moodle
|
2012-06-13 15:40:39 +12:00 |
|
Dan Poltawski
|
b9c871b18a
|
Merge branch 'wip-mdl-33664' of git://github.com/rajeshtaneja/moodle
|
2012-06-13 10:07:32 +08:00 |
|
Rajesh Taneja
|
b0fc12189b
|
MDL-33664 Hub: required renderer is passed to backup->display and huburl is initalised before use.
|
2012-06-13 09:21:13 +08:00 |
|
Eloy Lafuente (stronk7)
|
dbe4bcc959
|
Merge branch 'MDL-33681' of git://github.com/timhunt/moodle
|
2012-06-13 00:06:26 +02:00 |
|
Tim Hunt
|
bb410a1ecc
|
MDL-33681 course: cannot have a section called '0'.
No reason to prevent this. It is just a matter of doing a proper test,
rather than the sloppy PHP !empty().
|
2012-06-12 17:45:40 +01:00 |
|
Dan Poltawski
|
d87debaa3e
|
MDL-32767 - course: Add a summary of activities
When in single-page summary mode
|
2012-06-12 13:13:52 +08:00 |
|
Dan Poltawski
|
2365213fdb
|
MDL-33623 - course: remove incorrect logic for marker moving
|
2012-06-11 15:11:10 +08:00 |
|
Dan Poltawski
|
3d8fe4820a
|
MDL-33623 - course: add unit tests for section moving
Including tracking of the course marker updates
|
2012-06-11 11:46:22 +08:00 |
|
Jerome Mouneyrac
|
3297d57528
|
MDL-33581 missing parameter defaults for some external functions
|
2012-06-08 11:54:59 +08:00 |
|
Dan Poltawski
|
3970a4719c
|
MDL-33593 course: rename editingenabled param
Change to notifyeditingon to better reflect what it does and
prevent people getting confused with edit=1
|
2012-06-08 10:21:58 +08:00 |
|
Andrew Robert Nicols
|
255dd8d1e2
|
MDL-33482 Replaced modchooser with chooserdialogue
|
2012-06-07 18:09:14 +08:00 |
|
Andrew Robert Nicols
|
928cc791e6
|
MDL-33573 Remove anchor from activity chooser link until JS is ready
|
2012-06-07 10:15:52 +01:00 |
|
Aparup Banerjee
|
ac16f14512
|
Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle
Conflicts:
backup/moodle2/restore_stepslib.php
|
2012-06-07 14:04:08 +08:00 |
|
Jerome Mouneyrac
|
fe77a34ed0
|
MDL-33554 update_categories didn't update the path field when moving category
|
2012-06-06 16:40:06 +08:00 |
|
Sam Hemelryk
|
e5b200cd65
|
Merge branch 'wip-mdl-33367' of git://github.com/rajeshtaneja/moodle
|
2012-06-06 15:19:49 +12:00 |
|
Sam Hemelryk
|
1236d15b0e
|
Merge branch 'MDL-33528' of git://github.com/mouneyrac/moodle
|
2012-06-06 11:13:32 +12:00 |
|
Sam Hemelryk
|
4ed1657f3e
|
Merge branch 'MDL-33441' of git://github.com/danpoltawski/moodle
|
2012-06-06 10:10:05 +12:00 |
|
Sam Hemelryk
|
2c7a72df06
|
Merge branch 'MDL-33369-master' of git://github.com/ankitagarwal/moodle with changes
|
2012-06-06 09:05:04 +12:00 |
|
Sam Hemelryk
|
5deaa764ba
|
Merge branch 'MDL-33056_dnd_status_bar' of git://github.com/davosmith/moodle
|
2012-06-06 08:30:02 +12:00 |
|
Dan Poltawski
|
7f88c42608
|
MDL-33441 course/lib.php prevent fatal error when no visible categories
|
2012-06-05 16:40:40 +08:00 |
|
Dan Poltawski
|
2812b87bab
|
Merge branch 'MDL-32581' of git://github.com/mouneyrac/moodle
|
2012-06-05 15:23:28 +08:00 |
|
Jerome Mouneyrac
|
9615b623c6
|
MDL-33528 fix create_categories warnings + default parent parameter
|
2012-06-05 13:40:12 +08:00 |
|
Rajesh Taneja
|
ac5f641465
|
MDL-33367 course: Deprecated message added to move_section, so it can be removed in 2.5
|
2012-06-05 09:34:36 +08:00 |
|
Rajesh Taneja
|
eb01aa2c34
|
MDL-33367 course: move_section reuse move_section_to function
Conflicts:
course/lib.php
|
2012-06-05 09:34:14 +08:00 |
|
Ankit Agarwal
|
336d8c49f4
|
MDL-33465 course: 'Course view section' logs should use sectionid instead of section number to generate action urls'
|
2012-06-05 09:33:45 +08:00 |
|
Ankit Agarwal
|
5249ba7405
|
MDL-33369 course: Adding support for sectionid parameter for section view pages
|
2012-06-05 08:53:04 +08:00 |
|
Jerome Mouneyrac
|
b5bd42e873
|
MDL-32919 missing default for the last params cause invalid parameter exception with REST
|
2012-06-04 09:01:39 +02:00 |
|
Juan Leyva
|
8430d87b1f
|
MDL-32919 Webservices: Added method core_course_import_course
|
2012-06-04 08:56:11 +02:00 |
|
Davo Smith
|
6c0ae99b69
|
MDL-33056 Course dnd upload - improved status box styling and added fade in/out
|
2012-06-01 11:27:42 +01:00 |
|
Jerome Mouneyrac
|
93ce0e8296
|
MDL-32581 support additional format field with all text field in extrnal lib function + new possible ws params to decide how format is returned (which are stored in a singleton)
|
2012-05-31 12:31:27 +08:00 |
|
Aparup Banerjee
|
7df02eacf7
|
Merge branch 'MDL-32779' of git://github.com/danpoltawski/moodle
|
2012-05-29 17:11:11 +08:00 |
|
Aparup Banerjee
|
4fe0673c48
|
Merge branch 'MDL-33375' of git://github.com/danpoltawski/moodle
|
2012-05-29 17:06:19 +08:00 |
|
Dan Poltawski
|
2bb9e53106
|
MDL-32779 course/format: Return to correct section
When editing a single section mode item
|
2012-05-29 16:54:04 +08:00 |
|
Dan Poltawski
|
076fbeb136
|
Merge branch 'MDL-30905-master' of git://github.com/FMCorz/moodle
|
2012-05-29 16:20:21 +08:00 |
|
Dan Poltawski
|
786cd60ee3
|
Merge branch 'MDL-32824-master-2' of git://git.luns.net.uk/moodle
Conflicts:
course/format/weeks/format.js
course/format/weeks/lib.php
|
2012-05-29 15:21:55 +08:00 |
|
Dan Poltawski
|
0ed8a933d6
|
Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle
|
2012-05-29 15:08:46 +08:00 |
|