moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63666 commits 37 branches 540 tags 1.3 GiB
Commit graph

63666 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Nelson
f192414ed8 MDL-41440 event: fixed incorrect treatment of get_string as a class 2013-08-27 17:03:07 +08:00
Damyon Wiese
5df7c45409 Merge branch 'MDL-41364' of git://github.com/timhunt/moodle 2013-08-27 16:31:36 +08:00
Damyon Wiese
ad4f3b6ce5 Merge branch 'wip-mdl-41415' of git://github.com/rajeshtaneja/moodle 2013-08-27 16:06:32 +08:00
Damyon Wiese
e3f3475079 Merge branch 'wip-MDL-41127-master' of git://github.com/marinaglancy/moodle 2013-08-27 15:55:14 +08:00
Damyon Wiese
8380bd08a8 Merge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle 2013-08-27 15:51:19 +08:00
Dan Poltawski
d76cb8ee26 Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-08-27 15:47:52 +08:00
Damyon Wiese
cbd91e23e9 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle 
Conflicts:
	version.php
 2013-08-27 15:29:49 +08:00
Ankit Agarwal
ac43f96306 MDL-40052 events: Code style fixes 2013-08-27 15:26:38 +08:00
Ankit Agarwal
b9e1f0997c MDL-40052 events: Add get_url() api to various report content_viewed classes 2013-08-27 15:26:38 +08:00
Ankit Agarwal
bb0038074e MDL-40052 events: Add content view events for reports 
Includes:
* Add content view events for report_log
* Add content view events for report_loglive
* Add content view events for report_outline
* Add content view events for report_participation
* Add content view events for report_stats
 2013-08-27 15:25:43 +08:00
Ankit Agarwal
589748316d MDL-40052 events: Add a base class for content view 2013-08-27 15:22:28 +08:00
Damyon Wiese
37e2954e19 Merge branch 'MDL-41401-master' of git://github.com/danpoltawski/moodle 2013-08-27 15:09:21 +08:00
Dan Poltawski
4436225eb1 Merge branch 'MDL-40732' of git://github.com/rwijaya/moodle 2013-08-27 15:06:38 +08:00
Damyon Wiese
8760b1eea2 MDL-41081 navbar: Cleanup comments in prepend() 2013-08-27 14:11:08 +08:00
Damyon Wiese
dc7092f7b3 Merge branch 'wip-MDL-41081-m26' of git://github.com/samhemelryk/moodle 2013-08-27 14:11:03 +08:00
Dan Poltawski
eb1526e059 Merge branch 'MDL-41321_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-08-27 14:06:54 +08:00
Dan Poltawski
9a6c6d1cfd Merge branch 'MDL-38765' of git://github.com/timhunt/moodle 2013-08-27 13:51:40 +08:00
Dan Poltawski
80979f76ee Merge branch 'wip-MDL-41181-master' of git://github.com/marinaglancy/moodle 2013-08-27 13:47:39 +08:00
Marina Glancy
d55f05ef43 MDL-41181 function moveto_module does not modify properties of object 
instead it returns the new value for module visibility
 2013-08-27 15:36:40 +10:00
Damyon Wiese
f5a791ee7a Merge branch 'wip-MDL-41307-master' of git://github.com/abgreeve/moodle 2013-08-27 13:36:38 +08:00
Marina Glancy
955d91c698 MDL-41181 No need to reset modinfo cache after moveto_module() 
it is already reset inside the function
 2013-08-27 15:36:21 +10:00
Damyon Wiese
a6163e7a5f MDL-31093 Scorm course format: Remove behat tests 
The scorm course format has been removed so we don't need to test it anymore.
 2013-08-27 13:26:47 +08:00
Damyon Wiese
f6c2af867f Merge branch 'master_MDL-40122' of git://github.com/danmarsden/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-08-27 13:16:55 +08:00
Damyon Wiese
92058753ac Merge branch 'MDL-40877-master' of git://github.com/FMCorz/moodle 2013-08-27 12:46:23 +08:00
Damyon Wiese
7316f46a23 Merge branch 'MDL-40447_master' of https://github.com/nadavkav/moodle 2013-08-27 12:27:47 +08:00
Damyon Wiese
58e6ac1e9a Merge branch 'MDL-40752_master' of https://github.com/nadavkav/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-08-27 12:23:16 +08:00
Dan Poltawski
e820d50791 Merge branch 'MDL-37211_master' of https://github.com/nadavkav/moodle 2013-08-27 11:54:28 +08:00
Rajesh Taneja
ddf05b5e9d MDL-41415 Events: get_string should not use new 2013-08-27 11:36:26 +08:00
Rajesh Taneja
41566267c5 MDL-41415 Events: get_legacy_logdata is protected 2013-08-27 11:36:11 +08:00
Damyon Wiese
2e68b1254f MDL-39871 themes RTL: Get rtlblockmanipulations from any parent 2013-08-27 11:14:53 +08:00
Nadav Kavalerchik
5b2ed8b5ff MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined array) 2013-08-27 11:14:52 +08:00
Dan Poltawski
67c6ab1646 Merge branch 'wip-MDL-41222-master' of git://github.com/marinaglancy/moodle 2013-08-27 11:03:35 +08:00
Dan Poltawski
d1584b6165 Merge branch 'MDL-41098-master' of git://github.com/damyon/moodle 2013-08-27 10:57:09 +08:00
Dan Poltawski
02ebac0bf1 Merge branch 'wip-MDL-41419-master' of git://github.com/abgreeve/moodle 2013-08-27 10:55:51 +08:00
Damyon Wiese
4fd8adab75 MDL-41098 atto: Fix for dialogue ignoring centered option. 2013-08-27 10:40:31 +08:00
Damyon Wiese
08a95d50bb MDL-41098 atto: Force some styles on the editor 
Bootstrap is overriding random styles on the contenteditable div like:
line-height, font-size and color. Silly - force them to be the same as the
textarea we are derived from.
 2013-08-27 10:40:24 +08:00
Adrian Greeve
9c3bfea0da MDL-41419 - unit tests: Fixed up sporadic test failures in externallib_test.php. 
Also added much needed comments to the unit test.
 2013-08-27 10:40:08 +08:00
Frederic Massart
5d9b539ee2 MDL-41428 repository_coursefiles: Missing white space in name 2013-08-27 10:31:27 +08:00
Damyon Wiese
70512ebdfc MDL-40321 theme_bootstrapbase: Combine reset into existing overrides file 2013-08-27 10:17:23 +08:00
Damyon Wiese
37bb910633 Merge branch 'wip-MDL-40321_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-08-27 10:07:07 +08:00
Damyon Wiese
c90641facb MDL-41098 Atto Text editor: Add new text editor to core 
This is an alternative to the TinyMCE text editor that is based on HTML5
content editable regions.

It has been designed to "gel" with Moodle and uses YUI for javascript,
Moodle standard dialogs and standard moodle buttons. It has also been designed
to work well on mobile devices and can collapse down to a narrow column if required.

Imported from the plugins database here:
https://moodle.org/plugins/view.php?plugin=editor_contenteditable

Original git repository here:
https://github.com/damyon/contenteditable
 2013-08-26 22:16:43 +08:00
Charles Fulton
9930e4267c MDL-41256 course: improved debugging on course creation 2013-08-26 06:59:33 -07:00
Dan Poltawski
51eba172e6 Merge branch 'MDL-41291-master' of git://github.com/mr-russ/moodle 2013-08-26 17:50:08 +08:00
Dan Poltawski
a0df83441b Merge branch 'MDL-38505' of git://github.com/jmvedrine/moodle 2013-08-26 17:47:05 +08:00
Damyon Wiese
650b464a16 MDL-41213 filepicker: Version bump for css changes 2013-08-26 16:18:37 +08:00
Damyon Wiese
9e179acfd3 Merge branch '41213-26' of git://github.com/samhemelryk/moodle 2013-08-26 16:00:35 +08:00
Marina Glancy
b469e62a77 MDL-41317 Set correct context to send bulk message page 2013-08-26 17:41:43 +10:00
Marina Glancy
0e1bd87cc8 MDL-41369 Set proper context and navigation path for user messages 2013-08-26 17:32:57 +10:00
Rajesh Taneja
54bc6d1955 MDL-41418 Administration: Page context should be set before setting page title 2013-08-26 15:22:12 +08:00
Dan Poltawski
aa8fe63937 Merge branch 'MDL-40055-master' of git://github.com/FMCorz/moodle 2013-08-26 15:09:33 +08:00