Dan Poltawski
c33ea63147
Merge branch 'install_master' of git://git.moodle.org/moodle-install
2013-12-05 15:09:47 +08:00
Mark Nelson
626aec1e74
MDL-43215 core_webservice: retrieve all user name fields when adding a token
2013-12-04 20:56:25 -08:00
David Monllao
a9c32ee29e
MDL-41592 behat: Setting a default value for CFG->behat_wwwroot in case it is empty
2013-12-05 17:06:02 +13:00
Dan Poltawski
dfe84ffb52
MDL-37517 testing: remove deprecated classes
2013-12-05 12:05:10 +08:00
Dan Poltawski
b9aaae163e
MDL-40517 deprecatedlib: remove functions
...
* Removed functions which were throwing fatal errors
* Fixup navmenu comment, as it hasn't been throwing a fatal error, it
shouldn't be removed as part of this issue yet. (Although if you are
still using this function, you are crazy and should thank me ;-)).
2013-12-05 11:55:33 +08:00
Ankit Agarwal
b2ff512c59
MDL-42097 auth: Webservice auth uses tokens only not passwords
2013-12-05 10:58:41 +08:00
Petr Škoda
0b3bd8cb7f
MDL-42097 fix handling of passwords when creating new users
2013-12-05 10:58:31 +08:00
Yuliya Bozhko
c8d2f392c5
MDL-42965 badges: Improve badge criteria review performance
2013-12-05 14:47:55 +13:00
Andrew Nicols
c0c1b7ac97
MDL-43212 JavaScript: Remove deprecated moodle-enrol-notification
2013-12-05 09:42:31 +08:00
Sam Hemelryk
ec6219a2e7
Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle
2013-12-05 08:25:35 +13:00
Sam Hemelryk
ba9935866a
Merge branch 'MDL-43185-master' of git://github.com/FMCorz/moodle
2013-12-05 08:07:59 +13:00
sam marshall
8ff1fb6ffe
MDL-42084 Fix breakage in grader preferences page
2013-12-04 17:00:08 +00:00
Andrew Nicols
81cb52bb9a
MDL-38776 JavaScript: Migrate moodle-form-showadvanced to Shifter
2013-12-04 22:51:26 +08:00
Andrew Nicols
5e4ef61c00
MDL-38775 JavaScript: Migrate moodle-form-shortforms to Shifter
2013-12-04 22:24:32 +08:00
Andrew Nicols
d692861010
MDL-43202 JavaScript: Migrate moodle-course-toolboxes to user Shifter
2013-12-04 22:05:16 +08:00
Gareth J Barnard
9124c1f2d3
MDL-40213 theme_clean: Layout "secure.php" missing settings.
2013-12-04 11:23:32 +00:00
Andrew Nicols
ea90423cf9
MDL-43194 JavaScript: Correct maxlen jshint configuration
2013-12-04 16:39:48 +08:00
Dan Marsden
8164a2b549
MDL-43192 Repository: param doesn't exist - should use function
2013-12-04 20:54:57 +13:00
Dan Poltawski
0f18e134fb
Merge branch 'wip-MDL-40191-2-master' of git://github.com/marinaglancy/moodle
2013-12-04 15:44:03 +08:00
Marina Glancy
b9c3f07ad0
MDL-40191 folder: Do not check capability in renderer
...
Capability to access the module is already checked before calling the renderer. Extra check works bad together with switching roles
2013-12-04 18:27:55 +11:00
Dan Poltawski
50de5b4c06
Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle
2013-12-04 14:57:24 +08:00
Rajesh Taneja
e70bfef4ff
MDL-43028 navigation: fixed section for profilepage
...
section for profile page is profilepage and not mypage
2013-12-04 14:48:30 +08:00
Tim Lock
8ed63d4710
MDL-34020: Further work on IMS package importing when using Blackboard packages
2013-12-04 15:16:59 +10:30
Dan Poltawski
03579d47ca
Merge branch 'MDL-42563_filter_algebra_thirdpartylibs.xml' of https://github.com/tmuras/moodle
2013-12-04 11:30:09 +08:00
Frederic Massart
6046f1c8f1
MDL-43185 behat: Use realpath on existing paths
2013-12-04 10:59:49 +08:00
Sam Hemelryk
5ba212b444
Merge branch 'MDL-43084-master' of git://github.com/phalacee/moodle
2013-12-04 15:29:00 +13:00
Damyon Wiese
88e39201d7
Merge branch 'MDL-43083-master' of git://github.com/phalacee/moodle
2013-12-04 09:52:51 +08:00
Dan Poltawski
fed9deadcd
MDL-42597 yui: remove stale built files
2013-12-04 09:08:54 +08:00
Dan Poltawski
d22147667d
Merge branch 'wip-mdl-42597' of https://github.com/rajeshtaneja/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-12-04 08:53:25 +08:00
Jason Fowler
c8b0cb2640
MDL-43084 Themes: fixing dialog header in standard theme
2013-12-04 08:43:42 +08:00
AMOS bot
97c645c016
Automatically generated installer lang files
2013-12-04 00:43:12 +00:00
Dan Poltawski
9fff253293
Merge branch 'master_MDL-43049' of git://github.com/totara/moodle
2013-12-04 08:36:05 +08:00
Rajesh Taneja
f487a8f825
MDL-42597 Administration: Modified maintenance mode countdown to display nicely
...
Added Style and JS to display maintenance mode timer similar
to what is done on moodle demo site for rest.
2013-12-04 08:31:56 +08:00
Eloy Lafuente (stronk7)
e16b1bb124
Merge branch 'MDL-41446-master' of git://github.com/sammarshallou/moodle
2013-12-03 23:55:42 +01:00
Sam Hemelryk
5d288a5dbb
Merge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle
2013-12-04 11:52:12 +13:00
Eloy Lafuente (stronk7)
2574b28b81
Merge branch 'w49_MDL-43117_m27_releaseinfo' of https://github.com/skodak/moodle
2013-12-03 23:45:54 +01:00
Eloy Lafuente (stronk7)
200fcba737
Merge branch 'MDL-43142_master' of https://github.com/markn86/moodle
2013-12-03 23:40:19 +01:00
Eloy Lafuente (stronk7)
e3febb2315
Merge branch 'MDL-43140_master' of https://github.com/markn86/moodle
2013-12-03 23:24:22 +01:00
Sam Hemelryk
12f46583f0
Merge branch 'MDL-43093' of git://github.com/timhunt/moodle
2013-12-04 10:12:12 +13:00
Sam Hemelryk
4f13423663
Merge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle
2013-12-04 09:49:29 +13:00
Sam Hemelryk
2a336e2a36
Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle
...
Conflicts:
backup/util/ui/base_moodleform.class.php
2013-12-04 09:44:25 +13:00
Sam Hemelryk
db9c8f4c7d
Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle
2013-12-04 09:43:43 +13:00
Eloy Lafuente (stronk7)
7b583eea95
Merge branch 'wip-MDL-43058-master' of git://github.com/abgreeve/moodle
2013-12-03 19:33:15 +01:00
Eloy Lafuente (stronk7)
75b296abf6
Merge branch 'MDL-43105-master' of git://github.com/andrewnicols/moodle
2013-12-03 19:15:05 +01:00
Eloy Lafuente (stronk7)
3e1a05790d
Merge branch 'master-mdl33971' of https://github.com/tlock/moodle
2013-12-03 17:17:06 +01:00
Mary Evans
126df92b94
MDL-43092 theme_afterburner: Activity or Resource dialog greyed-out for non-empty courses
2013-12-03 14:52:27 +00:00
Eloy Lafuente (stronk7)
6cc00494e2
Merge branch 'MDL-43079-master-v2' of https://github.com/jamiepratt/moodle
2013-12-03 15:36:25 +01:00
Damyon Wiese
a977fa7b36
Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle
2013-12-03 17:29:39 +08:00
Aaron Barnes
ddb0a1b0e5
MDL-43087 testing: ability to load features from additional paths
2013-12-03 22:11:26 +13:00
Eloy Lafuente (stronk7)
e7b3306a69
Merge branch 'MDL-42885_master' of https://github.com/markn86/moodle
2013-12-03 10:01:19 +01:00