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

61838 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Russell Smith
725ab3d07f MDL-38079 mod_feedback - Hide "add question to activity" button 2013-06-17 19:50:13 +10: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
Ankit Agarwal
5b23d9adac MDL-39152 webservices: Rename external_api::get_context() to external_api::get_context_from_params() 2013-06-17 15:18:49 +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
Dan Poltawski
f1da132271 MDL-40207 simplepie: reduce false failures in unit tests 
The simplepie tests time out too quickly due to a low connect timeout,
to fix this:

* Introduced a way to set the timeout during intitial construction
* Converted the unit tests to use a high timeout value
 2013-06-17 10:32:25 +08:00
Sam Hemelryk
e41ecc6260 Merge branch 'MDL-39761-master' of https://github.com/lucisgit/moodle 2013-06-17 14:30:24 +12:00
AMOS bot
a87a4764e0 Automatically generated installer lang files 2013-06-17 00:43:35 +00: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
Gareth J Barnard
a5c167486b MDL-38318 theme_mymobile: Upgrade to jQueryMobile 1.3.1. 2013-06-15 14:58:02 +01:00
Petr Škoda
1826d0ead6 MDL-26455 add support for custom DB port and socket in CLI installer 2013-06-15 15:07:28 +02:00
Petr Škoda
b29ca9b5d4 MDL-26455 add custom DB port and socket to web installer 2013-06-15 14:38:07 +02: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
David Monllao
051e9663f0 MDL-39634 behat: Removing unused arguments 
Also adding deprecated methods.
 2013-06-14 16:14:04 +08:00
Ankit Agarwal
aac70ffc18 MDL-39152 webservices: Abstract context fetching 
Since many apis in future will need to provide alternative method to fetch context, I have abstracted this bit into the core external_api class
 2013-06-14 15:47:48 +08:00
Nadav Kavalerchik
d0dde5cef7 MDL-40180 - RTL/Clean theme: Misalignment of student name and profile image in grader (fixed by Mary Evans) 2013-06-14 10:35:31 +03:00
Dan Poltawski
4eb42f49a1 MDL-17468 tool_uploaduser: seperate capability for user pictures 2013-06-14 14:04:25 +08:00
Petr Škoda
35ea5db031 MDL-33955 add file download and curl unit tests 2013-06-14 08:03:50 +02:00
Petr Škoda
220eef0e4c MDL-33955 make downalod_file_content() use curl class and cleanup 
The options in constructor were renamed to setttings in order to prevent confusion.
This removes ignored CURLOPT_BINARYTRANSFER, add newline header cleaning,
reworks proxy settings and some other minor issues.
 2013-06-14 08:03:49 +02:00
Petr Škoda
9936c2a54c MDL-33955 fix sloppy whitespace in curl class 2013-06-14 08:03:49 +02:00
Ankit Agarwal
235b5c680a MDL-39152 phpunit: Move core_role_external_testcase() to a new file 
It is not recommended to have multiple test classes in a single phpunit file
 2013-06-14 11:50:25 +08:00
Ankit Agarwal
95a3bb4dc8 MDL-39152 phpunit: improve tests for assign_roles() 
core_role_external::assign_roles() now support alternative paramaters instead of contextid. Test working of those. Also test the parameters validation a bit, since these are no longer automatically tested being optional now
 2013-06-14 11:50:25 +08:00
Ankit Agarwal
3a68f79809 MDL-39152 webservices: Provide alternative to context id 
As per our policy asking for and returning contextids is discouraged in webservices. So provide alternative parameters for the same
 2013-06-14 11:50:25 +08:00