59062 Commits

Author SHA1 Message Date
Dan Poltawski
354348865c Merge branch 'MDL-34137_label_dndupload' of git://github.com/davosmith/moodle 2013-02-11 14:55:13 +08:00
Damyon Wiese
1e7db9fee8 Merge branch 'master_MDL-35332' of git://github.com/totara/moodle
Conflicts:
	lib/tests/moodlelib_test.php
	version.php
2013-02-11 14:51:11 +08:00
Dan Poltawski
9d7d0c4f2b Merge branch 'MDL-37039-master' of git://github.com/damyon/moodle 2013-02-11 14:32:53 +08:00
Dan Poltawski
2ae00d0d3c Merge branch 'MDL-37122-master' of git://github.com/damyon/moodle 2013-02-11 14:24:04 +08:00
Dan Poltawski
acd561c66a Merge branch 'MDL-37797' of git://github.com/rwijaya/moodle 2013-02-11 13:58:36 +08:00
Andrew Davis
c90e6b4644 MDL-36091 added debugging() calls in blocks of code marked as "should never happen" 2013-02-11 13:24:52 +08:00
Dan Poltawski
06d8f380e9 MDL-35819 - version bump for various JS changes 2013-02-11 10:56:36 +08:00
Dan Poltawski
a614fb7457 Merge branch 'MDL-35819-m' of git://github.com/andrewnicols/moodle 2013-02-11 10:56:07 +08:00
Damyon Wiese
8dcca4aacb MDL-30637 Formslib - Cleanup for shortforms implementation (mostly comments)
Also added deprecated functions for the functions that were removed from MoodleQuickForm.
2013-02-11 10:37:13 +08:00
Damyon Wiese
40f1c065b4 Merge branch 'MDL-30637-master' of git://github.com/lucisgit/moodle 2013-02-11 10:37:03 +08:00
Andrew Robert Nicols
238b8bc9b6 MDL-35819 AJAX Rewrite Moodle popup help to be more friendly and more efficient 2013-02-10 11:50:56 +00:00
Simon Coggins
ec2d8ceb88 MDL-35332 lib: Improve security of hashed passwords 2013-02-09 06:47:57 +13:00
David Mudrák
b3c00549c5 MDL-37774 Do not pass trailing slash if the method does not want it 2013-02-08 12:05:44 +01:00
David Mudrák
d0530ed444 MDL-37774 Make moodle1_file_manager::migrate_directory() support trailing slash in rootpath
As the $rootpath is concatenated with the $relpath, we would end with a
path like course_files//file.txt. Such a path is detected as not-valid
later and an error would be thrown.

So the patch makes sure that the trailing slash is cut off and a
debugging for the developer is displayed.
2013-02-08 11:45:24 +01:00
David Mudrák
86083f9752 MDL-37774 Add unit test to illustrate the problem with the trailing slash
The patch introduces two new tests for moodle1_file_manager::migrate_directory().
The second test with the trailing slash reveals the trouble here.
The expected behaviour is that the method would deal with the trailing
slash. Debugging message for the developer should be displayed though.
2013-02-08 11:41:38 +01:00
Davo Smith
fbe4579250 MDL-34137 mod_label - resize images when uploaded via drag & drop 2013-02-08 08:13:24 +00:00
Davo Smith
785e09a7e3 MDL-32456 mod_label - support course drag and drop upload images to create labels 2013-02-08 08:13:24 +00:00
Damyon Wiese
93d1de6d3f MDL-37039 Assignment - Do not apply filters to grading table for offline assignments
Because the filters do not make sense for offline assignments, they are hidden. But if the active filter
prevents you from seeing any assignments you cannot change it. This change makes it so the filters are
also not applied when the assignment is an offline assignment.
2013-02-08 15:44:18 +08:00
Damyon Wiese
6319737865 weekly release 2.5dev 2013-02-08 11:13:54 +08:00
Damyon Wiese
7bdf7d165d ie9 svg compatibility fixes 2013-02-08 11:05:09 +08:00
Damyon Wiese
eb28bb604f Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-02-08 11:02:42 +08:00
AMOS bot
8a3ef166a9 Automatically generated installer lang files 2013-02-08 00:45:14 +00:00
Sam Hemelryk
bb4c391688 MDL-37645 cache: fixed issue deleting mongo instance 2013-02-08 08:06:21 +13:00
Ruslan Kabalin
ac5e6ca4d1 MDL-30637 Refactor Advanced fileds functionality
The displaying of advanced items has been refactored. The changes are:

* The Advanced button is replaced by the Show Less/More link
* The Show less/more link controls advanced elements only within the section
  it is located at
* The Show less/more state of sections is preserved between form submissions
* When javascript is off, all advanced elements will be displayed by default,
  no show/hide controls will exists on the page
2013-02-07 14:38:37 +00:00
Ruslan Kabalin
a4f1834dca MDL-30637 backup: Disable shortforms for backup interface
As all sections requre user attention or input, there is no sense making them
collapsed in backing up interface.
2013-02-07 14:27:02 +00:00
Ruslan Kabalin
a00bafaa65 MDL-30637 mod_resource: Make content section expanded
This just makes the interface look better
2013-02-07 14:26:14 +00:00
Ruslan Kabalin
8763343ad9 MDL-30637 mod_folder: Make content section expanded
This just makes the interface better
2013-02-07 14:23:26 +00:00
Ruslan Kabalin
9d2a7df11b MDL-30638 mod_choice: Add required elements to repeated form items
To make it work properly with MDL-30637
2013-02-07 14:19:03 +00:00
Ruslan Kabalin
a4067bfc48 MDL-30637 Simplify moodle forms
Make the forms easier to use and navigate by adding functionality to
collapse and extend form sections (headers). The logic is as follows:

If form contains 2 and less sections (headers):

* Display the form as non-collapsible at all.
* The point above can be overridden if developer marks the section as expanded
  in form definition (e.g. $mform->setExpanded('foo'));

If form contains 3 and more sections (headers):

* always expanding the first section and closing all others by default;
* always expanding a section containing at least one "required" element;
* expanding any section which contains validation errors after submission;
* expanding any section which was previously open on previous submit (e.g. when
  adding new choices);
* expanding the section which is marked as expanded in form definition (e.g.
  $mform->setExpanded('foo');
2013-02-07 14:13:36 +00: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
Marina Glancy
8fd56c1942 MDL-37572 correct active navigation node for add/edit category page 2013-02-07 15:22:29 +13:00
Marina Glancy
9d093b71af MDL-37572 small bug fix with misplaced assignment 2013-02-07 15:22:29 +13:00
Eloy Lafuente (stronk7)
d220e90fbf Merge branch 'MDL-37566-m-integration' of git://github.com/andrewnicols/moodle 2013-02-07 01:07:04 +01:00
Sam Hemelryk
e6a3f4ae27 MDL-37572 course: fixed bug when moving categories 2013-02-07 12:29:03 +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
ef5a82104c MDL-37572 - fix typo in has_any_capability() 2013-02-06 14:47:29 +08: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
Dan Poltawski
69b2f366b1 Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle 2013-02-06 13:42:47 +08:00
Jason Fowler
fc7defef99 MDL-35823 - Accessibility - Follow up changes from the original commit: addint in theme fixes and updating upgrade.txt 2013-02-06 13:36:37 +08:00
Dan Poltawski
6b106e2e8e Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle 2013-02-06 13:21:31 +08:00
Rajesh Taneja
45281abcfa MDL-30144 Assignmnet 2.2: fixed context retrival 2013-02-06 12:36:25 +08:00
Dan Poltawski
0110cc2d49 MDL-37645 Add another missing trailing ;
GRR. Clearly didn't review this one well enough!
2013-02-06 10:36:39 +08:00
Dan Poltawski
da92e1b081 Merge branch 'MDL-37645-m' of git://github.com/andrewnicols/moodle 2013-02-06 08:54:55 +08:00
Andrew Robert Nicols
2c653f9919 MDL-37645 Add missing trailing ; on some CSS rules 2013-02-05 16:56:47 +00: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
Eloy Lafuente (stronk7)
6617125ca4 Merge branch 'MDL-37870-progressive_parser_exception' of git://github.com/mudrd8mz/moodle 2013-02-05 10:19:06 +01:00
Howard Miller
540b8834fa MDL-37797 HTML block: add contextid to block_positions query and make it more unique. 2013-02-05 16:20:34 +08:00
Damyon Wiese
e2adaaf788 MDL-30062 - Fix whitespace 2013-02-05 16:07:08 +08:00