moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67299 commits 37 branches 544 tags 1.3 GiB
Commit graph

67299 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marina Glancy
6e4c10f987 Merge branch 'm26_MDL-46639' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-09-03 16:59:38 +08:00
Dan Marsden
df5fd3cd97 MDL-46639 SCORM: incorrect setting of launch param, it is done in scorm_parse_aicc 2014-09-03 20:22:19 +12:00
Charles Fulton
0cc57751e4 MDL-30414 block_private_files: convert button to inline link 2014-09-03 01:09:56 +02:00
Michael de Raadt
ebbff90562 MDL-46619 Forum: link to the discussion only if users cannot see posts. 2014-09-02 10:11:16 +08:00
Michael de Raadt
982c8524dd MDL-46619 Forum: only output last poster's name if user can view it. 2014-09-02 10:11:13 +08:00
Marina Glancy
390645bd44 Merge branch 'MDL-45952_26' of git://github.com/Syxton/moodle into MOODLE_26_STABLE 2014-09-02 09:59:20 +08:00
Eloy Lafuente (stronk7)
59be24cc60 Merge branch 'MDL-46633_m26' of https://github.com/shashirepo/moodle into MOODLE_26_STABLE 2014-09-02 02:12:30 +02:00
Eloy Lafuente (stronk7)
64e07a390e Merge branch 'wip_MDL-46679_m26_addonenv' of https://github.com/skodak/moodle into MOODLE_26_STABLE 2014-09-02 02:08:54 +02:00
Eloy Lafuente (stronk7)
19cd96e561 Merge branch 'MDL-46979_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-09-02 01:49:05 +02:00
Eloy Lafuente (stronk7)
0bd6dee49f Merge branch 'MDL-43639_updatePassEveryLogin_26' of https://github.com/moodlerooms/moodle into MOODLE_26_STABLE 2014-09-02 01:07:55 +02:00
Damyon Wiese
d5cfda4734 Merge branch 'MDL-46852-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-09-01 16:16:55 +08:00
Damyon Wiese
b7c42f0d7e Merge branch 'MDL-46902_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE 2014-09-01 15:54:40 +08:00
Henning Bostelmann
333db4598d MDL-46911 Database activity: jump to correct place in list after (un)approve 2014-09-01 15:46:19 +08:00
Damyon Wiese
a5580bc618 Merge branch 'm26_MDL-46985_7ZIP_RAR_MIME_types_missing' of https://github.com/scara/moodle into MOODLE_26_STABLE 2014-09-01 15:35:52 +08:00
Damyon Wiese
dea12fe893 Merge branch 'm26_MDL-46961' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-09-01 15:30:01 +08:00
Marina Glancy
bb5b3ee263 Merge branch 'm26_MDL-46639' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-09-01 14:35:39 +08:00
Marina Glancy
6e1fdb0951 Merge branch 'MDL-46539-fix-26' of https://github.com/jmarthaler/moodle into MOODLE_26_STABLE 2014-09-01 14:35:33 +08:00
Frederic Massart
69866e0377 MDL-46852 mod_lesson: More accurate comparison of shortanswer answers 2014-09-01 14:24:58 +08:00
Damyon Wiese
2b51c3212a Merge branch 'wip-MDL-39233-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-09-01 13:42:06 +08:00
Damyon Wiese
99772c2ba1 MDL-46619 Forum: whitespace fixes 2014-09-01 11:35:31 +08:00
Damyon Wiese
861822dc1b Merge branch 'MDL-46619-2.6-visisble-authors-qanda' of https://github.com/amandadoughty/moodle into MOODLE_26_STABLE 2014-09-01 11:29:49 +08:00
Damyon Wiese
e5d4b3d409 Merge branch 'm26_MDL-46737' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-09-01 10:56:15 +08:00
Matteo Scaramuccia
34b17698c4 MDL-46985 Added 7-Zip and RAR MIME types. 2014-08-31 22:58:15 +02:00
Petr Skoda
c8ec7b8a53 MDL-39840 environment: add support for environment.xml in plugins 
New features:

* environment.xml files in all types of plugins
* support for plugin strings via new optional plugin attribute in FEEDBACK
* support for class_name::method_name custom callbacks and classloader
 2014-09-01 08:39:53 +12:00
Mark Nelson
4e29893160 MDL-46902 core_course: display meaningful message when no courses found 2014-08-29 14:33:06 -07:00
zbdd
a6d8e2b35e MDL-37312 backup: Keep course idnumber on same site course restore 
When the course idnumber is set during a same site course restore,
retain the course idnumber if there are no duplicates.
 2014-08-29 07:21:36 +00:00
Tim Hunt
df27344e9a MDL-46979 backup: remove duplicate string. 
Thanks to Matt Sammarco for spotting this.
 2014-08-28 20:44:31 +01:00
Eloy Lafuente (stronk7)
0628d17bfa weekly release 2.6.4+ 2014-08-28 19:12:10 +02:00
Eloy Lafuente (stronk7)
44e3a9bdc6 Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-08-28 19:12:05 +02:00
shashirepo
c34a0a0acb MDL-46633 chat: Chat send button gets stuck 
Conflicts:
	mod/chat/gui_ajax/module.js
 2014-08-28 14:54:37 +05:30
Syxton
4c9103a485 MDL-45952 feedback: non-respondents in groupings 
Fixes feedback non-respondents list to show only members in groups in
the selected grouping if "Available for group members only" is selected.
 2014-08-27 15:17:02 -04:00
Mark Nielsen
ae376d3b2f MDL-43639: Prevent user updated event on every login 
If auth plugin prevents local passwords, then user
is updated and event is triggered on every login.
 2014-08-27 11:30:04 -07:00
Jon Marthaler
14a2ef282b MDL-46539 assign calendar: Fix lastcron value for assign cron 2014-08-27 11:11:11 -05:00
AMOS bot
ab39338705 Automatically generated installer lang files 2014-08-28 00:05:36 +08:00
Damyon Wiese
6c4e723d6b Merge branch 'wip-MDL-39888-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE 2014-08-27 09:56:17 +08:00
Faisal Kaleem
892eb5d190 MDL-46961 SCORM: JavaScript Hoisting issue. 2014-08-27 13:09:31 +12:00
Eloy Lafuente (stronk7)
f0640eb7d2 MDL-46875 tinymce: keep stable version YYYMMDD constant 
Note this has been integrated together with previous commit
so nobody should get a "downgrade" ever (but Brian, I'm sorry :-)
 2014-08-27 02:10:14 +02:00
Eloy Lafuente (stronk7)
60f1480cdc Merge branch 'm26_MDL-46875' of https://github.com/totara/moodle into MOODLE_26_STABLE 2014-08-27 02:08:26 +02:00
Adrian Greeve
53ed4016e6 MDL-39888 mnet: Added a warning message that no logging may be reveived from other clients. 
Moodle client machines that are running 2.6 or above that are not using the legacy log store
will not generate any logs to be transfered to the parent site.
 2014-08-26 15:02:56 +08:00
Marina Glancy
76d6b7a9b4 MDL-39233 mod_url: added unittest for get_course_content 2014-08-26 13:56:14 +08:00
Jason
97c36ae969 MDL-39233 mod_url: fix php notice 2014-08-26 13:56:14 +08:00
Damyon Wiese
8e2d62e5e2 MDL-46842 assign: Fix for unit tests - previous patch was completely ignoring manually reopening attempts. 2014-08-26 10:36:27 +08:00
Brian Barnes
8d42b3ceb5 MDL-46875 tinymce: Fixed issue with full screen and spelling 2014-08-26 13:26:49 +12:00
Eloy Lafuente (stronk7)
b5570e07ca Merge branch 'MDL-46477_m26' of https://github.com/shashirepo/moodle into MOODLE_26_STABLE 2014-08-26 02:24:50 +02:00
Eloy Lafuente (stronk7)
d5ee2634bd Merge branch 'MDL-46753-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE 2014-08-26 02:08:35 +02:00
Eloy Lafuente (stronk7)
cc2ef7a505 Merge branch 'm26_MDL-46842' of https://github.com/greg-or/moodle-mod_assign into MOODLE_26_STABLE 2014-08-26 01:59:40 +02:00
Eloy Lafuente (stronk7)
49f1a64cb0 Merge branch 'm26_MDL-46816' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-08-26 00:11:04 +02:00
Eloy Lafuente (stronk7)
bf7c584ffe Merge branch 'wip-MDL-46874-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-08-25 22:11:43 +02:00
Eloy Lafuente (stronk7)
fa74d00ca6 Merge branch 'm26_MDL-46900' of https://github.com/totara/moodle into MOODLE_26_STABLE 2014-08-25 20:55:44 +02:00
Marina Glancy
124aa2558a Merge branch 'MDL-46894_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-08-25 16:54:08 +08:00