Commit graph

70527 commits

Author SHA1 Message Date
Dan Poltawski
5a94eeb56d Merge branch 'MDL-47614-master' of git://github.com/andrewnicols/moodle 2014-10-14 18:47:30 +01:00
Dan Poltawski
050b930fa7 on-demand release 2.8beta+ 2014-10-14 18:00:47 +01:00
Dan Poltawski
f47265d3a0 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-10-14 18:00:44 +01:00
Dan Poltawski
df11019a82 MDL-46235/MDL-46971 mysql_compress_rows: fix typo 2014-10-14 16:36:47 +01:00
Dan Poltawski
8a7b6d292d Merge branch 'wip-MDL-47617-master' of git://github.com/abgreeve/moodle 2014-10-14 13:17:36 +01:00
Dan Poltawski
3be2f6ac0b Merge branch 'MDL-47649' of git://github.com/timhunt/moodle 2014-10-14 13:14:19 +01:00
Helen Foster
a1b152f5db MDL-47140 atto: improved wording of error message 2014-10-14 12:20:58 +01:00
Tim Hunt
01e7c3bf4e MDL-47667 profile unit tests: don't assume none by default.
E.g. if an add-on creates a user profile field on install, the test was
failing.
2014-10-14 12:09:51 +01:00
Marina Glancy
acab649e06 Merge branch 'MDL-47189-master-2nd' of git://github.com/FMCorz/moodle 2014-10-14 18:34:14 +08:00
Tim Hunt
a866538b9b MDL-47649 csvlib: must not leave files open
I added a destructor to csv_import_reader ensure the file is closed.

I also ensured that the gradeimport_csv unit tests did not hold onto a
reference to the csv_import_reader object while the phpunit framework
tries to tidy up moodledata.

Finally, to stop CiBoT complaining, I fixed up the PHP4-style
declarations in the CSV import class.
2014-10-14 10:36:25 +01:00
Frederic Massart
da45dc0497 MDL-47189 my: Update test to check that existing blocks remain after add
Specifically checking for strings in the blocks because the tests
passed when looking for the string anywhere.
2014-10-14 16:03:12 +08:00
Frederic Massart
00fd3c1aad MDL-47189 my: Fix the addition of default blocks to my/ page
Fixing the upgrade script so that they attach the new blocks
to the right my_pages entry. An upgrade script has also been
added to fix the existing bad data.
2014-10-14 16:03:12 +08:00
Andrew Nicols
906de1b640 MDL-47614 gradereport: Apply a background colour
Apply the page background colour to the table for all bootstrap base
themes.

Whis will ensure that the table does not stand out strangely on a non-white
background.
2014-10-14 15:41:21 +08:00
Damyon Wiese
f50395b402 Merge branch '46151-28' of git://github.com/samhemelryk/moodle 2014-10-14 15:34:25 +08:00
Jetha Chan
f89a85f81c MDL-47576 user_menu: improved dropdown styles, added JS-less styles 2014-10-14 14:59:42 +08:00
Zachary Durber
f4278326c0 MDL-47575 gradebook: Show weights and contribution by default. 2014-10-14 14:22:08 +08:00
Frederic Massart
09171b955e MDL-38732 gradereport_grader: Handle simultaneous graders 2014-10-14 13:52:42 +08:00
Zachary Durber
1b2c1ccb4c MDL-18229 gradebook: Fixes for bulk insert and checkboxes. 2014-10-14 13:18:45 +08:00
Adrian Greeve
c1a27029fe MDL-47617 behat: Fixed behat sorting failure
Postgres and MySQL treat values that are null differently
when sorting. MySQL will sort null values above fields with
values and Postgres will be vice versa. I removed the checks
against the Admin User.

Oracle treats lower case values different to upper case values
and so I have modified the test so that all Names start with
an Uppercase letter.
2014-10-14 11:30:01 +08:00
Damyon Wiese
57fac09a40 MDL-18229 Grades: singleview report mega cleanup.
Fix all the things, including:
* Fix $PAGE->url
* Fix coding style.
* Add event for reportviewed
* Removed broken callback  gradereport_singleview_profilereport
* Removed vertical-align-middle
* Changed prefixes in css
* phpcs fixes
* moodlecheck fixes including phpdocs
* Move classes to use autoloading
* Remove all smelly code tricks like func_get_args, scandir etc (lots).
2014-10-14 10:26:46 +08:00
Zachary Durber
5f3decb5cb MDL-18229 gradebook: Additional fixes.
Random foo left in options. (test code)
Allowed editing link for Course total.
Fixes based on Apu's review.
2014-10-14 10:26:46 +08:00
Aparup Banerjee
0a55da571a MDL-18229 gradereport: updated index.php test to calculate navigation based on new class name 'gradereport_selectable_items' 2014-10-14 10:26:46 +08:00
Zachary Durber
8ec7b088ef MDL-18229 gradereport: Fixes and improvements from review.
Added pagination back in with some general fixes.

AMOS BEGIN
 CPY [override,mod_quiz],[override,gradereport_singleview]
AMOS END
2014-10-14 10:26:46 +08:00
Zachary Durber
2fd9718d8b MDL-18229 gradereport: Behat tests added. 2014-10-14 10:26:46 +08:00
Zachary Durber
7bd3932e76 MDL-18229 gradereport: Labels for table items added. 2014-10-14 10:26:46 +08:00
Zachary Durber
65c134f98a MDL-18229 gradebook: Updating code to Moodle standard. 2014-10-14 10:26:46 +08:00
Zachary Durber
92c61fee64 MDL-18229 gradebook: Links to Single view via icons on Grade Report. 2014-10-14 10:26:45 +08:00
Zachary Durber
d124a60b33 MDL-18229 gradebook: Renaming of Single_view to Single view 2014-10-14 10:26:45 +08:00
Zachary Durber
edd8b27923 MDL-18229 gradebook: Fix for loading activities.
Was using local variable iteminstance rather than cmid.
2014-10-14 10:26:45 +08:00
Zachary Durber
6a555b99f7 MDL-18229 gradebook: Linking activities and usernames correctly.
Activities to their course page and usernames to their
profile page as per standard.
2014-10-14 10:26:45 +08:00
Aparup Banerjee
7cdbf79dd9 MDL-47347 added basic navigation to top and bottom of gradereport_singleview
Part of MDL-18229
2014-10-14 10:26:45 +08:00
Zachary Durber
508f23f1e5 MDL-18229 gradebook: Single view navigation corrected.
Usernames link to user profiles.
Activities to their activity page.
2014-10-14 10:26:45 +08:00
Zachary Durber
4229e9fa8d MDL-18229 gradebook: Added filter icons for activities and users.
Corrected CSS for grades column, was far too large.
2014-10-14 10:26:45 +08:00
Zachary Durber
7bd4a361b3 MDL-18229 gradebook: Initial commit of LSUs Quick Edit Plugin
Renamed to Single View in MDL-47289.
2014-10-14 10:26:45 +08:00
Simey Lameze
372997907f MDL-46599 gradebook: Unit tests for last exported date and force import option 2014-10-14 09:30:04 +08:00
Sam Hemelryk
c1fb8f6d2e MDL-46151 cachestore_memcache: now checks extension version for support 2014-10-14 08:27:45 +13:00
AMOS bot
ad7f22c055 Automatically generated installer lang files 2014-10-14 00:05:32 +08:00
Tim Hunt
90048c7cfa MDL-47646 CURL redirect unit test: handle broken servers 2014-10-13 15:52:04 +01:00
Dan Poltawski
ec72585d64 Merge branch 'MDL-47603' of git://github.com/timhunt/moodle 2014-10-13 13:33:56 +01:00
Frederic Massart
1d65db8b39 MDL-47463 core_grades: Behat checks the contribution of single item scales 2014-10-13 18:23:03 +08:00
Dan Poltawski
bb29fe900e Merge branch 'wip-MDL-46819-master' of git://github.com/abgreeve/moodle 2014-10-13 11:02:59 +01:00
Dan Poltawski
42b0ce301d Merge branch 'wip-MDL-46546-master' of git://github.com/abgreeve/moodle 2014-10-13 10:57:17 +01:00
Dan Poltawski
7c50998039 Merge branch 'MDL-47140-master' of git://github.com/gurgus/moodle 2014-10-13 09:54:02 +01:00
Frederic Massart
21dd684207 MDL-47463 core_grades: Behat checks the contribution of scales 2014-10-13 16:01:32 +08:00
Frederic Massart
87e1e53c97 MDL-47463 core_grades: Handle course contribution of scales 2014-10-13 15:54:58 +08:00
Dave Cooper
b6da971b4a MDL-47140 editor_atto: Improved error handling 2014-10-13 10:51:17 +08:00
Adrian Greeve
a2809ae2c9 MDL-46546 core_grades: Notice display for bad import.
If the initial import of csv data is bad, a notification
will be displayed to the user.
2014-10-13 10:36:38 +08:00
Adrian Greeve
0cf122171b MDL-46819 core_grades: Negative weights are changed to 0
Negative weights in the natural aggregation are not currently permitted.
Any figure below zero is changed to a zero.
2014-10-13 08:19:24 +08:00
Sam Hemelryk
0e6d8ed261 MDL-47631 report_participation: fixed filtering by letter 2014-10-13 12:27:48 +13:00
Tim Hunt
84b45a24a1 MDL-47603 quiz edit: qbank popup preview icon needs new window
Also, ensure that clicking the + icon adds the question on the right
page.

Bit of this fix are a bit hacky, but we have to deal with the fact there
is not a good general solution to MDL-47604.
2014-10-10 13:40:16 +01:00