1567 Commits

Author SHA1 Message Date
Sam Hemelryk
0dd46bb851 Merge branch 'MDL-38317-master' of git://github.com/StudiUM/moodle 2013-09-17 08:39:14 +12:00
Sam Hemelryk
cf13da65e1 Merge branch 'MDL-36316-master' of git://github.com/danpoltawski/moodle 2013-09-16 13:13:41 +12:00
Jean-Philippe Gaudreau
3aaa906b1e MDL-38317 grade import: Translation support for import mappings form. 2013-09-13 08:49:58 -04:00
Dan Poltawski
378b3eac83 MDL-36316 useragent: Reduce user agent sniffing
* core_useragent: Introduce is_vendor methods to improve readability
  when we are just detecting if a browser is from a vendor, rather than
  the exact version

* Remove uncessary browser version checks when we are just detecting
  vendors - this makes the intention of our sniffing clearer.

* Remove sniffing for browsers which we do not support, grades/ajax/tinymce
  all support modern browsers so there is no need to sniff for them.
2013-09-13 14:25:37 +08:00
Damyon Wiese
b4c6b42eb6 Merge branch 'wip-MDL-40347-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
	theme/upgrade.txt
2013-09-10 09:40:10 +08:00
Mary Evans
4e2b37db07 MDL-40347 grade/report/grader: cleaned up grade/report/grader/styles.css. 2013-09-08 23:17:29 +10:00
Mary Evans
edb7d5ad84 MDL-40347 grade/report/grader: Fixes: Grade report does not highlight some cells properly.
Squashed commit of the following:

commit 2c2164a7e27bd2b81102251420892386e39edecc
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 20 12:59:47 2013 +0100

    MDL-40347 theme: Modified upgrade.txt and created bootstrapbase/upgrade.txt.

commit 4449975a0f9249785ed152f63786bf7974c1776e
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 13 18:42:20 2013 +0100

    MDL-40347 grade/report/grader: added RTL css previously in bootstrapbase/less/moodle/grade.less to styles.css

commit b0af8f05a411b3dbb1d9c162a0d65c7f9c069c0f
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 13 12:42:02 2013 +0100

    MDL-40347_M26 grade/report/grader: cleaned up grade/report/grader/styles.css.

commit 52627137dc662d47cbfdf023d056baf102f29d8a
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Jul 6 17:15:12 2013 +0100

    MDL-40347 grade/report/grader: Grade report does not highlight some cells properly.

    Merged/squashed original commit by Marina Glancy who:
    - added class 'i123' to each cell in the column
    - changed JS to highlight the cells with this class instead that cells with the column number
    - changed grade report css so the .vmarked and .hmarked classes have higher priority for all rows
    - made cells in 'average range' row td instead of th
    - little corrections to css: removed background image for some cells with .header css class
    - MyMobile theme disabled cells highlighting, make sure it disables it in all cases

    Merged/squashed original commit Mary Evans who:
    - removed theme/bootstrapbase/less/moodle/grade.less
    - removed @import "moodle/grade"; from bootstrapbase/less/moodle.less
    - removed reference to plugins_exclude_sheets for grader in both bootstrapbase/config.php and clean themes/config.php
    - commented out .hidden from bootstrapbase/less/bootstrap/responsive_utilities.less
    - made minor changes to grader/style.css
2013-09-08 23:16:47 +10:00
Petr Škoda
5e95223e86 MDL-28094 keep subdirs in content upgraded from 1.x 2013-09-07 11:30:19 +02:00
Dan Poltawski
98c2189d62 MDL-31890 version bump
(and trailing whitespace fix)
2013-09-03 09:55:08 +08:00
Dan Poltawski
6affe9e695 Merge branch 'wip-MDL-31890-master' of git://github.com/marinaglancy/moodle 2013-09-03 09:53:22 +08:00
Dan Poltawski
5972292444 Merge branch 'MDL-36093-master' of github.com:StudiUM/moodle 2013-09-02 14:10:28 +08:00
Marina Glancy
dd8b6a19dd MDL-31890 corrected whitespaces and phdocs 2013-09-02 10:27:12 +10:00
Paul Charsley
9028d9b513 MDL-31890 added core_grading_get_gradingform_instances web service
function
2013-09-02 09:00:39 +12:00
Jean-Philippe Gaudreau
70be44309e MDL-36093 grade export: Fix HTML special characters printed litteraly. 2013-08-28 09:12:45 -04:00
Sam Hemelryk
c3d2fbf9cd MDL-40931 useragent: separated user agent functionality into a lib
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
2013-08-26 13:59:19 +12:00
Dan Poltawski
c232da0432 Revert "MDL-36044 - Delete Icon ("X") blocks Score numbers, when in RTL mode (mod/assign , Rubrics editor)"
This reverts commit 42fabe1e87da7eb9ca5e5f3414402a357babcc3e.
2013-08-22 17:36:16 +08:00
Damyon Wiese
9ead041cdb Revert "MDL-40931 useragent: separated user agent functionality into a lib"
This reverts commit af62237d0e6e27df868d50848f7098f57c103f86.
This reverts commit 87a4194fdcd322d4aee5a6207b55a8da0864da94.
This reverts commit b2c66eb60c01805f26cc791966f05be52af7b406.

Conflicts:

	version.php
2013-08-22 13:31:25 +08:00
Damyon Wiese
74df2951d1 Revert "MDL-39876 Change get_record('course') calls to get_course"
This reverts commit ab7632b74c331540c90229bf03d13aa2e6bdd9be.
2013-08-21 13:42:30 +08:00
Sam Hemelryk
6eee89bc8f Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle
Conflicts:
	course/lib.php
2013-08-21 12:08:46 +12:00
Damyon Wiese
89959d9ad1 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle 2013-08-20 16:45:33 +08:00
Nadav Kavalerchik
42fabe1e87 MDL-36044 - Delete Icon ("X") blocks Score numbers, when in RTL mode (mod/assign , Rubrics editor) 2013-08-18 17:40:00 +03:00
Sam Hemelryk
af62237d0e MDL-40931 useragent: separated user agent functionality into a lib
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
2013-08-16 09:02:01 +12:00
sam marshall
ab7632b74c MDL-39876 Change get_record('course') calls to get_course 2013-08-15 11:31:20 +01:00
Tim Hunt
3987312883 MDL-31487 fix FEATURE_CONTROLS_GRADE_VISIBILITY for quiz.
This is a followup to MDL-18301. That fix missed the following points:

1. On the edit categories and items screens, all items had an eye-con to
control the visibility, even if the visibility was controlled by the
module.

2. Changing the visibility of a grade category change the visibility of
all items within it, even if the visibility was controlled by the
module.

3. The quiz ingored $cm->visible when controlling whether its grade item
was visible.
2013-08-08 10:03:47 +01:00
Petr Škoda
2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
Sam Hemelryk
2ad4a763ab Merge branch 'wip-mdl-40469' of git://github.com/rajeshtaneja/moodle 2013-08-06 17:36:33 +12:00
Sam Hemelryk
b09abb05ab Merge branch 'w32_MDL-40901_m26_phpunitcleanup2' of https://github.com/skodak/moodle 2013-08-06 08:53:24 +12:00
Damyon Wiese
1196cc4d28 MDL-30852 grade report: More coding guideline cleanups. 2013-08-05 11:23:29 +08:00
Petr Škoda
8252b7c291 MDL-40901 standardise core test case class and file names
This finally allows us to type only the class name when executing individual core test cases.
2013-08-04 22:10:31 +02:00
Damyon Wiese
e1e9ade581 MDL-30852 grade: Coding style fix for user report. 2013-08-02 14:40:23 +08:00
Steve Bader
f19dd840ff MDL-30852 grade report: Add aria attributes
Converted to git branch by Damyon
2013-08-02 13:57:27 +08:00
Rajesh Taneja
c597ff32ef MDL-40469 Gradebook: Fixed setType warning while exporting gradebook with publishing set 2013-08-01 10:31:25 +08:00
Tim Hunt
9e1fe42150 MDL-40854 fix mod/...:view capabilities
Prior to the fix, if you did not have a capability like mod/page:view,
then you woulds still see the link to the Page activity in the course
section, but when you clicked on it, you would run into a
require_capability error.

It is a principle that we never show users a link to a page they are not
allowed to access, therefore, when users do not have mod/...:view, they
should not see the link on the course page.

This patch implements this in the cm_info class, in a similar way to how
access restrictions by groups works.

It does not assume that the mod/...:view capability exists. If the
capability does not exist, then users are not prevented from seeing the
link.
2013-07-26 11:44:43 +01:00
Damyon Wiese
7ea41b4a94 Merge branch 'wip-MDL-39748-master' of git://github.com/phalacee/moodle 2013-07-23 14:16:31 +08:00
Jason Fowler
7e222836f0 MDL-39748 - Grading Methods - Fixing input field widths for Rubrics 2013-07-23 12:06:38 +08:00
Eloy Lafuente (stronk7)
f2515968d2 Merge branch 'wip-MDL-33563-master' of git://github.com/marinaglancy/moodle 2013-07-22 22:36:23 +02:00
Eloy Lafuente (stronk7)
252e545e9f Merge branch 'MDL-40626-master' of git://github.com/danpoltawski/moodle 2013-07-22 17:40:03 +02:00
Mark Nelson
4e829d48d1 MDL-40468 libraries: removed usages of get_related_contexts_string() in core
Also tidied up the functions by removing unused parameters.
2013-07-19 15:17:50 +08:00
Marina Glancy
09b83b85de MDL-33563 Version bump for grading methods API change 2013-07-19 15:13:24 +10:00
Marina Glancy
170f6e60a2 MDL-33563 Grading methods allow decimal grades 2013-07-19 15:12:40 +10:00
Tim Lock
986c833743 MDL-40626 gradebook: Prevent incorrect override with multiline feedback
The quick grading option doesn't allow mutliline editing.
2013-07-19 12:00:24 +08:00
Petr Škoda
56da374e1e MDL-40220 use new core_component::normalize_component() 2013-07-16 22:41:00 +02:00
Petr Škoda
bd3b3bba9f MDL-40220 use new core_component::get_plugin_list() 2013-07-16 22:36:11 +02:00
Mark Nelson
dd33f4af0a MDL-40462 libraries: deprecated get_course_context() 2013-07-11 13:28:45 +08:00
Adrian Greeve
12b4487ef3 MDL-31776 - lib: Alternate name fields - update of gradebook sql query. 2013-07-10 17:41:06 +08:00
Damyon Wiese
ef5fd5bf40 Merge branch 'wip-mdl-40400' of git://github.com/rajeshtaneja/moodle 2013-07-09 16:05:02 +08:00
Damyon Wiese
a6673a8b04 Merge branch 'MDL-40369-master' of git://github.com/FMCorz/moodle 2013-07-09 15:28:31 +08:00
Ankit Agarwal
0601e0eef6 MDL-40402 libraries: Replace get_system_context() with context_system::instance() in core 2013-07-04 15:41:06 +08:00
Rajesh Taneja
33564ffb42 MDL-40400 Gradebook: get_toggles_html and print_toggle cannot be used anymore 2013-07-03 17:06:59 +08:00
Frederic Massart
a8dd22a7d7 MDL-40369 theme: Fix core using deprecated icons 2013-07-03 16:47:35 +08:00