Commit graph

54817 commits

Author SHA1 Message Date
Fred Woolard
fd626c4109 MDL-34072: Adjust SQL for Oracle. Remove subquery alias altogether. 2012-07-12 10:54:59 -04:00
Dan Poltawski
3b52187e25 weekly release 2.3.1+ 2012-07-12 15:57:26 +08:00
Dan Poltawski
f7d874c76f Merge branch 'install_23_STABLE' of git://github.com/amosbot/moodle into MOODLE_23_STABLE 2012-07-12 15:50:04 +08:00
Sam Hemelryk
9f7f501c0a Revert "MDL-33575 choice module: add label to checkbox element when privacy of results is set to publish full results"
This reverts commit f19cd42709.
2012-07-12 18:21:00 +12:00
AMOS bot
294c228272 Automatically generated installer lang files 2012-07-12 00:32:25 +00:00
Dan Poltawski
4697c46706 Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-11 14:51:07 +08:00
Petr Škoda
df7799d989 MDL-34175 one more hardcoded /admin/ in mnet 2012-07-11 08:48:04 +02:00
AMOS bot
89375aac4c Automatically generated installer lang files 2012-07-10 20:33:18 +02:00
Petr Skoda
229aabf7c6 MDL-33712 add support for unique moodle tags in tinymce 2012-07-10 15:56:11 +08:00
Marina Glancy
d6571ad763 MDL-33950 Correctly initialise repository and check access in js and non-js filepicker 2012-07-10 14:57:46 +08:00
Marina Glancy
95991122ab MDL-33473,MDL-33950,MDL-33837 Allow non-js filepicker to pick files from moodle repositories
- MDL-33473 actually make non-js filepicker to work with local repositories
- MDL-33950 validate that file is accessible
- MDL-33837 when picking a server file marked as main, do not make it main in current filearea
2012-07-10 14:57:41 +08:00
Marina Glancy
db81525850 MDL-33950 check if source file is accessible in repository_ajax.php
- repository::copy_to_area() does not check access any more, and repository_recent::copy_to_area() is unnecessary
- added repository::file_is_accessible() that checks access to the picked file (regardless of accessibility of the file it is referencing to)
2012-07-10 14:57:35 +08:00
Dan Poltawski
b2e5a60773 MDL-34159 - add comment lost from previous commit 2012-07-10 12:58:46 +08:00
Dan Poltawski
57c7815213 Merge branch 'w28_MDL-34159_m23_wherelist' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-10 12:56:07 +08:00
Petr Škoda
95896749a5 MDL-33617 add new index to improve perf of enrol related role_assignments
Conflicts:

	version.php
2012-07-10 15:49:38 +12:00
Petr Škoda
c8b7088463 MDL-33887 delay string fetching in PAGE->requires->string_for_js() till page footer
This should resolve problems with language switching such as when forcing course language.
2012-07-10 15:08:26 +12:00
Michael Aherne
c82d7fc832 MDL-34156 Remove subselect from slow query 2012-07-10 10:53:40 +08:00
Dan Poltawski
1f34fa79c2 Merge branch 'w28_MDL-34147_m23_cygwin' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-10 10:31:24 +08:00
Dan Poltawski
806129b06e Merge branch 'MDL-34171_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-07-10 09:25:22 +08:00
Petr Škoda
eb88700a56 MDL-34155 use course visibility default when creator does not have moodle/course:visibility 2012-07-10 12:49:14 +12:00
Sam Hemelryk
3ca82ed605 Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-10 12:43:42 +12:00
Dan Marsden
6b8399df5e MDL-34198 SCORM remove unecessary get_records call 2012-07-10 08:34:42 +08:00
Marina Glancy
68ea10b079 MDL-33444 Upload repository can specify custom label for filepicker 2012-07-10 12:31:12 +12:00
Marina Glancy
2eb66f3500 MDL-34139 filemanager select-file dialogue should update file on Enter 2012-07-10 12:24:08 +12:00
Sam Hemelryk
bd75b67885 Merge branch 'MDL-29470-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-10 12:09:26 +12:00
Sam Hemelryk
3936796042 Merge branch 'MDL-32297-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-10 12:05:33 +12:00
Davo Smith
b43bb8da94 MDL-34107 Upload repository - do not add a dot to files without an extension 2012-07-10 11:47:48 +12:00
Dan Poltawski
898010f1aa MDL-34061 mod_resource: filter settings weren't coming from defaults 2012-07-10 11:40:33 +12:00
Charles Fulton
d563d48694 MDL-27800 admin: make front page restore link consistent 2012-07-10 11:32:31 +12:00
Dan Poltawski
0dd189d59d Merge branch 'MDL-18301-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-09 14:27:15 +08:00
Dan Poltawski
d6cf442059 Merge branch 'MDL-32057_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE 2012-07-09 14:14:13 +08:00
Dan Poltawski
2bf17d606b Merge branch 'w28_MDL-34046_m23_stalefiles' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-09 13:50:16 +08:00
Dan Poltawski
1583e17c65 Merge branch 'MDL-33030_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2012-07-09 13:42:32 +08:00
Dan Poltawski
d85083312c Merge branch 'wip-mdl-29969-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE 2012-07-09 13:39:18 +08:00
Dan Poltawski
1e838c4e30 Merge branch 'MDL-34077-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-09 13:37:34 +08:00
Gilles-Philippe Leblanc
65ab8112a3 MDL-33822 SCORM Interactions report - fix formatting of empty cells. 2012-07-09 17:24:29 +12:00
Dan Poltawski
9309b2dba8 MDL-17395 auth_email: clarify description 2012-07-09 17:19:41 +12:00
Barbara Ramiro
b002b36ed3 MDL-33795 Increased file picker width and height 2012-07-09 17:14:12 +12:00
David Balch
d36249d6d6 MDL-34143 Add file type information for .mdb .accdb (MS Access databases) 2012-07-09 13:05:40 +08:00
Dan Poltawski
41bb2c3a59 Merge branch 'wip-mdl-33943-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE 2012-07-09 11:35:02 +08:00
Ankit Agarwal
918f6d2c34 MDL-27831 calendar: Removing reduntand control icons in delete.php 2012-07-09 11:31:12 +08:00
Dan Poltawski
3a429ca204 Merge branch 'MDL-33885-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-09 10:31:52 +08:00
Ruslan Kabalin
d212244375 MDL-33890 Make course blocks less theme dependant
This fix checks that the empty block region is actaually the standard one, so
it can be hidden. The blocks move operating area is not resticted to page
content any more.
2012-07-09 10:02:34 +08:00
Sam Hemelryk
f19cd42709 MDL-33575 choice module: add label to checkbox element when privacy of results is set to publish full results 2012-07-09 10:56:28 +12:00
Sam Hemelryk
9bf1621fbc Merge branch 'MDL-30816_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2012-07-09 10:28:45 +12:00
Dan Poltawski
aacf3222df MDL-33514 - rss: also exclude suspended users feeds
Thanks Petr!
2012-07-09 10:24:41 +12:00
Dan Poltawski
6b4c491cb4 MDL-33514 - rss: only retrieve RSS feeds for valid users 2012-07-09 10:24:40 +12:00
Tim Hunt
69a600a067 MDL-34171 qformat_gift: Fix edge case with special character escaping.
We need to escape \ on export, because it is un-escaped on import.
2012-07-06 10:48:20 +01:00
Petr Škoda
fe6d428185 MDL-34046 improve mixed files upgrade error
Credit goes to Gordon Bateson.
2012-07-06 08:01:02 +02:00
Petr Škoda
880f8e7b84 MDL-34147 use cygwin style paths in phpunit hints 2012-07-06 07:59:04 +02:00