mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-28 03:22:38 +01:00
Code Issues Projects Releases Wiki Activity
66,267 Commits 36 Branches 527 Tags
6dcea23522
Commit Graph

66267 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
6dcea23522 Merge branch 'w04_MDL-34055_m27_insertrecords' of https://github.com/skodak/moodle 2014-01-28 10:43:51 +01:00
Petr Škoda
cc5dba8e54 MDL-34055 add bulk DB->insert_records() method 
This patch was inspired by patch by Simon Coggins from Totara.
 2014-01-28 10:41:43 +08:00
Eloy Lafuente (stronk7)
56f39760ac Merge branch 'master_MDL-43797' of https://github.com/totara/moodle 2014-01-28 00:43:16 +01:00
David Curry
c8ade8cbdc MDL-43797 lib/db/upgrade.php: Optimise sql for my_pages deletion 
Change-Id: Idf300ab07afda3bcefea80e617549f40c710e529
 2014-01-28 12:36:04 +13:00
Sam Hemelryk
9123721e4f Merge branch 'MDL-43246' of git://github.com/timhunt/moodle 2014-01-28 12:16:20 +13:00
Eloy Lafuente (stronk7)
9fc25660c5 Merge branch 'MDL-43450_master' of git://github.com/dmonllao/moodle 2014-01-28 00:07:57 +01:00
Eloy Lafuente (stronk7)
bc6a79aee6 Merge branch '43688-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-27 23:58:18 +01:00
David Curry
a5ab83ac5e MDL-43797 lib/db/upgrade.php: Remove custom pages for deleted users 
Change-Id: Ifef563431682a2a5524927f85ca9eba9cbe520ff
 2014-01-28 11:55:17 +13:00
Eloy Lafuente (stronk7)
835ef9d84c Merge branch 'MDL-43874' of git://github.com/timhunt/moodle 2014-01-27 23:52:07 +01:00
David Curry
72d1ccffb3 MDL-43797 lib/moodlelib.php: Remove custom homepages on user deletion 
Change-Id: Ibaf6f0a9dc29d00b97a32111d1cf5063ebed1888
 2014-01-28 11:41:20 +13:00
Eloy Lafuente (stronk7)
2c8b15c50d Merge branch 'MDL-43757_master' of git://github.com/dmonllao/moodle 2014-01-27 21:20:39 +01:00
Sam Hemelryk
c77d28e5b2 Merge branch 'wip-MDL-43643-master' of git://github.com/marinaglancy/moodle 2014-01-28 08:40:45 +13:00
Eloy Lafuente (stronk7)
b598c48179 Merge branch 'wip-mdl-43765' of https://github.com/rajeshtaneja/moodle 2014-01-27 19:23:09 +01:00
Eloy Lafuente (stronk7)
705718fb7c Merge branch 'wip-mdl-43766' of https://github.com/rajeshtaneja/moodle 2014-01-27 19:19:31 +01:00
Eloy Lafuente (stronk7)
c88dba093e Merge branch 'MDL-43773-master' of https://github.com/lucisgit/moodle 2014-01-27 17:18:56 +01:00
Eloy Lafuente (stronk7)
8fce57c001 Merge branch 'MDL-43581' of git://github.com/timhunt/moodle 2014-01-27 17:03:25 +01:00
Tim Hunt
e101ec9fd7 MDL-43874 quiz, teacher comments should respect display options. 
Whether the comments on manually graded questions were visible to
students should have been controlled by the 'Specific feedback' Review
option in the quiz settings. However, the quiz was not setting
$displayoptions->manualcomment, so it did not work.
 2014-01-27 12:01:32 +00:00
Eloy Lafuente (stronk7)
9be395ee99 Merge branch 'wip-MDL-43800-master' of git://github.com/marinaglancy/moodle 2014-01-27 12:02:28 +01:00
Tim Hunt
391edc51f9 MDL-43581 additionalhtmlfooter should be added to every page 
Not just pages with a visible footer.
 2014-01-27 10:24:43 +00:00
Eloy Lafuente (stronk7)
5e7f4b1c19 Merge branch 'MDL-43809' of git://github.com/timhunt/moodle 2014-01-27 10:59:37 +01:00
Sam Hemelryk
049422651c Merge branch 'MDL-33839c' of git://github.com/mkassaei/moodle 2014-01-27 15:28:47 +13:00
Sam Hemelryk
068ffec81b Merge branch 'w04_MDL-43761_m27_sqlinstall' of https://github.com/skodak/moodle 2014-01-27 14:30:57 +13:00
Eloy Lafuente (stronk7)
f4068d757f Merge branch 'MDL-43758_master' of git://github.com/dmonllao/moodle 2014-01-27 01:18:05 +01:00
Eloy Lafuente (stronk7)
3b5e8aebbe Merge branch 'MDL-43734_purgeUserSession' of https://github.com/moodlerooms/moodle 2014-01-27 00:26:44 +01:00
Sam Hemelryk
9299144461 Merge branch 'w04_MDL-43746_m27_courselogin' of https://github.com/skodak/moodle 2014-01-27 11:32:08 +13:00
Sam Hemelryk
00dfc95708 Merge branch 'MDL-43794' of https://github.com/merrill-oakland/moodle 2014-01-27 11:16:11 +13:00
M Kassaei
435d32798b MDL-33839d, Remove the move icon from the question bank 2014-01-24 14:40:16 +00:00
Tony Butler
4d72dfa956 MDL-43773 mod_choice: Swap order of name column headings in text export 2014-01-24 11:17:48 +00:00
David Monllao
b8c4d91ca0 MDL-43450 behat: Improving error messages 2014-01-24 16:45:27 +08:00
David Monllao
a922209e84 MDL-43758 performance: New metric, time spent by the database 
This patch adds a new performance metric to the performance
info shown by MDL_PERF* vars, the time spent by the database,
it was one of the wonderful @poltawski ideas. To be more specific
the value displayed is the sum of the time elapsed between query_start()
and query_end().
 2014-01-24 16:07:01 +08:00
David Monllao
cca6f37389 MDL-43757 behat: Allowing the form field guesser to detect TinyMCE 
It includes 2 more minor fixes:
- Escapes values sent to TinyMCE as it was breaking
  when values contained double quotes.
- Adding seconds to the screenshots directory to
  avoid using the same folder for multiple runs.
 2014-01-24 15:06:12 +08:00
David Monllao
495db71fce MDL-43757 messaging: Behat feature to test participants messaging 
The new test checks that messages can be sent from
the participants block and they can be read when
accesing user's recent conversations.
 2014-01-24 15:06:12 +08:00
Petr Skoda
9d202aed27 MDL-43746 fix require_course_login regression caused by MDL-25981 2014-01-24 13:50:57 +08:00
Petr Škoda
b4b03d38b7 MDL-43761 execute bulk sql when modifying db structure 
In case of postgresql this uses transactions to allow easier recovery from broken installs.
 2014-01-24 13:47:41 +08:00
Petr Škoda
ab3fc898f4 MDL-43761 use single query in mysql when crating tables 2014-01-24 13:46:30 +08:00
Petr Skoda
3f17d7091b MDL-43761 refactor db manager code to send arrays of SQL to the dml driver 2014-01-24 13:45:07 +08:00
Jason Fowler
2eab90fa7f MDL-40786 User profile: Fixing narrow screen RTL collapse 2014-01-24 08:36:02 +08:00
Nadav Kavalerchik
293a18945c MDL-40786 User Profile: Right align profile fields in RTL mode (theme/bootstrapbase, theme/clean) 2014-01-24 08:35:46 +08:00
Sam Hemelryk
5a3e5fa078 MDL-43688 dndupload: fixed positioning across themes 2014-01-24 09:52:47 +13:00
Tim Hunt
5c0b5ba575 MDL-43809 qformat_xml messes up $s in multianswer questions. 2014-01-23 15:26:38 +00:00
Tim Hunt
84b3710842 MDL-43246 question engine: avoid order-by id. 
This was breaking with oracle master/master replication. Fortunately all
the places that needed to be changed were private to datalib.php. There
is still some ordering by id there, but only places where we want a
consitent, rather than meaningful, order, so that is OK.

The queries changed by this patch all have subqueries in aggregate
queries that pull out the latest step for a question_attempt. Those
queries used to look for MAX(id) but now they look for
MAX(sequencenumber). This is equivalent (for databases where ids always
increase with time, except for auto-saved steps. In the past,  an
auto-saved step might have been considered latest. Now the latest step
will always be one that has been properly processed. You can aruge that
this change is an improvement. Anyway, it is a moot point. All these
queries are only used in reports which are run on completed attempts,
where there will not be any autosaved data.
 2014-01-23 15:20:59 +00:00
Tim Hunt
5b0a31bf20 MDL-43246 some question data mapper unit tests 
With fixes for the issues unearthed by these tests.
 2014-01-23 15:20:58 +00:00
Tim Hunt
28273694e5 MDL-43246 give unit tests class a better name. 2014-01-23 15:20:57 +00:00
Eloy Lafuente (stronk7)
9788e26805 weekly release 2.7dev 2014-01-23 12:38:19 +01:00
Eloy Lafuente (stronk7)
93473e5dd2 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-01-23 12:38:06 +01:00
Damyon Wiese
b158296ece Revert "MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close." 
This reverts commit ed3d1ee60d1e48ade21438fd98fef2deb63ecb5f.
This reverts commit ed8eebeecefa98e17c96084b72fe2cd923cc051d.
This reverts commit f664a9387818b5b359df4696040da0aea07b926a.
This reverts commit 9d2276572372f5d249cde8c61d0976e25f0fa4a8.
 2014-01-23 17:14:56 +08:00
Dan Marsden
ed3d1ee60d MDL-43247 SCORM: use window.closed property instead of window.opener for IE 2014-01-23 20:38:01 +13:00
Marina Glancy
0eadedea57 MDL-43643 chat: do not assign to nonexisting cm_info properties 2014-01-23 10:59:33 +08:00
Damyon Wiese
ed8eebeece MDL-43247 Scorm: Fix for undefined js variable when popup is blocked. 2014-01-23 10:49:56 +08:00
Damyon Wiese
6baeabc140 Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle 2014-01-23 10:27:18 +08:00