mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
62,329 Commits 36 Branches 519 Tags
Commit Graph

11711 Commits

Author SHA1 Message Date
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
Dan Poltawski
d7738ce27c Merge branch 'MDL-36529' of git://github.com/colchambers/moodle 2013-01-15 14:55:18 +08:00
Dan Poltawski
864ff70c74 Merge branch 'MDL-36534' of git://github.com/timhunt/moodle 2013-01-15 14:44:28 +08:00
Dan Poltawski
27885779bc Merge branch 'MDL-36991-master' of git://github.com/sammarshallou/moodle 2013-01-15 13:06:10 +08:00
Dan Poltawski
01dcd9d770 Merge branch 'MDL-35793' of git://github.com/timhunt/moodle 2013-01-15 12:56:51 +08:00
Dan Poltawski
97f236e747 Merge branch 'MDL-32341-master' of git://github.com/ankitagarwal/moodle 2013-01-15 12:38:22 +08:00
Eloy Lafuente (stronk7)
fe25b31d44 Merge branch 'MDL-37456' of git://github.com/danpoltawski/moodle 2013-01-14 23:32:39 +01:00
Tim Hunt
5574862063 MDL-36534 question editing: clean up lang strings. 
There were a number of lang strings in suboptimal places.
This commit fixes that, and also removed some unused strings.

AMOS BEGIN
 MOV [addmorechoiceblanks,qtype_multichoice],[addmorechoiceblanks,question]
 MOV [youmustenteramultiplierhere,qtype_calculated],[youmustenteramultiplierhere,qtype_numerical]
AMOS END
 2013-01-14 14:52:49 +00:00
Dan Poltawski
ddaf0983b2 Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle 2013-01-14 15:05:15 +08:00
Ankit Agarwal
af5d990b59 MDL-32341 calendar: calendar custom date range export 
Adding support to export calendar events for a custom date range based on admin settings
 2013-01-14 10:15:09 +08:00
Petr Škoda
0aaea0d241 MDL-37184 refactor enrolment editing code to be shared by plugins 
AMOS BEGIN
 MOV [editenrolment,enrol_self],[editenrolment,core_enrol]
AMOS END
 2013-01-12 15:47:04 +01:00
Colin Chambers
5d5895f21a MDL-36529 Quiz: Shorten 'Settings for multiple tries' 2013-01-10 16:03:25 +00:00
Colin Chambers
086cced749 MDL-31726 Pre-fill question type combined feedback 2013-01-10 15:57:36 +00:00
Dan Poltawski
2008facf40 MDL-37456 - lang: remove unused zip strings 2013-01-10 15:55:54 +08:00
Rajesh Taneja
9309a8fe9a MDL-35873 Blocks: Made alt-text on block control icons more descriptive 2013-01-10 14:20:12 +08:00
Dan Poltawski
319d937602 Revert "Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle" 
This reverts commit 8361f557a117211a21e657b8ad6b8bec402fbf69,
2b9e957a274c037b222b8159dbc03b49d61b2e47 and
fae51910bf8d7e859f9dae807b9ca54089c5109e
 2013-01-10 11:17:33 +08:00
Eloy Lafuente (stronk7)
8361f557a1 Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle 
Conflicts:
	course/tests/courselib_test.php
 2013-01-09 01:31:50 +01:00
Eloy Lafuente (stronk7)
c68f339e5e Merge branch 'wip-MDL-37203-m25' of git://github.com/samhemelryk/moodle 2013-01-08 23:25:34 +01:00
Sam Hemelryk
3913743aa3 Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle 2013-01-09 10:20:46 +13:00
Sam Hemelryk
21117c9d17 Merge branch 'wip-MDL-35891-master' of git://github.com/phalacee/moodle 2013-01-09 09:41:00 +13:00