Eloy Lafuente (stronk7)
4b7b1aae4d
MDL-31957 Course reset: Add missing global
2012-08-23 02:12:39 +02:00
Jean-Michel Vedrine
9832fde1c0
MDL-34738 fix for the problem found during testing : dat files not accepted on some servers
2012-08-22 16:38:08 +02:00
Eloy Lafuente (stronk7)
364666f371
Merge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
2012-08-22 11:14:38 +02:00
Dan Poltawski
e1269d87d4
MDL-34444 - actually display the title, just don't link it..
...
Don't worry, i'm going on holiday, so i'll be away from this git repo
for a while to prevent any more mess.
2012-08-22 17:10:38 +08:00
Eloy Lafuente (stronk7)
a701525345
Merge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
2012-08-22 10:49:30 +02:00
Dan Poltawski
ccce6a7e33
MDL-34444 course - don't show to 'unavaibile' sections title
...
Instead we just show the availability info in the index page,
this makes the navigation etc much simpler.
2012-08-22 16:40:43 +08:00
Dan Poltawski
29beeefc70
Revert "MDL-34444 course: show section availability info"
...
Turns out this change was just wrong, we shouldn't be allowing linking
to unaavilable sections. Just show the availability information on the
'index page'
This reverts commit 87a31bb5d8
.
2012-08-22 16:37:36 +08:00
Eloy Lafuente (stronk7)
6c475847fb
Merge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
2012-08-22 08:40:02 +02:00
Dan Poltawski
363b35f221
Merge branch 'w34_MDL-34864_m23_enrolcat' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-08-22 14:28:03 +08:00
Petr Škoda
f813d99296
MDL-34864 fix role names regression
2012-08-22 08:08:24 +02:00
Dan Poltawski
e03a03a4a9
Merge branch 'MDL-35000_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-08-22 10:32:01 +08:00
Dan Poltawski
a4241511ed
MDL-34870 enrol_cohort - don't need to do useless work
2012-08-22 10:03:10 +08:00
Dan Poltawski
fb4e6948d0
Merge branch 'MDL-34870_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE
2012-08-22 09:52:58 +08:00
Dan Poltawski
70dc5add7d
Merge branch 'MDL-34733_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-08-22 09:16:18 +08:00
Eloy Lafuente (stronk7)
f16751f856
Merge branch 'wip-mdl-32759-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
2012-08-22 02:34:04 +02:00
Eloy Lafuente (stronk7)
69be24a776
Merge branch 'MDL-34702_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-08-22 02:11:07 +02:00
Eloy Lafuente (stronk7)
b74390e38b
Merge branch 'MDL-34795-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
2012-08-22 02:05:17 +02:00
Eloy Lafuente (stronk7)
e464af4462
Merge branch 'w34_MDL-34864_m23_enrolcat' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-08-22 01:58:35 +02:00
Eloy Lafuente (stronk7)
ea438c8d7b
Merge branch 'w34_MDL-34776_m23_notinsql' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-08-22 01:56:06 +02:00
Eloy Lafuente (stronk7)
bae745aa57
MDL-34866 whitespace fix
2012-08-22 01:50:53 +02:00
Eloy Lafuente (stronk7)
0547143fad
Merge branch 'MDL-34866_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
2012-08-22 01:50:19 +02:00
Eloy Lafuente (stronk7)
864ca7d700
Merge branch 'w34_MDL-34893_m23_phpunitparams' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-08-21 21:18:44 +02:00
Tim Hunt
fa0ed51c0a
MDL-35000 quiz: Complete activity report broken by bad require.
...
Fix the stupid error that caused this. Also, make all the other
require_once calls in the file consistent.
2012-08-21 18:03:14 +01:00
Tim Hunt
d7b7aff004
MDL-34733 quiz 'secure' mode: finish review link broken in previews
...
Here, we use a nasty hack to fix the problem on stable branches without
an API change.
2012-08-21 12:05:52 +01:00
Dan Poltawski
5a566ceac7
Merge branch 'MDL-34691_assign_overdue_by_23' of https://github.com/SWiT/moodle into MOODLE_23_STABLE
2012-08-21 14:37:10 +08:00
Dan Poltawski
82157094e5
Merge branch 'MDL-32705_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-08-21 12:37:54 +08:00
Dan Poltawski
115ad6cc9e
Merge branch 'MDL-34569_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-08-21 12:35:14 +08:00
Dan Poltawski
f6376dcbae
Merge branch 'w34_MDL-34901_m23_useraccess' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-08-21 12:02:25 +08:00
Dan Poltawski
ed22220593
Merge branch 'MDL-34742-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
2012-08-21 11:59:30 +08:00
Dan Poltawski
8172f3b2d3
MDL-34808 qformat_examview - increment version
2012-08-21 11:05:58 +08:00
Dan Poltawski
b02734b77d
Merge branch 'MDL-34808_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
2012-08-21 11:00:49 +08:00
Raymond Wijaya
8c74ab8623
MDL-34887: Add hyperlinks to names in the Assignment's grading table
2012-08-21 10:58:09 +08:00
Dan Poltawski
b747690361
MDL-34738 qformat_blackboard - increment version number
2012-08-21 09:55:50 +08:00
Dan Poltawski
d73f22d94e
Merge branch 'MDL-34738_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
2012-08-21 09:42:12 +08:00
Eloy Lafuente (stronk7)
181884b480
Merge branch 'MDL-34941-MOODLE_23_STABLE' of https://github.com/mouneyrac/moodle into MOODLE_23_STABLE
2012-08-21 02:43:10 +02:00
Eloy Lafuente (stronk7)
9b7738c8fb
Merge branch 'w34_MDL-34912_m23_description' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-08-21 02:39:58 +02:00
Eloy Lafuente (stronk7)
a130109013
Merge branch 'MDL-34889_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-08-21 02:25:28 +02:00
Eloy Lafuente (stronk7)
ac97fc2122
Merge branch 'MDL-34810_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-08-21 01:36:36 +02:00
Eloy Lafuente (stronk7)
9da82e9ba3
Merge branch 'MDL-29847_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-08-21 01:28:50 +02:00
Eloy Lafuente (stronk7)
0c6800e771
Merge branch 'MDL-31957-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
2012-08-21 01:23:05 +02:00
Eloy Lafuente (stronk7)
3dd2dce1cb
Merge branch 'w34_MDL-34959_m23_gmapsv3' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-08-20 20:30:27 +02:00
Eloy Lafuente (stronk7)
1c5f24e089
Merge branch 'w34_MDL-34868_m23_gmapsv2' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-08-20 20:18:03 +02:00
Eloy Lafuente (stronk7)
331d346e8f
Merge branch 'MDL-34756-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
2012-08-20 16:35:20 +02:00
Eloy Lafuente (stronk7)
8ee474b89e
Merge branch 'MDL-28531-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
2012-08-20 16:28:21 +02:00
Jason Ilicic
3f7df55d1c
MDL-34529: Fixed ordering of course sections when performing import/restore by adding the sort parameter.
2012-08-20 14:00:26 +02:00
Nathan Mares
c6d7689621
MDL-34372: Fix query in backup_cron_helper so it works on Postgres 8.3
...
Amended by stronk7@moodle.org to use uppercase SQL keywords.
2012-08-20 13:28:37 +02:00
Jean-Michel Vedrine
2e941f3356
MDL-34808 load sample xml file from fixtures in tests
2012-08-20 10:47:31 +02:00
Dan Poltawski
bab65024ad
Merge branch 'MDL-33362-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
2012-08-20 16:01:21 +08:00
Dan Poltawski
dcf82e6079
Merge branch 'MDL-34779-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
2012-08-20 15:59:00 +08:00
Jean-Michel Vedrine
f3ad0ed27d
MDL-34738 load sample dat file in tests
2012-08-20 09:52:53 +02:00