1642 Commits

Author SHA1 Message Date
Sam Hemelryk
ec6219a2e7 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-05 08:25:35 +13:00
sam marshall
8ff1fb6ffe MDL-42084 Fix breakage in grader preferences page 2013-12-04 17:00:08 +00:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Sam Hemelryk
b5fd2497d6 Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle 2013-12-03 10:25:26 +13:00
Damyon Wiese
2b267d31c8 MDL-32888: Whitespace fixes (grr) 2013-12-02 15:14:26 +08:00
Damyon Wiese
7363aacb65 Merge branch 'MDL-32888_master' of https://github.com/maitkin-ltu/moodle 2013-12-02 15:01:37 +08:00
Petr Škoda
a377754770 MDL-41819 try to work around max_input_vars restriction 2013-12-02 08:29:08 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Matt Switlik
3f7bd81912 MDL-42618 fix grade importing of whitespace idnumbers 2013-11-14 09:46:54 -05:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
2013-11-06 16:40:01 +00:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Mary Evans
de957f5848 MDL-40971 grade: Importing Outcomes breaks Clean theme. 2013-10-30 23:46:47 +00:00
Melissa Aitkin
02d1a0a575 MDL-32888 Grader report: Refined SESSION and api function use 2013-10-17 12:58:49 +11:00
Melissa Aitkin
d1a4346f86 MDL-32888 Grader report: use SESSION object and DB functions 2013-10-17 12:58:49 +11:00
Melissa Aitkin
d5f6d9ebef MDL-32888 Grader report: cater for suspended students 2013-10-17 12:58:49 +11:00
Melissa Aitkin
4187784925 MDL-32888 Grader report: refined user search with no reset 2013-10-17 12:58:49 +11:00
Melissa Aitkin
cbe8e5b325 MDL-32888 Grader report: refined user search 2013-10-17 12:58:49 +11:00
Melissa Aitkin
8e4bf6cca6 MDL-32888 Grader report: added user search 2013-10-17 12:58:48 +11:00
Dan Poltawski
00ae230f52 Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-10-10 10:31:44 +08:00
Damyon Wiese
6412c972e3 Merge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle 2013-10-09 12:46:14 +08:00
Andrew Davis
accdf036fa MDL-41379 core_outcome: added some CSS to the course outcome table to make it display nice 2013-10-06 10:00:25 +07:00
Damyon Wiese
3d27180e94 MDL-40493 User preference: Allow users to set their preferred text editor.
This changes the setting htmleditor in the user table from a 0 or 1 column
to a user preference for the name of their preferred html editor.
2013-10-02 12:49:30 +08:00
Adrian Greeve
c1735baff5 MDL-41967 - Gradebook: Fixed an sql syntax error for gradebook custom profile fields. 2013-10-01 17:53:22 +08:00
Sam Hemelryk
c392392725 Merge branch 'MDL-37973' of https://github.com/merrill-oakland/moodle 2013-10-01 09:54:26 +13:00
Eric Merrill
e3a65c9eab MDL-37973 gradebook Return a maxgrade of '-' if grade type is TEXT
Including tests for correct return from
grade_edit_tree_column_range->get_item_cell()
2013-09-19 10:21:35 -04:00
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