mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
61,768 Commits 36 Branches 519 Tags
Commit Graph

61768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
421e6decf4 Merge branch 'wip-MDL-40137-m26' of git://github.com/samhemelryk/moodle 2013-06-18 01:43:57 +02:00
Yuliya Bozhko
111c5fd93f MDL-40022 badges: Fix missing calls to setType in course criteria settings 2013-06-18 11:38:22 +12:00
Sam Hemelryk
d35d831190 Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle 2013-06-18 11:38:05 +12:00
Eloy Lafuente (stronk7)
edd3fd91d7 MDL-40103 doc create_temptable_from_real_table() deletion. 2013-06-18 01:35:11 +02:00
Eloy Lafuente (stronk7)
27c07947c4 MDL-40103 Fix wrong call, causing restore to fail. 2013-06-18 01:30:14 +02:00
Eloy Lafuente (stronk7)
672bee2d23 MDL-40103 Bump version & whitespace/punctuation 2013-06-18 01:30:13 +02:00
Eloy Lafuente (stronk7)
96c90fab6a Merge branch 'MDL-40103_temptable' of https://github.com/mr-russ/moodle 
Conflicts:
	lib/db/upgrade.php
 2013-06-18 01:30:07 +02:00
Sam Hemelryk
407020ef8c Merge branch 'MDL-32253-master' of git://github.com/danpoltawski/moodle 2013-06-18 11:26:23 +12:00
Sam Hemelryk
7d7a6e3c20 Merge branch 'wip-MDL-26998-master' of git://github.com/abgreeve/moodle 2013-06-18 11:22:40 +12:00
Sam Hemelryk
21467b4461 Merge branch 'wip-mdl-39863' of git://github.com/rajeshtaneja/moodle 2013-06-18 11:19:35 +12:00
Sam Hemelryk
540a8f8499 Merge branch 'MDL-40109_master' of git://github.com/dmonllao/moodle 2013-06-18 11:08:45 +12:00
Sam Hemelryk
e667bd9db0 Merge branch 'MDL-39626_master' of git://github.com/kordan/moodle 
Conflicts:
	theme/formal_white/style/course.css
 2013-06-18 11:03:21 +12:00
Eloy Lafuente (stronk7)
57ed9d90c7 Merge branch 'w25_MDL-40210_m26_badgescaps' of git://github.com/skodak/moodle 2013-06-18 00:55:53 +02:00
Eloy Lafuente (stronk7)
a48dad1fe1 Merge branch 'MDL-33562-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-06-18 00:40:36 +02:00
Sam Hemelryk
007b5f5f35 Merge branch 'MDL-30132_master' of git://github.com/lazydaisy/moodle 2013-06-18 10:27:11 +12:00
Sam Hemelryk
03d34e07c0 Merge branch 'wip-mdl-16982' of git://github.com/rajeshtaneja/moodle 2013-06-18 10:04:18 +12:00
Petr Škoda
ad35231698 MDL-40210 do not use CAP_PREVENT for role defaults! 2013-06-17 12:12:36 +02:00
Dan Poltawski
e9d011250e Merge branch 'MDL-40110_master' of git://github.com/dmonllao/moodle 2013-06-17 17:02:11 +08:00
Dan Poltawski
85db00e0c3 Merge branch 'MDL-39825_dev_master' of https://github.com/totara/openbadges 2013-06-17 16:40:24 +08:00
Dan Poltawski
af08eb9912 Merge branch 'MDL-39474-master' of git://github.com/sammarshallou/moodle 2013-06-17 15:36:15 +08:00
Dan Poltawski
877bb8294c Merge branch 'MDL-31680' of https://github.com/ppichet/moodle 2013-06-17 14:53:19 +08:00
Dan Poltawski
e00916d933 Merge branch 'wip-MDL-40136-m26' of git://github.com/samhemelryk/moodle 2013-06-17 13:37:18 +08:00
Rajesh Taneja
d8372b54b9 MDL-16982 Administration: Moved bulk action outside loop and using profile api to save data 2013-06-17 12:55:09 +08:00
Sam Hemelryk
68e33c2932 Merge branch 'm26_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle 2013-06-17 16:14:00 +12:00
Sam Hemelryk
ca64174031 Merge branch 'MDL-21933_master' of https://github.com/mr-russ/moodle 2013-06-17 15:45:56 +12:00
Sam Hemelryk
e4ce39c99f Merge branch 'wip-MDL-40091-master' of git://github.com/satrun77/moodle 2013-06-17 15:43:31 +12:00
Sam Hemelryk
d63082454b Merge branch 'MDL-39369' of git://github.com/rwijaya/moodle 2013-06-17 15:10:41 +12:00
Sam Hemelryk
e41ecc6260 Merge branch 'MDL-39761-master' of https://github.com/lucisgit/moodle 2013-06-17 14:30:24 +12:00
Marina Glancy
ba75dfd10d Merge branch 'wip-MDL-40142-m26' of git://github.com/samhemelryk/moodle 2013-06-17 10:43:29 +10:00
Sam Hemelryk
a4f264031a MDL-39949 dock: fixed whitespace 2013-06-17 10:24:39 +12:00
Sam Hemelryk
7d1d4137ca Merge branch 'wip-MDL-39949-master' of git://github.com/phalacee/moodle 2013-06-17 10:01:10 +12:00
Sam Hemelryk
d85f228f18 MDL-40137 theme_clean: corrected lib.php function names 2013-06-17 09:39:23 +12:00
Sam Hemelryk
67b34c34f0 MDL-40136 cache: fixed dirroot change bugs with plugin caches 2013-06-17 09:23:50 +12:00
Sam Hemelryk
8a7d747581 MDL-40142 navigation: fixed chainable issue with navigation JS 2013-06-17 09:11:45 +12:00
Russell Smith
62d6f183c4 MDL-40103 Backup: Move install.xml templates to inline XML 2013-06-15 15:07:03 +10:00
Russell Smith
283e448ab3 MDL-40103 stats: Move db temp templates to inline xmldb tables 
Move all statistics temporary tables into the code.  We are not
going to continue to use database templates.  They were a mix
of reading the install.xml and tables in the database.  It is
much clearer to have them created inline at the point they are
used in the code.
 2013-06-15 15:03:02 +10:00
Mohamed Alsharaf
8e484df3a6 MDL-40091 book: revision must be incremented after editing a chapter 2013-06-14 21:19:48 +12:00
Marina Glancy
f192883305 weekly release 2.6dev 2013-06-14 13:18:50 +10:00
Marina Glancy
3bc90f93ee Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-06-14 12:53:23 +10:00
Rossiani Wijaya
f2a41c5136 MDL-39369: Lesson module: change settype PARAM_TEXT to PARAM_NOTAGS 2013-06-13 15:34:18 +08:00
Rossiani Wijaya
a015bc030c MDL-39369: Lesson module: fix setType() properly 2013-06-13 15:26:13 +08:00
Damyon Wiese
1fba9cf66a MDL-37621 assign: Fix for DB error on update. 
This properly handles the case when the teamsubmissiongroupingid is disabled.
 2013-06-13 15:15:07 +08:00
Dan Poltawski
1f782c4181 MDL-39824: theme_bootstrap: initalise array before use 
This causes warnings when no navigation items are returned.

Also fixed some bad whitespace.
 2013-06-13 14:22:59 +08:00
Dan Poltawski
a151eb403e Revert "MDL-39832 Files: Revert MDL-39688 commit, f111746140fe80a821ae69e3bf518d950bf188a1" 
This reverts commit 3960c00e3cf129c60b01fecdfe2851ba9ef7ba59.
 2013-06-13 13:56:11 +08:00
Dan Poltawski
db74804ff1 Revert "MDL-39832 Files: Fixed ETag format according with RFC2616." 
This reverts commit 9ab37ae3e07f54bc08644f8462d94bed68ff6c9b.
 2013-06-13 13:56:09 +08:00
Damyon Wiese
7e815a6eac MDL-37459 admin: Set the default setting flags on a new install. 
Make sure the default flags for all settings are saved on a new install.
 2013-06-13 15:20:52 +10:00
Russell Smith
d6e52b0061 MDL-21933 course: Allow users to search participants course permission 
Capability checks are performed at the top of the page and do not need
to be completed again.

Search is an expected feature for users and it was confusion to only
appear after 3 pages.  This has been changed to enable search when
there are more records than are visible on the screen.  If users
are unable to use browser search, they will be able to use Moodle's
search.
 2013-06-13 12:44:55 +10:00
Dan Poltawski
e3b472e82c Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle 2013-06-13 10:15:25 +08:00
Damyon Wiese
54106942b3 MDL-37459 admin: Fix for error on updating a locked checkbox 
Changed the way apply_admin_locked_flags gets the current value for the field.

The old way was plain wrong (looking at getValue from the quickform element).
 2013-06-13 11:18:18 +10:00
AMOS bot
9a0d245145 Automatically generated installer lang files 2013-06-13 00:41:25 +00:00