12085 Commits

Author SHA1 Message Date
Marina Glancy
b544b09636 Merge branch 'MDL-42824-master-int' of git://github.com/FMCorz/moodle 2013-11-12 15:00:57 +11:00
Sam Hemelryk
6f4a169d8e Merge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle 2013-11-12 11:34:39 +08:00
Frederic Massart
eb59e0ed3b MDL-42824 backup: Typo in description of setting backup_general_questionbank 2013-11-12 08:51:44 +08:00
Sam Hemelryk
cd96b7d3e4 MDL-41392 course: management checkbox accessibility improvement 2013-11-11 17:10:14 +08:00
Sam Hemelryk
d0647301a0 MDL-41392 course: management accessibility tweaking 2013-11-11 17:09:44 +08:00
Damyon Wiese
d5c0f0453c Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges
Conflicts:
	version.php
2013-11-11 10:17:07 +08:00
Yuliya Bozhko
f5d17c14ea MDL-39923 badges: Send badge messages through internal messaging system 2013-11-07 14:49:27 +13:00
Dan Poltawski
02c6bd358f Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
	lang/en/moodle.php
2013-11-07 09:34:31 +08:00
sam marshall
366b19a954 MDL-42084 Core: Create new static class for use instead of set_time_limit 2013-11-06 16:39:57 +00:00
sam marshall
3749c94627 MDL-42714 Backup: For tgz packer, handle missing zlib extension 2013-11-06 12:34:46 +00:00
Damyon Wiese
951b414b65 Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-06 13:06:01 +08:00
Andrew Nicols
d881e0bb84 MDL-40975 Course: Remove groupmode when forced at course level 2013-11-06 11:40:53 +08:00
Andrew Nicols
a83d83e42b MDL-40975 Course: Change which actions are in the menu and which are outside it 2013-11-06 11:40:49 +08:00
Helen Foster
5a25566060 MDL-42728 Merge English strings from the en_fix language pack 2013-11-05 23:41:44 +01:00
Sam Hemelryk
e69a0251dc MDL-42710 course: management cat sorting perfecting taking place 2013-11-05 21:52:45 +08:00
Sam Hemelryk
38a15200b9 MDL-42629 course: management peer-review alterations
* Added confirmation when bulk moving courses.
* Increased min-width of category course count to allow for 3 digits.
* Fixed sub-category => subcategory
* Renamed console JS vars to managementconsole
* Added typeof operator
* Renamed oldcatcourses and newcatcourses as suggested
* Added a span around course count and interacted with that.
* Fixed icon sizing
* Fixed management behat tests
* Fixed wrapping of strings in menus
2013-11-05 13:57:01 +08:00
Sam Hemelryk
c7a2291f8b MDL-42629 course: management resorting improvements 2013-11-05 09:49:20 +08:00
Sam Hemelryk
d3670843eb MDL-42629 course: changed new course to create new course 2013-11-05 09:49:14 +08:00
Sam Hemelryk
83886a49a0 MDL-42629 course: changed sub category to subcategory 2013-11-05 09:49:13 +08:00
Sam Hemelryk
017518d4f8 MDL-42629 course: fixed up create category management actions 2013-11-05 09:49:13 +08:00
Sam Hemelryk
115e5f052f MDL-42629 course: renamed re-sort to sort 2013-11-05 09:49:13 +08:00
Andrew Davis
5a47ef3827 MDL-42215 lang: improved the help string for fullnamedisplay 2013-11-03 09:12:36 +08:00
Damyon Wiese
e9a20b4703 Merge branch 'wip-MDL-28463-master' of git://github.com/marinaglancy/moodle
Conflicts:
	version.php
2013-11-01 21:31:57 +08:00
Marina Glancy
b4dba228a7 MDL-28463 conditionlib: use MUC for caching grades, reset when grades are changed 2013-11-01 16:48:50 +11:00
Rajesh Taneja
3b732cd6cc MDL-42492 course: Show option to move category to top level
added behat to test move category
2013-11-01 15:53:38 +11:00
Sam Hemelryk
cda49969c3 MDL-42300 course: improved category re-sort controls.
* The top action now works on top level categories and has
  a better title.
* Each category has its own resort actions now.
2013-11-01 08:57:39 +08:00
Dan Poltawski
4daa024fd4 Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle 2013-10-28 16:31:17 +08:00
Frederic Massart
be99db5b96 MDL-22669 course: Display section number for orphaned activities 2013-10-28 14:44:08 +08:00
Damyon Wiese
3a33578926 Merge branch 'wip-mdl-30812' of git://github.com/rajeshtaneja/moodle 2013-10-28 12:11:34 +08:00
Dan Poltawski
012b0472c5 Merge branch '42299-26' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2013-10-24 15:47:48 +08:00
Dan Poltawski
616e57d926 Merge branch 'MDL-40045_master' of https://github.com/markn86/moodle 2013-10-22 12:11:45 +02:00
Rajesh Taneja
62b6135c38 MDL-34612 Restore: Gracefully handle empty section title while restoring 2013-10-22 09:47:42 +08:00
Mark Nelson
f2f694f399 MDL-40045 user: replaced add_to_log call when the user list is viewed with an event 2013-10-21 11:53:31 +08:00
Mark Nelson
c76318d338 MDL-40045 user: replaced add_to_log call when a user profile is viewed with an event 2013-10-21 11:53:31 +08:00
Mark Nelson
70f210c04f MDL-42201 backup: introduced new automatic backup state 2013-10-21 11:51:12 +08:00
Sam Hemelryk
df460b5a23 MDL-42299 course: management category expansion improvements 2013-10-17 12:11:31 +13:00
Petr Škoda
b2858b916a MDL-42148 new overview of 3rd party libraries
Includes:
* each plugin has own thirdpartylibs.xml file
* added missing libraries
* fixed existing library infos
* new Site administration / Development / Third party libraries page
2013-10-16 14:48:29 +08:00
Sam Hemelryk
9860e57104 MDL-42258 course management: improved role assignments string 2013-10-11 11:43:51 +13:00
Damyon Wiese
370058d8fb Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle
Conflicts:
	lib/upgrade.txt
2013-10-10 10:49:11 +08:00
Damyon Wiese
f0ae8d7a66 Merge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle
Conflicts:
	backup/backup.php
	theme/bootstrapbase/style/moodle.css
2013-10-10 09:31:33 +08:00
Sam Hemelryk
571781fbf6 Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle 2013-10-09 12:41:36 +13:00
Tim Gus
7a3723219c MDL-40939 tex filter: Changes to the TeX notation plugin
- Added configurable setting for path to mimetex binary
- Moved language strings from lang/en/admin.php to lang/en/filter_tex.php
- Config settings now stored in table config_plugins and retrieved
through get_config
- Added upgrade step to move TeX settings to the config_plugins table
and delete settings from the config table

AMOS BEGIN
  MOV [configconvertformat,core_admin],[configconvertformat,filter_tex]
  MOV [convertformat,core_admin],[convertformat,filter_tex]
  MOV [latexpreamble,core_admin],[latexpreamble,filter_tex]
  MOV [latexsettings,core_admin],[latexsettings,filter_tex]
  MOV [pathconvert,core_admin],[pathconvert,filter_tex]
  MOV [pathdvips,core_admin],[pathdvips,filter_tex]
  MOV [pathlatex,core_admin],[pathlatex,filter_tex]
AMOS END
2013-10-08 16:09:30 -04:00
Petr Škoda
6cf2091571 MDL-16073 add test for connection to external database for authentication and enrolments 2013-10-08 21:53:51 +02:00
sam marshall
39e5102f8b MDL-41838 Backup/restore: Support .tar.gz format for .mbz (2 of 2)
The new experimental setting enabletgzbackups allows backups to be
created so that the internal format for .mbz files is .tar.gz.

Restore transparently supports .mbz files with either internal
formats (.zip or .tar.gz).

The .tar.gz format has the following benefits for backup:
- Supports larger files (no limit on total size, 8GB on single file
  vs. 4GB limit on total size)
- Compresses text better, resulting in smaller .mbz files.
- Reports progress regularly during compression of single files,
  reducing the chance of timeouts during backups that include a
  very large file.

Time performance may also be improved although I haven't done a
direct comparison.
2013-10-08 13:04:49 +01:00
sam marshall
c858655dde MDL-41838 Files: Implement .tar.gz packer (1 of 2)
A new packer for .tar.gz files (MIME type application/x-gzip) has been
implemented, including unit tests.

This packer is intended for use during backup/restore only and is not
otherwise exposed in the user interface at present. However, it is
supposed to follow the (ancient) POSIX .tar standard; files created
with this packer will open in GNU tar.

There are restrictions in support corresponding to the POSIX standard:

- Non-ASCII filenames are not supported.
- Very long file/path names are not supported.
- Individual files within the .tar may not be more than 8GB.

Some of these limitations might need to be addressed in future changes
if the packer were to be used in areas other than backup/restore.
2013-10-08 13:04:48 +01:00
sam marshall
77b3d9dfdf MDL-38196 Backup/restore: Display log if non-empty
When doing a backup or restore operation with the normal user interface,
if there is anything in the backup/restore log, it will now be displayed
at the end of the process below the Continue button.

If you have developer debugging enabled, it sets the display level to
LOG_DEBUG and there will always be content in the log. Otherwise, it
uses LOG_INFO which generally means the log is empty, and nothing
displays (no visible change for users).
2013-10-08 11:00:11 +01:00
Dan Poltawski
4f0eaf18f4 Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2013-10-08 16:42:17 +08:00
Damyon Wiese
7bfc69b0c2 Merge branch 'MDL-40053-master' of git://github.com/ankitagarwal/moodle 2013-10-08 16:19:25 +08:00
Ankit Agarwal
3cc4cc68e4 MDL-40053 events: write events for core_notes
Following events were added in this commit :-
core\event\note_created
core\event\note_deleted
core\event\note_updated
core\event\notes_viewed
2013-10-08 15:12:20 +08:00
Damyon Wiese
18ef6201c0 Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2013-10-08 10:30:57 +08:00