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

67193 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Hemelryk
2ce17661e8 Merge branch 'wip-MDL-46147-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-07-02 09:31:10 +12:00
Mary Evans
dc22f74419 MDL-45507 theme_bootstrapbase: Fix regression for theme based custom menu 
in renderers/core_renderer.php.
 2014-07-02 09:22:49 +12:00
Eloy Lafuente (stronk7)
f7adf8a010 Merge branch 'MDL-45961_MOODLE_26_STABLE' of https://github.com/NeillM/moodle into MOODLE_26_STABLE 2014-07-01 19:23:46 +02:00
Dan Poltawski
92267ed9fe Merge branch 'MDL-46063_26' of git://github.com/schach/moodle into MOODLE_26_STABLE 2014-07-01 17:29:18 +01:00
Dan Poltawski
d520b92579 Merge branch 'MDL-46036_survey_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE 2014-07-01 16:34:32 +01:00
Charles Fulton
83f78c7c5e MDL-43347 grades: convert keep highest to text field 2014-07-01 07:36:15 -07:00
Charles Fulton
78e6292f47 MDL-43347 grades: consistent interface for drop lowest setting 2014-07-01 07:36:08 -07:00
Dan Poltawski
e666c72330 Merge branch 'MDL-46107_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE 2014-07-01 14:20:53 +01:00
Dan Poltawski
db1cf750bd Merge branch 'wip_MDL-46099_m26_userglobal' of https://github.com/skodak/moodle into MOODLE_26_STABLE 2014-07-01 10:39:18 +01:00
Marina Glancy
2522a179b0 MDL-46147 modinfo: performance improvement for course page (check filterall) 2014-07-01 15:32:48 +08:00
Damyon Wiese
30e2727e72 MDL-46147 modinfo: performance improvement for course page 
This is a big win in a specific situation, ie filters enabled for content+headings,
and no activity descriptions visible on the course page.
 2014-07-01 15:32:41 +08:00
Brian Barnes
faa963ba9a MDL-46144 core_calendar:Fixed label linking in calendar 2014-07-01 13:51:40 +12:00
Sam Hemelryk
3bbb37741f Merge branch 'MDL-40805-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE 2014-07-01 09:06:16 +12:00
Petr Skoda
d0dd8d33bb MDL-46099 session: fix use of references for session globals 
This reverses the references used for global $USER and $SESSION,
the reason is that PHP does not allow references to references.
$USER is a reference to $GLOBALS['USER'] which means we cannot
put any references to it. Solution is to store the current user and session
objects in $GLOBALS['USER'] and $GLOBALS['SESSIOn'] are reference
them in $_SESSION.

This patch makes the session code behave the same way in CLI,
phpunit and normal web requests - this allows use to finally
unit test most aspects of the session code in Moodle.
 2014-07-01 08:38:52 +12:00
Dan Poltawski
824303bada MDL-45641 fix trailing whitespace 2014-06-30 15:47:27 +01:00
Dan Poltawski
cb49ea51eb Merge branch 'wip-mdl-45641-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE 2014-06-30 15:26:39 +01:00
Dan Poltawski
c1f759ab50 Merge branch 'MDL-42467_database_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE 2014-06-30 15:09:54 +01:00
Dan Poltawski
d183fbaf60 Merge branch 'MDL-45833_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-06-30 13:27:18 +01:00
Dan Poltawski
0d0552d430 Merge branch 'MDL-46044-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-06-30 11:45:32 +01:00
Heiko Schach
55ab8ab731 MDL-46063 feedback: Fix user pictures 2014-06-30 13:28:34 +03:00
Dan Poltawski
f50f41c507 Merge branch 'MDL-40228-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-06-30 08:56:47 +01:00
AMOS bot
86573d4ee6 Automatically generated installer lang files 2014-06-29 00:42:58 +00:00
Rajesh Taneja
548e5ecd1b MDL-45641 event: Ldap user_signup unit test added 2014-06-27 16:18:45 +08:00
Rajesh Taneja
695dc96b0e MDL-45641 event: Manually trigger event where needed. 
Some places, user_created_user and user_updated_user
events should be triggred after profile data is saved.
 2014-06-27 16:18:45 +08:00
Rajesh Taneja
7345a2af94 MDL-45641 event: Option to trigger user event manually 
On some pages full user data is not stored before user_created/
user_updated event is triggred. So giving option to trigger that
manually, so it can be triggred after all data is saved
 2014-06-27 16:18:45 +08:00
NeillM
2479cecad9 MDL-45961 Customise this page button on user profile page only works correctly for users own profile 2014-06-27 09:04:41 +01:00
Damyon Wiese
de55ebff23 MDL-46044 Assign: Add conditions to the inner query for performance 2014-06-27 15:01:35 +08:00
Damyon Wiese
157e5a9f9c MDL-46044 Assign: Modify myhome query to only use the maxattempt from the submission 
Using mismatches from the submissions/grades tables does not make much sense, we
should always only consider only the maxattempt from the submissions table.
 2014-06-27 14:23:37 +08:00
Damyon Wiese
b7860604f7 MDL-46044 Assign: Move common setup to setUp method (share it for all of lib_test.php) 2014-06-27 14:19:59 +08:00
Damyon Wiese
eba3393014 MDL-46044 Assign: Fix print_overview function when there are multiple attempts 2014-06-27 14:19:51 +08:00
Damyon Wiese
16266791a0 MDL-46044 Assign: Update unit test to test multiple attempts on overview page 2014-06-27 14:19:44 +08:00
David Monllao
2427ceef62 MDL-45833 event: Removing courseid as the context is higher than course context 2014-06-27 11:25:00 +08:00
Yuliya Bozhko
3e9dfd7f62 MDL-46107 badges: Fix badges navigation and remove empty breadcrumbs on pages using Clean 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-06-27 12:49:00 +12:00
Sam Hemelryk
dc9363a651 MDL-45209 course: fixed navbar when creating,editing courses 2014-06-27 09:39:43 +12:00
Eloy Lafuente (stronk7)
5c1049f72b weekly release 2.6.3+ 2014-06-26 10:35:50 +02:00
Eloy Lafuente (stronk7)
125ca896df Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-06-26 10:35:45 +02:00
Eloy Lafuente (stronk7)
65684fa600 Revert " MDL-45044 filter_tex: properly escape excutable pathnames for Windows" 
This reverts commit 07a50c2f29.
 2014-06-26 10:03:25 +02:00
Rajesh Taneja
c7b0eeee8e MDL-45889 behat: Allow admin config to set by shortname 2014-06-26 13:19:21 +08:00
Andrew Davis
dbf541f8e1 MDL-46036 mod_survey: added logic to prevent user trying to download when there are no results 2014-06-26 11:20:58 +08:00
Andrew Davis
5636246c95 MDL-42467 mod_data: added code to delete cached RSS feeds when database or glossary entries are deleted 2014-06-26 09:18:21 +08:00
Jonathon Fowler
15e7db4e1d MDL-46080 assign: fix offline grading worksheet marker column 2014-06-25 12:23:12 +10:00
AMOS bot
50ca770bc6 Automatically generated installer lang files 2014-06-25 00:45:35 +00:00
AMOS bot
21d1577972 Automatically generated installer lang files 2014-06-25 00:45:34 +00:00
Eloy Lafuente (stronk7)
9d5a2e6f1c Merge branch 'MDL-46079-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-06-25 01:34:02 +02:00
Eloy Lafuente (stronk7)
004659a6d0 Merge branch 'MDL-41258-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-06-24 20:09:35 +02:00
Damyon Wiese
47042403ca Merge branch 'MDL-45652_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE 2014-06-24 17:00:17 +08:00
Damyon Wiese
fc463d34e8 Merge branch 'MDL-10115-26' of git://github.com/xow/moodle into MOODLE_26_STABLE 2014-06-24 16:04:28 +08:00
John Okely
188c45aef6 MDL-10115 User profile: Use title to aid in the ellipsis link being understood by screen readers 2014-06-24 15:39:23 +08:00
Marina Glancy
76b320818a Merge branch 'MDL-45933-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-06-24 13:52:54 +08:00
Marina Glancy
e0e6a127fa Merge branch 'MDL-45044-m26-master' of git://github.com/dthies/moodle into MOODLE_26_STABLE 2014-06-24 13:29:20 +08:00