15099 Commits

Author SHA1 Message Date
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
Marina Glancy
8fd56c1942 MDL-37572 correct active navigation node for add/edit category page 2013-02-07 15:22:29 +13:00
Andrew Robert Nicols
c5f609428d MDL-37566 AJAX Fix issues with minimum height and centring 2013-02-06 10:51:40 +00:00
Dan Poltawski
8c8d314ffd Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle 2013-02-06 14:21:03 +08:00
Jason Fowler
083c15e640 MDL-35823 - Accessibility - Readding Focus to header in the help popup 2013-02-06 14:17:29 +08:00
Eloy Lafuente (stronk7)
5ab0371d74 Merge branch 'MDL-37854_master' of https://github.com/markn86/moodle 2013-02-05 11:10:48 +01:00
Mark Nelson
17222a4a25 MDL-37854 phpunit: replaced occurrence of non-existent function assertFail 2013-02-05 18:03:25 +08:00
Damyon Wiese
33d943500f Merge branch 'wip-mdl-30062' of git://github.com/rajeshtaneja/moodle 2013-02-05 15:53:21 +08:00
Dan Poltawski
9cf44c32b5 Merge branch 'wip-MDL-37572-m25' of git://github.com/samhemelryk/moodle 2013-02-05 15:25:08 +08:00
Rajesh Taneja
791723c34a MDL-30062 Webservices: added update_course webservice 2013-02-05 14:15:53 +08:00
Damyon Wiese
4c5dc0e367 MDL-36206 Unit tests - Cleanup whitespace issues from previous patch 2013-02-05 14:11:11 +08:00
Damyon Wiese
9d6f6a6987 Merge branch 'wip-MDL-36206-master' of git://github.com/phalacee/moodle 2013-02-05 14:11:07 +08:00
Damyon Wiese
183e656eea Merge branch 'MDL-30102_master' of git://github.com/markn86/moodle 2013-02-05 11:23:01 +08:00
Dan Poltawski
ba076613d3 Merge branch 'MDL-36986' of git://github.com/moodlerooms/moodle 2013-02-05 10:47:15 +08:00
Dan Poltawski
a849391244 Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle 2013-02-05 09:29:25 +08:00
Jason Fowler
1466eccba7 MDL-35847 - Documentation - removing doc block param for on error_text 2013-02-05 09:23:54 +08:00
Dan Poltawski
43b5915e04 MDL-37574 - Fix navigation tests: remove title
We are no longer setting it, to improve accessibility
2013-02-05 08:38:32 +08:00
Eloy Lafuente (stronk7)
b97d3e46df Merge branch 'MDL-36472-master' of git://github.com/FMCorz/moodle 2013-02-05 01:28:35 +01:00
Eloy Lafuente (stronk7)
b7c238798c Merge branch 'MDL-37566-m' of git://github.com/andrewnicols/moodle 2013-02-05 01:14:07 +01:00
Eloy Lafuente (stronk7)
1df33d5427 Merge branch 'w04_MDL-37780_m25_wintests' of git://github.com/skodak/moodle 2013-02-05 01:06:40 +01:00
Eloy Lafuente (stronk7)
1615caae6f Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle 2013-02-05 00:08:44 +01: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
Dan Poltawski
78b161d39b Merge branch 'MDL-37574-m' of git://github.com/andrewnicols/moodle 2013-02-04 16:11:11 +08:00
Jason Fowler
3246648b48 MDL-35847 - Accessibility - Adding warning icon to the login error message 2013-02-04 12:49:21 +08:00
Dan Poltawski
40a008b33c Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle 2013-02-04 11:29:22 +08:00
Damyon Wiese
ef23b6ff4f Merge branch 'MDL-37177-master' of git://github.com/FMCorz/moodle 2013-02-04 11:12:45 +08:00
Andrew Robert Nicols
2f545feb89 MDL-37574 Remove default link title from navigation items 2013-02-01 11:30:02 +00:00
Andrew Robert Nicols
c1b75ece94 MDL-37566 AJAX Only set max-height for chooser dialogues
If we set height as well as max-height then there is a potential for
whitespace to be shown at the bottom of the list of choices.

This commit stops removing the height option so that we only rely upon
max-height for dialogue heigh calculation.
2013-02-01 11:21:47 +00:00
Andrew Robert Nicols
2324cf045e MDL-37645 Generalise style for moodle-core-dialogues 2013-02-01 10:20:16 +00:00
Marina Glancy
2c49fb4c3e MDL-37572 Course categories are now managed in /course/manage.php
Switching between categories view and edit no longer depend on global editing mode
/course/index.php and /course/category.php do not contain editing code
2013-02-01 08:51:34 +13:00
Frederic Massart
39bb9b1f00 MDL-36472 files: Improved file area uploads error messages. 2013-01-31 15:09:44 +08:00
Frederic Massart
d422fb22f7 MDL-37177 navigation: Prevent exception when viewing a profile
When viewing a profile as a non-authenticated user, an exception
was raised because we were trying to fetch the context of this user.
2013-01-31 12:24:37 +08:00
Petr Škoda
73d20f36cb MDL-37780 hack around some unicode date formatting issues on Windows 2013-01-30 22:36:40 +01:00
Petr Škoda
774d1d2429 MDL-37780 make sure there are no windows line endings in test files 2013-01-30 21:23:29 +01:00
Eloy Lafuente (stronk7)
f97db01978 Merge branch 'wip-MDL-37644-m25' of git://github.com/samhemelryk/moodle 2013-01-30 10:27:11 +01:00
Jason Fowler
0dbae598d7 MDL-36206 - Unit Test - Create unit test for pagination bar 2013-01-30 09:52:34 +08:00
Dan Poltawski
7543705d9b Merge branch 'w04_MDL-37726_m25_prevnext_int' of git://github.com/skodak/moodle 2013-01-30 09:18:57 +08:00
Eloy Lafuente (stronk7)
fb44a5db6f Merge branch 'w04_MDL-37734_m25_marshack' of git://github.com/skodak/moodle 2013-01-30 01:11:20 +01:00
Eloy Lafuente (stronk7)
857b40256e Merge branch 'MDL-37526-m' of git://github.com/andrewnicols/moodle 2013-01-29 23:33:22 +01:00
Petr Škoda
7a18f49c60 MDL-37726 remove PREVIOUS/NEXT from all install.xml files
YAY!
2013-01-29 22:34:46 +01:00
Petr Škoda
76f2fcdedb MDL-37726 stop using PREVIOUS/NEXT in install.xml files 2013-01-29 22:32:24 +01:00
Eloy Lafuente (stronk7)
0ed03cc295 Merge branch 'MDL-37101-master' of git://github.com/ankitagarwal/moodle
Conflicts:
	calendar/tests/externallib_tests.php
2013-01-29 15:19:11 +01:00
David Monllao
f0200d1462 MDL-37659 behat: Adding data generator definition 2013-01-29 17:25:25 +08:00
David Monllao
87bb583cbc MDL-37659 testing: New data generators
- Grouping groups
- Group members
2013-01-29 17:25:02 +08:00
Petr Škoda
dd8a39a881 MDL-37734 add one more recordset isolation test 2013-01-29 10:10:40 +01:00
Petr Škoda
0363b7826b MDL-37734 use prefetching workaround for MARS transaction problems 2013-01-29 10:10:09 +01:00
David Monllao
23ebc481e7 MDL-37657 behat: Adding definitions related with forms 2013-01-29 15:31:26 +08:00
David Monllao
b1bc8cfc65 MDL-37657 behat: Add tree nodes expansion definition 2013-01-29 15:31:25 +08:00
David Monllao
786ea937cc MDL-37657 behat: General steps definitions 2013-01-29 15:31:25 +08:00
Dan Poltawski
4653ecd3b3 Merge branch 'MDL-37046_master' of git://github.com/dmonllao/moodle 2013-01-29 15:07:48 +08:00