mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-13 04:01:40 +01:00
Code Issues Projects Releases Wiki Activity
59,368 Commits 36 Branches 523 Tags
Commit Graph

11580 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
9515c34ee6 Merge branch 'wip-MDL-30669-master' of git://github.com/abgreeve/moodle 2013-02-26 09:46:13 +01:00
Adrian Greeve
3dd204b1e6 MDL-30669 - blocks: Added a warning when deleting blocks that have multiple displays set. 
Also added a fix to the function course_page_type_list(). It was making a call to
get_context_info_array() which will generate an error if $currentcontext is not set.
 2013-02-26 10:21:37 +08:00
Petr Škoda
bdbcb6d7fa MDL-38121 tell admins when plugin installed into wrong dir 2013-02-23 18:16:42 +01:00
Eloy Lafuente (stronk7)
345768b9b8 Merge branch 'MDL-35750' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-02-19 12:57:10 +01:00
Frederic Massart
dd1c2f5a02 MDL-31983 navigation: Renaming the Settings block to Administration 
AMOS BEGIN
 CPY [administration,core],[pluginname,block_settings]
AMOS END
 2013-02-18 15:48:12 +08:00
Dan Poltawski
47570cc67d MDL-35750 - update to the ISO list of countries 
Netherlands Antilles has been split up as specified in ISO 3166-1
Newsletter VI-8 (2010-12-15). Users will need to choose their country.
http://www.iso.org/iso/iso_3166-1_newsletter_vi-8_split_of_the_dutch_antilles_final-en.pdf

PLEASE NOTE: if you are updating this list again, i've written a script
to automate it from now on, linked from the bug.
 2013-02-15 12:26:08 +08:00
Eloy Lafuente (stronk7)
e196517bf5 Merge branch 'wip-MDL-35832-master' of git://github.com/phalacee/moodle 2013-02-11 23:31:38 +01: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
a614fb7457 Merge branch 'MDL-35819-m' of git://github.com/andrewnicols/moodle 2013-02-11 10:56:07 +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
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
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
Dan Poltawski
9cf44c32b5 Merge branch 'wip-MDL-37572-m25' of git://github.com/samhemelryk/moodle 2013-02-05 15:25:08 +08:00
Jason Fowler
b9271ffd94 MDL-35832 - Accessibility - Adding more precise context sensitive title text to undock controls on docked blocks 2013-02-05 09:21:15 +08:00
Eloy Lafuente (stronk7)
b97d3e46df Merge branch 'MDL-36472-master' of git://github.com/FMCorz/moodle 2013-02-05 01:28:35 +01:00
Colin Chambers
6dbc346095 MDL-37422 Quiz: Group fields related to 'Settings for multiple tries.' 2013-02-01 14:30:27 +00:00
Marina Glancy
2c49fb4c3e MDL-37572 Course categories are now managed in /course/manage.php 
Switching between categories view and edit no longer depend on global editing mode
/course/index.php and /course/category.php do not contain editing code
 2013-02-01 08:51:34 +13:00
Frederic Massart
39bb9b1f00 MDL-36472 files: Improved file area uploads error messages. 2013-01-31 15:09:44 +08:00
Eloy Lafuente (stronk7)
f97db01978 Merge branch 'wip-MDL-37644-m25' of git://github.com/samhemelryk/moodle 2013-01-30 10:27:11 +01:00
Eloy Lafuente (stronk7)
0ed03cc295 Merge branch 'MDL-37101-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	calendar/tests/externallib_tests.php
 2013-01-29 15:19:11 +01:00
Eloy Lafuente (stronk7)
ee4cac2b44 Merge branch 'wip-MDL-37474-m25' of git://github.com/samhemelryk/moodle 2013-01-29 01:32:09 +01:00
Sam Hemelryk
bf6a1b9078 Merge branch 'w04_MDL-37596_m25_schedmaint' of git://github.com/skodak/moodle 2013-01-29 08:44:15 +13:00
Petr Škoda
48e114a517 MDL-37596 optionally enable CLI maintenance later 2013-01-28 14:23:21 +01:00
Sam Hemelryk
f9a71cb033 Merge branch 'MDL-37172' of git://github.com/jmvedrine/moodle 2013-01-28 17:29:24 +13:00
Sam Hemelryk
682a1c0108 Merge branch 'w04_MDL-37728_m25_roledef' of git://github.com/skodak/moodle 2013-01-28 17:25:51 +13:00
Andrew Davis
d8ef2bc03c MDL-13805 core_message: altered some strings so it isnt weird when viewing a different users messages 2013-01-28 16:07:37 +13:00
Sam Hemelryk
d20337f180 MDL-37644 navigation: new option to display course full names 2013-01-28 10:42:44 +13:00
Sam Hemelryk
5052356574 MDL-37470 cache: definitions can now be purged through config screen 2013-01-28 10:39:47 +13:00
Petr Škoda
ba4b17dc55 MDL-37728 show role risks 2013-01-27 14:55:06 +01:00
Jean-Michel Vedrine
a5d7862b58 MDL-37172 Hardcoded strings in some question imports formats 
AMOS BEGIN
MOV [unknownorunhandledtype,qformat_blackboard_six],[unknownorunhandledtype,question]
AMOS END
 2013-01-25 22:31:06 +01:00
Colin Chambers
2a22be64ee MDL-32750 Question: make the html editor tools collapsible 2013-01-25 11:17:41 +00:00
Dan Poltawski
ebf6e8f60a Merge branch 'MDL-37473b' of git://github.com/srynot4sale/moodle 2013-01-25 12:35:40 +08:00
Aaron Barnes
10a8581f2b MDL-37473 completion: Add missing cap checks to tracked users functions 
Namely get_num_tracked_users and is_tracked_user()
 2013-01-25 17:08:44 +13:00
Sam Hemelryk
a659a79f23 MDL-36621 cache: added missing calendar subscription string 2013-01-23 09:58:43 +13:00
Ankit Agarwal
494a6389eb MDL-37101 webservices:Implement ws api core_calendar_create_calendar_events 2013-01-22 13:53:22 +08:00
Dan Poltawski
97d3e09cd8 Merge branch 'MDL-37599' of git://github.com/timhunt/moodle 2013-01-22 11:40:04 +08:00
Sam Hemelryk
36546841f1 Merge branch 'MDL-36621-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	calendar/lib.php
	lib/db/caches.php
	version.php
 2013-01-22 16:35:03 +13:00
Tim Hunt
b5d09003bb MDL-37599 question import: add missing string. 
AMOS BEGIN
 MOV [matcherror,question],[invalidgrade,question]
AMOS END
 2013-01-21 12:07:47 +00:00
Ankit Agarwal
e73b527c82 MDL-36621 calendar: cache calendar subscriptions and showicalsource setting 
Now MUC is used to cache subscription information when the constructor for an event is called, which is child of a ical subscription.
A new setting calendar_showicalsource is introduced which controls if the ical source should be displayed along with events in the calendar
Also minor changes has been done in places to make sure subscription id is always associated with ical events
 2013-01-17 13:40:06 +08:00
Ankit Agarwal
07c03ff96a MDL-36621 calendar: Display subscription info in calendar event popups 2013-01-17 11:09:50 +08:00
Ankit Agarwal
8a7326ed4e MDL-36621 calendar: Ical event should display source info 2013-01-17 11:09:50 +08:00
Sam Hemelryk
e17dbeeb1a MDL-34398 groups: implemented caching of group information. 2013-01-17 09:24:58 +13:00
Sam Hemelryk
20a3199397 Merge branch 'wip-mdl-35873' of git://github.com/rajeshtaneja/moodle 2013-01-16 18:22:04 +13:00
Dan Poltawski
82420bbb91 Merge branch 'w02_MDL-37184_m25_editenrol' of git://github.com/skodak/moodle 2013-01-16 10:19:57 +08:00
Eloy Lafuente (stronk7)
91d5e08aa3 Merge branch 'MDL-35775-master' of git://github.com/micaherne/moodle 2013-01-16 01:28:53 +01:00
Eloy Lafuente (stronk7)
a91350609e Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle 
Conflicts:
	lib/db/caches.php
 2013-01-16 01:08:26 +01:00
Eloy Lafuente (stronk7)
563bcc2322 Merge branch 'MDL-31726' of git://github.com/colchambers/moodle 2013-01-15 21:44:38 +01:00
Dan Poltawski
2773aa41de Merge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle 2013-01-15 16:04:57 +08:00
Frederic Massart
d6731600c8 MDL-30070 message: Web Services for contact list 2013-01-15 16:04:00 +08:00