Marina Glancy
|
a2f56679f9
|
Merge branch 'MDL-31938-master' of git://github.com/danpoltawski/moodle
|
2013-10-25 14:56:31 +11:00 |
|
Thijs Kinkhorst
|
9953966213
|
MDL-31938: fix syntax error in db upgrade & update plugin version
Also correct language class name.
|
2013-10-25 11:51:30 +08:00 |
|
Iñaki Arenaza
|
02a9e4a7f3
|
MDL-31938, MDL-36138 auth_cas: upgrade phpCAS library
Proxy mode changes testing still pending (we don't have such a setup).
|
2013-10-25 11:51:23 +08:00 |
|
Dan Poltawski
|
6356be73d0
|
Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle
|
2013-10-25 11:33:19 +08:00 |
|
Rajesh Taneja
|
ca85839fd3
|
MDl-42261 My Home: Fixed string key to show all courses
|
2013-10-25 11:26:58 +08:00 |
|
Dan Poltawski
|
eb04bc4a86
|
Merge branch 'w43_MDL-42381_m26_ole' of https://github.com/skodak/moodle
|
2013-10-25 10:05:55 +08:00 |
|
Eloy Lafuente (stronk7)
|
27ee4c13a5
|
Merge branch 'MDL-42377_master' of https://github.com/markn86/moodle
|
2013-10-25 01:14:04 +02:00 |
|
Eloy Lafuente (stronk7)
|
7419751a4c
|
Merge branch 'MDL-41966-master' of git://github.com/ankitagarwal/moodle
|
2013-10-25 01:09:25 +02:00 |
|
Eloy Lafuente (stronk7)
|
20ddc0c9cf
|
Merge branch 'MDL-42410-master' of git://github.com/danpoltawski/moodle
|
2013-10-24 23:35:24 +02:00 |
|
Eloy Lafuente (stronk7)
|
c783a415dc
|
Merge branch 'w43_MDL-42442_m26_standardwhite' of https://github.com/skodak/moodle
|
2013-10-24 23:33:42 +02:00 |
|
Eloy Lafuente (stronk7)
|
d0285a0d91
|
Merge branch 'w43_MDL-42206_m26_metaedit' of https://github.com/skodak/moodle
|
2013-10-24 23:27:11 +02:00 |
|
Dan Poltawski
|
e36f72414d
|
Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle
|
2013-10-24 16:57:47 +08:00 |
|
Rajesh Taneja
|
bcf725398a
|
MDL-42261 My Home: Fixed strings to match moodle standards
|
2013-10-24 16:55:27 +08:00 |
|
Rajesh Taneja
|
6fb0760827
|
MDL-42261 My Home: Added link to show all courses on my home page
If not forced by admin, user can see all courses by clicking on link
|
2013-10-24 16:55:26 +08:00 |
|
Dan Poltawski
|
3f9a9e86b3
|
Merge branch 'MDL-42338' of git://github.com/rwijaya/moodle
|
2013-10-24 16:28:46 +08:00 |
|
Dan Poltawski
|
5ab04db356
|
Merge branch 'MDL-42388-master' of git://github.com/sammarshallou/moodle
|
2013-10-24 16:15:24 +08:00 |
|
Dan Poltawski
|
76dcc0ee21
|
Merge branch 'MDL-42389-master' of git://github.com/sammarshallou/moodle
|
2013-10-24 16:07:17 +08:00 |
|
Dan Poltawski
|
680d9052ad
|
Merge branch 'MDL-42477-master' of git://github.com/FMCorz/moodle
|
2013-10-24 15:55:52 +08:00 |
|
Dan Poltawski
|
012b0472c5
|
Merge branch '42299-26' of git://github.com/samhemelryk/moodle
Conflicts:
version.php
|
2013-10-24 15:47:48 +08:00 |
|
Dan Poltawski
|
c6dd6d2eb7
|
Merge branch 'wip-MDL-42486-master' of git://github.com/marinaglancy/moodle
|
2013-10-24 15:15:07 +08:00 |
|
Dan Poltawski
|
2d2c5f36c4
|
Merge branch 'MDL-42272-master' of git://github.com/ankitagarwal/moodle
|
2013-10-24 12:43:52 +08:00 |
|
Dan Poltawski
|
205d507f87
|
Merge branch 'MDL-42362_master' of git://github.com/dmonllao/moodle
|
2013-10-24 12:39:38 +08:00 |
|
Dan Poltawski
|
f76c87151f
|
Merge branch 'wip-MDL-42323-master' of git://github.com/marinaglancy/moodle
|
2013-10-24 12:33:15 +08:00 |
|
Marina Glancy
|
c7944a72b3
|
Merge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle
|
2013-10-24 15:29:15 +11:00 |
|
Marina Glancy
|
33c4c3a363
|
Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle
|
2013-10-24 14:15:05 +11:00 |
|
rwijaya
|
45535d95b3
|
MDL-42338 lti_mod: convert hardcoded string.
|
2013-10-24 10:30:02 +08:00 |
|
Damyon Wiese
|
76f8eb9be9
|
Merge branch 'MDL-40976-behat-fix' of git://github.com/dmonllao/moodle
|
2013-10-24 10:29:05 +08:00 |
|
Dan Poltawski
|
93488d8bb0
|
Merge branch 'MDL-42293-master' of git://github.com/ankitagarwal/moodle
|
2013-10-24 10:27:23 +08:00 |
|
Dan Poltawski
|
459dbd4362
|
Merge branch 'MDL-42030-master' of git://github.com/mouneyrac/moodle
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
|
2013-10-24 10:19:47 +08:00 |
|
Frederic Massart
|
37008335c0
|
MDL-42477 filter_glossary: Alert was not showing
|
2013-10-24 09:11:15 +08:00 |
|
Dan Poltawski
|
295e4fa8f4
|
MDL-29070 enrol_imsenterprise: more code cleanups
Including:
* fix whitespace
* coding style fixes:
* Declare method visibility
* Don't have variable names with underscores
* Comments without .
* if/for loop spacing
* Unused variables
* Split long lines
* Removed outdates files
* moodlecheck warnings
* code checker warnings
|
2013-10-23 17:10:56 +08:00 |
|
Brian Biggs
|
1ee378bbdc
|
MDL-29070 enrol_imsenterprise: Code cleanup
In preparation for new features.
|
2013-10-23 17:10:35 +08:00 |
|
David Monllao
|
2a9275c4c5
|
MDL-40976 behat: Updating tests according to new behaviour
We only open the actions menu when is collapsed.
|
2013-10-23 16:19:33 +08:00 |
|
Dan Poltawski
|
b8a5092f2e
|
Merge branch 'MDL-42342-master' of git://github.com/ankitagarwal/moodle
|
2013-10-23 15:26:54 +08:00 |
|
Dan Poltawski
|
276c451b2a
|
Merge branch 'MDL-42343_master' of git://github.com/dmonllao/moodle
|
2013-10-23 15:12:22 +08:00 |
|
Dan Poltawski
|
0f136c1a5b
|
Merge branch 'MDL-42290-master' of git://github.com/ankitagarwal/moodle
|
2013-10-23 14:36:07 +08:00 |
|
Marina Glancy
|
90eb4ddd9a
|
Merge branch '42246-26' of git://github.com/samhemelryk/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
|
2013-10-23 17:22:28 +11:00 |
|
Damyon Wiese
|
19becd541a
|
Merge branch 'MDL-42210_master' of git://github.com/grabs/moodle
|
2013-10-23 14:06:04 +08:00 |
|
Damyon Wiese
|
db812f5e5a
|
Merge branch 'w43_MDL-42208_m26_authunmask' of https://github.com/skodak/moodle
|
2013-10-23 13:37:24 +08:00 |
|
Petr Škoda
|
a668a7e420
|
MDL-42208 fix JS get_string usage and remove unnecessary params from auth password unmask init
|
2013-10-23 07:32:24 +02:00 |
|
Dan Poltawski
|
40f0a3abed
|
Merge branch 'wip-MDL-42278-master' of git://github.com/marinaglancy/moodle
|
2013-10-23 13:20:08 +08:00 |
|
Dan Poltawski
|
8c8a844f2b
|
Merge branch '42277-26' of git://github.com/samhemelryk/moodle
|
2013-10-23 13:18:45 +08:00 |
|
Dan Poltawski
|
d0041fb110
|
Merge branch 'w43_MDL-38743_m26_private' of https://github.com/skodak/moodle
|
2013-10-23 13:15:48 +08:00 |
|
Dan Poltawski
|
de3d8fda10
|
Merge branch 'MDL-40531' of https://github.com/stronk7/moodle
|
2013-10-23 12:37:45 +08:00 |
|
Marina Glancy
|
d82a3b9f76
|
Merge branch 'MDL-42427-master' of git://github.com/ankitagarwal/moodle
|
2013-10-23 15:34:47 +11:00 |
|
Ankit Agarwal
|
f3218d15b0
|
MDL-42427 backup: Fix undefined errors during automated backups
|
2013-10-23 12:03:13 +08:00 |
|
Damyon Wiese
|
f45d62e792
|
MDL-41339 Tags - use uppercase for SQL keywords (AS)
|
2013-10-23 12:00:01 +08:00 |
|
Damyon Wiese
|
549ce3fa76
|
Merge branch 'wip-mdl-41339' of https://github.com/jennymgray/moodle
|
2013-10-23 11:50:50 +08:00 |
|
Marina Glancy
|
ab864f2c36
|
Merge branch 'MDL-42426-master' of git://github.com/damyon/moodle
|
2013-10-23 13:59:50 +11:00 |
|
Marina Glancy
|
4f10bc6bb0
|
Merge branch '42301-26' of git://github.com/samhemelryk/moodle
|
2013-10-23 13:51:00 +11:00 |
|