Commit graph

2070 commits

Author SHA1 Message Date
Damyon Wiese
234fdc206c Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2013-02-12 10:09:26 +08:00
Frederic Massart
506522d582 MDL-5875 forum: Option to display post word count 2013-02-11 12:08:46 +08:00
Damyon Wiese
6b219310cf MDL-37122 core get_max_upload_sizes: Include "Course/Site/Activity limit (X)" in list of options
This change removes the "0 bytes" option from the get_max_upload_sizes list
and replaces it with "Course limit (X)" or "Site limit (X)" (whichever is smaller).
This means we can remove all custom handling in the modules that were removing and
adding these options. It only affects pages that pass valid options for sitelimit and
courselimit - so admin pages will work correctly.

It also orders the list so the course/site limit options will be first
(as it will be the largest).

AMOS START
 REM [courseuploadlimit, core] has been parameterized to get [uploadlimitwithsize, core]
AMOS END
2013-02-07 10:50:52 +08:00
Damyon Wiese
183e656eea Merge branch 'MDL-30102_master' of git://github.com/markn86/moodle 2013-02-05 11:23:01 +08:00
Mark Nelson
a9a0cb691c MDL-30102 mod_forum: adding webservice function to allow for the retrieval of forum discussions 2013-02-04 19:28:29 +08:00
Petr Škoda
7a18f49c60 MDL-37726 remove PREVIOUS/NEXT from all install.xml files
YAY!
2013-01-29 22:34:46 +01:00
Andrew Robert Nicols
c112bc6069 MDL-37697 Use the correct editor format for course forums 2013-01-25 12:30:29 +00:00
Dan Poltawski
73ce4ac996 Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle 2013-01-21 10:53:12 +08:00
Sam Hemelryk
528d2633df Merge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle 2013-01-21 10:18:33 +13:00
Dan Poltawski
361dfe6572 Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle 2013-01-17 13:47:25 +08:00
Rajesh Taneja
e9c55e3993 MDL-29534 Forum: Fixed userfrom reference problem 2013-01-17 13:45:01 +08:00
Ankit Agarwal
c524394d88 MDL-37295 forum: Parse old log entries during restore 2013-01-15 13:57:40 +08:00
David Monllao
6b21986911 MDL-37457 testing Mark current classes as deprecated 2013-01-15 11:07:45 +08:00
David Monllao
5c3c2c81be MDL-37457 testing Refactoring references 2013-01-15 11:07:43 +08:00
Dan Poltawski
bf5f8a4f60 Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle 2013-01-14 14:59:22 +08:00
Eloy Lafuente (stronk7)
72a504dc2a Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle 2013-01-10 11:13:13 +01:00
Mark Nelson
941294ef43 MDL-36741 mod_forum: fixed the function forum_rss_newstuff that was using count_records_sql incorrectly as well as generating RSS content when no data exists 2013-01-10 17:59:40 +08:00
Mark Nelson
faf3016f35 MDL-37247 mod_forum: removing unnecessary variable in the get_forums web service 2013-01-10 13:45:45 +08:00
Mark Nelson
0c246ae5d9 MDL-37247 mod_forum: perform conditional checks before returning forums via web service 2013-01-10 12:47:23 +08:00
Rajesh Taneja
a7a1e05ff9 MDL-29534 Forum: if forum_replytouser is not set then send forum email using noreplyaddress. 2013-01-09 14:50:32 +08:00
Sam Hemelryk
f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
Conflicts:
	user/view.php
2013-01-09 09:34:22 +13:00
Isaac Marco Blancas
228e09cdd1 MDL-29534 Forum: If forum_replytouser is not set then don't display from user email" 2013-01-08 16:16:02 +08:00
Dan Poltawski
7378493ee9 Merge branch 'MDL-37247_master' of git://github.com/markn86/moodle 2013-01-08 12:50:44 +08:00
Mark Nelson
2b9fe87dca MDL-37247 mod_forum: adding webservice function to allow for the retrieval of forum instances 2013-01-08 12:19:49 +08:00
Sam Hemelryk
b68fb448ef Merge branch 'wip-mdl-36958' of git://github.com/rajeshtaneja/moodle 2013-01-08 14:07:03 +13:00
Sam Hemelryk
b8e551a89e Merge branch 'MDL-4781-master' of https://github.com/mackensen/moodle 2013-01-07 11:14:47 +13:00
Sam Hemelryk
083d5f8a48 Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle 2013-01-07 09:15:53 +13:00
Charles Fulton
4a112ec8c5 MDL-4781 forum: show discussion link when user has ability to view discussion 2012-12-20 05:59:41 -08:00
Matt Oquist
e9d87d90cf MDL-36958 Forum: Replaced hard-coded numbers with proper defines 2012-12-18 17:26:50 +08:00
Petr Škoda
a11aa38e80 MDL-37111 copy first post files in single type forum using intro options
This patch also removed the delete button from the first post in single
discussion type forum.

Edit button in the first post leads to the forum edit page now, this should
prevent other problems throwing first post and intro out of sync.
2012-12-15 11:23:42 +01:00
Eloy Lafuente (stronk7)
6b9dfe731e MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:11:11 +01:00
Eloy Lafuente (stronk7)
663dbbc2e6 MDL-36933 Bump everything to 2012112900
(versions, requires and dependencies)
2012-11-30 03:30:09 +01:00
Frederic Massart
261a89aaa5 MDL-36638 usability: Fix missing padding in forum headers 2012-11-28 17:36:38 +08:00
Frederic Massart
99938034df MDL-36782 usability: Adjustments following new mark as read icon 2012-11-27 13:46:21 +08:00
Mark Nelson
5fe65fd438 MDL-36741 mod_forum: fixed SQL that was generated when either timed posts or groups were enabled 2012-11-23 17:01:50 +08:00
Dan Poltawski
e4837b8a25 Merge branch 'MDL-30377_master' of git://github.com/markn86/moodle 2012-11-21 11:52:32 +08:00
Petr Škoda
40b9c0694c MDL-36436 use hacky aspect ratio to work around IE9 issues 2012-11-20 13:01:27 +01:00
Mark Nelson
737aefb454 MDL-30377 forum: do not allow users to view not yet started or expired discussions 2012-11-20 12:17:21 +08:00
Dan Poltawski
0e35ba6ffc MDL-36357 cleanup - remove double semicolons 2012-11-15 09:51:26 +08:00
Mark Nelson
3774324174 MDL-33791 Portfolio: Fixed security issue with passing file paths. 2012-11-08 00:26:13 +01:00
Dan Poltawski
90a23f067c Merge branch 'wip-MDL-36277-master' of git://github.com/barbararamiro/moodle
Conflicts:
	theme/standard/style/course.css
2012-11-06 14:58:49 +08:00
Barbara Ramiro
2df53c3ed8 MDL-36277 Usability: New Activity icons in SVG and PNG formats 2012-11-06 00:02:31 +08:00
Dan Poltawski
ec0a080a07 MDL-34527 - fix trailing whitespace 2012-11-05 13:28:16 +08:00
Sam Hemelryk
b3def15507 MDL-34527 forum: Fixed up a couple of SQL queries causing issues in Oracle. 2012-11-02 10:49:50 +13:00
Mary Evans
d895d70f9e MDL-31934 mod/forum: Added CSS fix to mod/forum/styles.css for unread forumposts also reversed a previous commit in theme/base/core.css. 2012-10-30 11:34:02 +00:00
Sam Hemelryk
2bbf03ce3b Merge branch 'wip-MDL-33857-master' of git://github.com/marinaglancy/moodle 2012-10-16 13:31:44 +08:00
Marina Glancy
722e6ba947 MDL-35339 Deprecate add_mod_to_section(), create new function course_add_cm_to_section()
Function add_mod_to_section() has very confusing arguments when object  looks like record from
table course_modules but field ->section refers to relative section number (course_sections.section).
In table course_modules the field section refers to course_sections.id.
Also add_mod_to_section() does not update table course_modules and does not call rebuild_course_cache()
which developer can forget to do afterwards.

- Added function course_add_cm_to_section()
- In the core code add_mod_to_section() is replaced with course_add_cm_to_section()
- Function add_mod_to_section() is deprecated
2012-10-15 14:08:13 +08:00
Marina Glancy
71a56e08c8 MDL-35339 avoid using get_all_sections(), get_all_mods() and field section.sequence directly 2012-10-15 14:08:13 +08:00
Marina Glancy
43aadf0401 MDL-33857 Increase performance of queries for Server files repository (small improvements) 2012-10-10 15:21:27 +08:00
Marina Glancy
b8de262139 MDL-33857 Increase performance of queries for Server files repository
- file_info class now has new methods get_non_empty_children and count_non_empty_children; added default implementation;
- all core classes extending file_info have their implementation of those methods;
- class repository_local_file used for caching get_children() results is removed;
- class repository_local rewritten to use new methods from file_info;
- added caching of retrieved modules in file_browser::get_file_info_context_module() - this query is slow and executed multiple times on big servers
2012-10-10 15:21:26 +08:00