Aparup Banerjee
c9b0e31ff2
MDL-25840 fixed image files link not rendered correctly when attached as file (instead of inline).
2011-04-11 14:14:03 +08:00
Sam Hemelryk
cf0050f92a
Merge branch 'MDL-26185_master' of git://github.com/andyjdavis/moodle
2011-04-11 11:48:18 +08:00
Sam Hemelryk
d59d34e9a7
Merge branch 'w15_MDL-27056_m21_maxmind' of git://github.com/skodak/moodle
2011-04-11 11:42:53 +08:00
Mary Evans
c8b728139e
MDL-27063 tt styled incorrectly in canvas theme
2011-04-11 11:39:30 +08:00
Sam Hemelryk
99f2cd5435
comment MDL-27024 Removed last check within comment.js for block_comment env
2011-04-11 10:31:13 +08:00
Sam Hemelryk
1c64a9cd58
comment MDL-27024 Fixed bug that arose when a comment section didnt require pagination but the JS still looked for pageination HTML in the page
2011-04-11 10:31:13 +08:00
Sam Hemelryk
93b86f6239
comment MDL-27024 Removed last reference to the comment block within the comment API and used the options properly
2011-04-11 10:31:13 +08:00
Sam Hemelryk
d664d673a7
comment MDL-27024 Fixed up whitespace issues
2011-04-11 10:31:13 +08:00
Sam Hemelryk
116a48b133
comment MDL-27024 made notoggle and autoload into proper options to remove comment block conditions from comment API
2011-04-11 10:31:13 +08:00
Sam Hemelryk
8aab32297d
comment MDL-27024 Cleaned up HTML output in comment class
2011-04-11 10:31:13 +08:00
Sam Hemelryk
2f181b8c83
comment MDL-27024 Cleaned up use of undefined property $this->link
2011-04-11 10:31:13 +08:00
Sam Hemelryk
65f2fad9a0
mod-lesson MDL-26599 Fixed echo causing incorrect nesting.
2011-04-11 10:16:35 +08:00
Eloy Lafuente (stronk7)
14e6710d99
MDL-26896 parser - add start/end path notifications
2011-04-11 02:16:58 +02:00
Eloy Lafuente (stronk7)
b34324a73e
Merge branch 'w15_MDL-27094_m21_assval' of git://github.com/skodak/moodle
2011-04-11 01:33:17 +02:00
Eloy Lafuente (stronk7)
11ea5b96a8
Merge branch 'w15_MDL-27007_m21_userupload' of git://github.com/skodak/moodle
2011-04-11 01:20:41 +02:00
Eloy Lafuente (stronk7)
90bf8b535b
Merge branch 'w15_MDL-26910_m21_httpd' of git://github.com/skodak/moodle
2011-04-11 00:14:05 +02:00
Eloy Lafuente (stronk7)
12257f2c39
Merge branch 'w15_MDL-27121_m21_phpreq' of git://github.com/skodak/moodle
2011-04-10 23:54:21 +02:00
Eloy Lafuente (stronk7)
fa81a03257
Merge branch 'MDL-26319' of git://github.com/nebgor/moodle
2011-04-10 23:51:26 +02:00
Eloy Lafuente (stronk7)
b5f9a6d302
Merge branch 'mdl27084' of git://github.com/tlevi/moodle
2011-04-10 23:41:01 +02:00
Petr Skoda
aa25e42ba2
MDL-27094 fix incorrect assignment form validation method name
...
Credit goes to H. Hanna
2011-04-10 21:03:02 +02:00
Petr Skoda
b7e96b0ac0
MDL-27056 update location of GeoLite City file
2011-04-10 15:28:44 +02:00
Petr Skoda
4e3e8464b6
MDL-26910 add HTTPD server name whitelisting
2011-04-10 14:00:42 +02:00
Petr Skoda
998ced0805
MDL-26577 fix several groups and groupings issues
...
The current group in verified on each page which prevents problems when group settings are changed. The default group for course level is now using correct grouping id which solves problems when activity and course are using different grouping. The grouping is now displayed in group selector if user has access to all groups.
2011-04-10 13:31:17 +02:00
Petr Skoda
1c71748dd1
MDL-27121 fix incorrect check_moodle_environment() version parameter
...
This prevents Moodle 2.0 from using environment info for 2.1 in the installer and CLI upgrade.
2011-04-09 17:43:52 +02:00
Petr Skoda
02c97e653d
MDL-27007 fix incorrectly suspended user enrolment when uploading users
...
This bug surfaced after the recent change in enrol API, credit goes to Chaim Schendowich and Micky Fokken.
2011-04-09 12:09:23 +02:00
Petr Skoda
a32b68475a
MDL-25826 add more HTMLPurifier integration tests
2011-04-09 11:46:13 +02:00
Petr Skoda
7df50029b4
MDL-25826 integrate HTMLPurifier 4.3.0 and improve performance
...
The new HTMLPurifier finally caches the schema properly eliminating both extra CPU cycles and disk writes. The repeated dir exists tests might cause problems on NFS shares.
2011-04-09 11:45:24 +02:00
Petr Skoda
88efb586b4
MDL-25826 import HTMLPurifier 4.3.0
2011-04-09 10:05:27 +02:00
Andrew Davis (andyjdavis)
13ba903634
enrol MDL-25718 added ability to recover user grades from grade history
2011-04-08 15:06:27 +08:00
Andrew Davis (andyjdavis)
d3a8184239
message MDL-26185 fixed the logic around email addy in user profile Vs in messaging preferences
2011-04-07 15:58:33 +08:00
Aparup Banerjee
ca3617c513
MDL-26319 moved cancel_backup() from backup_ui to cancel_process() in base_ui and renamed callers. fix for method inheritance in restore_ui.
2011-04-07 10:39:34 +08:00
Eloy Lafuente (stronk7)
54fb7e80fc
MDL-27034 profiling - xhprof_table_sql improvement
2011-04-07 00:46:54 +02:00
Petr Skoda
6b14adf210
weekly release 2.1dev
2011-04-06 14:56:45 +02:00
Petr Skoda
a32ab0254c
Merge branch 'MDL-26784-plugin-manager' of git://github.com/mudrd8mz/moodle
2011-04-06 11:26:20 +02:00
David Mudrak
7c9b837ea9
MDL-26784 Plugin manager: make sure that filter_active already exists
...
In case of upgrade from 1.9, the table filter_active does not exist yet.
There already was this checked at another place but it is needed to test
the table existence here as well.
2011-04-06 11:24:59 +02:00
Eloy Lafuente (stronk7)
11a6763546
MDL-26425 tablelib - fix tr class typo (detected @ MDL-27034)
2011-04-06 10:58:39 +02:00
Petr Skoda
5f27855ea4
MDL-26914 fix undefined CFG langcache property during install
2011-04-06 10:50:19 +02:00
Sam Hemelryk
62f7ce7989
PULL-574 MDL-26185 Reverted changes due failed testing + review
2011-04-06 16:33:47 +08:00
Petr Skoda
1d57f8622c
revert MDL-26577 added session cleaning to groups_get_activity_group() that fixes an issue with dirty session data. refactored session cleaning into one function, added caching to reduce queries.
...
(reverse-merged from commit 0d1e49d468
) This change was causing fatal errors on the course level, I am going to fix it myself.
2011-04-05 18:33:35 +02:00
Sam Hemelryk
bbb79f47a7
messaging MDL-26185 Last minute fix of bug during integration, empty user preference causing error
2011-04-05 16:52:07 +08:00
Petr Skoda
773e3c5031
Merge branch 'MDL-26577_groups_api_refactor_take2' of git://github.com/nebgor/moodle
2011-04-05 10:19:16 +02:00
Aparup Banerjee
0d1e49d468
MDL-26577 added session cleaning to groups_get_activity_group() that fixes an issue with dirty session data. refactored session cleaning into one function, added caching to reduce queries.
2011-04-05 12:22:27 +08:00
Jonathan Harker
6e9ce8e766
MDL-22308 Update lib/bennu to latest upstream.
2011-04-05 16:00:21 +12:00
Tony Levi
05edae9f89
MDL-27084: mod/feedback fix bad syntax in database query
2011-04-05 12:14:16 +09:30
Eloy Lafuente (stronk7)
21473e6cd7
Merge branch 'wip-MDL-26560-master' of git://github.com/samhemelryk/moodle
2011-04-04 23:21:49 +02:00
Eloy Lafuente (stronk7)
b76070db70
Merge branch 'wip-MDL-26858' of git://github.com/samhemelryk/moodle
2011-04-04 21:53:17 +02:00
Eloy Lafuente (stronk7)
a7174151db
Merge branch 'MDL-11288-course-module-cloning' of git://github.com/mudrd8mz/moodle
2011-04-04 12:35:04 +02:00
Eloy Lafuente (stronk7)
4102345add
Merge branch 'master' of git.moodle.org:/git/integration
2011-04-04 12:00:30 +02:00
Eloy Lafuente (stronk7)
a70ba1b069
Merge branch 'MDL-26931-blog-post-order_master' of git://github.com/mudrd8mz/moodle
2011-04-04 11:56:44 +02:00
Petr Skoda
33620e1772
Merge branch 'MDL-26784-plugin-manager' of git://github.com/mudrd8mz/moodle
2011-04-04 11:55:39 +02:00