Rajesh Taneja
bc7a59536b
MDL-50481 behat: SingleSelect can be urlselect and should support id/name
2015-07-01 10:52:21 +08:00
David Monllao
b4d7038a88
Merge branch 'MDL-50497-M30' of git://github.com/lazydaisy/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2015-07-01 08:54:28 +08:00
Eloy Lafuente (stronk7)
e96e66aa16
MDL-50130 todo: Conditional code to be changed to API by MDL-50728
2015-06-30 19:56:48 +02:00
Juan Leyva
f804c73055
MDL-50130 users: Filter profile fields data in external functions
2015-06-30 19:52:19 +02:00
AMOS bot
7fd8762479
Automatically generated installer lang files
2015-07-01 00:04:55 +08:00
Dan Poltawski
0b45c56da1
Merge branch 'wip-mdl-50481' of https://github.com/rajeshtaneja/moodle
2015-06-30 12:25:52 +02:00
Dan Poltawski
2606aecc3b
Merge branch 'MDL-33765_master_offset' of git://github.com/markn86/moodle
2015-06-30 11:32:47 +02:00
Dan Poltawski
8ce68b0723
Merge branch 'MDL-43949_master' of git://github.com/dmonllao/moodle
2015-06-30 10:34:08 +02:00
Dan Poltawski
1b80849856
Merge branch 'MDL-47787-master' of https://github.com/tbannister/moodle
2015-06-30 09:52:52 +02:00
David Monllao
35af60da7e
MDL-50569 backup: Missing get_target call
2015-06-30 10:26:18 +08:00
Dan Marsden
476e97f280
MDL-50614 mod_scorm: Improve validation on currentorg
2015-06-30 10:12:51 +08:00
David Monllao
c6a1425ffb
Merge branch 'MDL-50569-master' of git://github.com/FMCorz/moodle
2015-06-30 09:30:57 +08:00
Mark Nelson
eabbc98c78
MDL-50220 mod_forum: added missing capability check
2015-06-29 18:43:09 +02:00
Eloy Lafuente (stronk7)
154d468dbb
Merge branch 'wip-mdl-50675' of https://github.com/rajeshtaneja/moodle
2015-06-29 18:25:55 +02:00
Eloy Lafuente (stronk7)
0339f2c4c1
MDL-50688 lib: small cleanup + http/https coverage.
2015-06-29 17:12:55 +02:00
Petr Skoda
5c1f41f058
MDL-50688 lib: fix local url validation bug
...
Change-Id: I350bb8c9ace5cc0403f083f728c100097be7aa7e
Reviewed-on: https://review.totaralms.com/8101
Tested-by: Jenkins Automation <jenkins@totaralms.com>
Reviewed-by: Sam Hemelryk <sam.hemelryk@totaralms.com>
Reviewed-by: Alastair Munro <alastair.munro@totaralms.com>
2015-06-29 16:44:03 +02:00
Ankit Agarwal
2149326b8c
MDL-50049 deprecation: Remove usage of deprecated api and cleanup
2015-06-29 17:15:50 +05:30
Skylar Kelty
56af0fbda8
MDL-50663 blocks: Fix /my/ page when in non-user context
2015-06-29 11:37:10 +01:00
David Monllao
489878ad09
Merge branch 'MDL-50708_master' of git://github.com/nadavkav/moodle
2015-06-29 15:57:27 +08:00
Michael Aherne
8daf8d87f2
MDL-50466 tasks: Specific minute values for log cleanup
2015-06-29 08:45:04 +01:00
Frederic Massart
eff864e7eb
MDL-50569 grades: Restore as merge always ignores minmaxtouse
2015-06-29 14:24:13 +08:00
Frederic Massart
cd4061ecd4
MDL-50569 grades: Handle minmaxtouse in backup/restore
2015-06-29 14:24:12 +08:00
Ankit Agarwal
8322ed4a66
MDL-50049 deprecation: Rearrange deprecated apis for better future management
2015-06-29 11:36:36 +05:30
Ankit Agarwal
33c46db574
MDL-50049 deprecation: Group together long term deprecated apis
2015-06-29 11:36:36 +05:30
Ankit Agarwal
1ac1d29b6d
MDL-50049 deprecation: Final deprecation of old apis
2015-06-29 11:36:36 +05:30
David Monllao
21a0a68196
Merge branch 'MDL-50646-master-preflang' of git://github.com/mudrd8mz/moodle
2015-06-29 13:35:44 +08:00
David Monllao
e3e7c90528
Merge branch 'MDL-50652_master' of git://github.com/reskit/moodle
2015-06-29 13:01:51 +08:00
Mark Nelson
8e7774fa8c
MDL-33765 filter_glossary: fixed jshint warning
2015-06-28 21:44:11 -07:00
Martin Mastny
a42f94a38d
MDL-33765 filter_glossary: Stacking JS windows with offset
2015-06-28 21:44:11 -07:00
Martin Mastny
57a1f4fc65
MDL-33765 mod_glossary: Concept in ajax request not linking to itself
2015-06-28 21:44:11 -07:00
David Monllao
5324a7202a
Merge branch 'wip_MDL-50659_master' of git://github.com/gjb2048/moodle
2015-06-29 11:45:02 +08:00
Rajesh Taneja
139dcb1879
MDL-50675 repository_wikimedia: Fixed title varaible
2015-06-29 09:53:45 +08:00
Rajesh Taneja
f463158b1f
MDL-50675 repository_wikimedia: Wikimedia is using https and not http
2015-06-29 09:53:02 +08:00
Nadav Kavalerchik
e51bdc0bcc
MDL-50708 SCORM: Right align menu item folder icon, when in RTL mode.
2015-06-27 23:49:11 +03:00
Gareth J Barnard
8576569f14
MDL-50659 themes: Regression: Drag a link makes icons move.
2015-06-26 11:41:16 +01:00
Paul Nicholls
a673650477
MDL-50699 Lesson: "Link to next activity" empty until Lesson saved
...
Due to a logic bug, the "Link to next activity" dropdown was empty (only
contains the "None" option) until the Lesson had been saved. This minor
change allows a "next activity" to be specified when initially creating
the Lesson whilst still preventing the user from choosing the Lesson as its
own next activity.
2015-06-26 16:16:23 +12:00
Tyler Bannister
7f7144fd50
MDL-47787 course: Added question delete to cm delete.
2015-06-25 16:35:22 -04:00
Mary Evans
d8d65e76e0
MDL-50497 theme_bootstrapbase: Divider colours look wrong when inverted
2015-06-25 18:18:56 +01:00
Marc Català
90faa6ae9c
MDL-50652 workshop: Workshop module allows duplicated ID number
2015-06-25 14:28:10 +02:00
David Monllao
ed0fd1f6ec
MDL-43949 groups: Add idnumber to web services
...
Thanks to Vitor Martins for his contribution.
2015-06-25 16:55:14 +08:00
Marina Glancy
fd36588fb6
MDL-49257 grades: apply freeze when restoring with contents deleting
2015-06-25 14:39:15 +08:00
David Monllao
38cb73a47f
weekly release 3.0dev
2015-06-25 13:49:57 +08:00
David Monllao
f301aacb6f
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2015-06-25 13:49:55 +08:00
Marina Glancy
feda17c38e
MDL-49257 grades: strings adjustments
2015-06-25 09:56:36 +08:00
Bas Brands
bffb1c15b3
MDL-50653 user: forgotten closing div tag on the page
...
The /user/view.php was missing a closing div for the <div class="description">
causing the page grid to break on any Bootstrap 3 based theme.
2015-06-24 08:36:52 +02:00
David Monllao
94f73fdbcc
MDL-50283 gradeform_rubric: No need to escape HTML entities
2015-06-24 11:21:56 +08:00
Eloy Lafuente (stronk7)
870d1aae1e
MDL-49022 auth_ldap: keep method visibility unmodified.
2015-06-24 03:07:35 +02:00
Eloy Lafuente (stronk7)
78f312ae75
Merge branch 'wip-mdl-49022' of https://github.com/rajeshtaneja/moodle
2015-06-24 03:02:59 +02:00
Dan Poltawski
b32ba584b2
Merge branch 'MDL-49497' of git://github.com/stronk7/moodle
2015-06-23 16:25:04 +01:00
Eloy Lafuente (stronk7)
9a1adda585
MDL-49497 curl: keep api private and test it using reflection.
...
While strictly we should not be testing private APIs, in order
to get this backported to stables without changing visibility
we use reflection to access to such private properties and methods.
Also added one exttest to verify user agent is properly sent.
Finally, fix some wrong whitespace and changed the helper class name
to better alternative.
2015-06-23 17:20:20 +02:00