Aparup Banerjee
bb9546d0c7
Merge branch 'wip-MDL-30583-master' of git://github.com/samhemelryk/moodle
2012-01-09 13:44:36 +08:00
Aparup Banerjee
fcad996aab
Merge branch 'w02_MDL-30718_m23_usertimedb' of git://github.com/skodak/moodle
2012-01-09 12:18:36 +08:00
Sam Hemelryk
2e40a94cff
Merge branch 'w02_MDL-31005_m23_contextlevelname' of git://github.com/skodak/moodle
2012-01-09 16:12:24 +13:00
Sam Hemelryk
3506dfa22f
MDL-30608 Blocks: Fixed block disappering from search page
2012-01-09 11:04:10 +08:00
Sam Hemelryk
7adf214012
Merge branch 'w02_MDL-30944_m23_cohortenrol' of git://github.com/skodak/moodle
2012-01-09 14:58:57 +13:00
Eloy Lafuente (stronk7)
7a9a12aa05
Merge branch 'w02_MDL-29046_m23_clidistrolib' of git://github.com/skodak/moodle
2012-01-09 02:31:02 +01:00
Eloy Lafuente (stronk7)
30c99be2f0
Merge branch 'MDL-30031' of git://github.com/bostelm/moodle
2012-01-09 02:14:20 +01:00
Sam Hemelryk
0e743da2b4
Merge branch 'w02_MDL-30717_m23_usercreated' of git://github.com/skodak/moodle
2012-01-09 14:03:10 +13:00
Sam Hemelryk
b07646fcf7
MDL-30928 lib: Fixed whitespace
2012-01-09 13:57:06 +13:00
Sam Hemelryk
1bec282c06
Merge branch 'w02_MDL-30928_m23_deletetimes' of git://github.com/skodak/moodle
2012-01-09 13:52:37 +13:00
Sam Hemelryk
9b1ab84743
Merge branch 'w02_MDL-30969_m23_suspendedcsv' of git://github.com/skodak/moodle
2012-01-09 13:02:31 +13:00
Eloy Lafuente (stronk7)
3c4500f5c7
Merge branch 'MDL-30778_t2' of git://github.com/kiklop74/moodle
2012-01-09 00:41:55 +01:00
Eloy Lafuente (stronk7)
4b89edd948
Merge branch 'MDL-30966-print-object' of git://github.com/mudrd8mz/moodle
2012-01-09 00:33:02 +01:00
Sam Hemelryk
df121fb287
Merge branch 'master_MDL-31043' of git://github.com/danmarsden/moodle
2012-01-09 12:23:11 +13:00
Eloy Lafuente (stronk7)
94d59c9b23
Merge branch 'MDL-30635' of git://github.com/timhunt/moodle
2012-01-09 00:15:21 +01:00
Sam Hemelryk
9b69f4a9c9
Merge branch 'MDL-30652-master' of git://github.com/ankitagarwal/moodle
2012-01-09 12:02:41 +13:00
Sam Hemelryk
94a2296a8e
Merge branch 'MDL-31000-master-1' of git://git.luns.net.uk/moodle
2012-01-09 11:52:29 +13:00
Sam Hemelryk
4037098eba
MDL-30583 navigation: Added setting to control display of front page activities on the navigation
2012-01-09 09:49:34 +13:00
Petr Skoda
9fcbc4640d
MDL-31005 fix strict coding style warning in context_helper
...
PHP54 compatibility
2012-01-08 15:39:03 +01:00
Aleksey Avdeev
b1d533652b
MDL-29046 use of install/distrolib.php in the CLI installer
...
Signed-off-by: Aleksey Avdeev <solo@altlinux.ru>
2012-01-08 15:14:15 +01:00
Petr Skoda
ad68ed7402
MDL-29684 improve enrol_meta plugin
...
List of changes:
* configurable unenrol action
* new setting for synchronisation of all enrolled users or users with at least one role
* cron period increased to 1 hour in order to lower server load, courses should not get out of sync often
* CLI sync script for debugging or manual sync
* phpdocs fixes
* when plugin is disabled all roles are removed, enrollments are kept
* uninstall script
* other bugfixing
2012-01-08 15:07:49 +01:00
Petr Skoda
1fb6f5ab67
MDL-30717 update user->timemodified in update_user_record()
2012-01-08 15:03:53 +01:00
Petr Skoda
549a8b74b3
MDL-30717 add missing time created info in create_user_record()
...
Credit goes to Luis Gustavo Mueller de Alcantara.
2012-01-08 15:03:52 +01:00
Petr Skoda
a4d25731df
MDL-30718 add missing timecraeted and timeupdated, fix user undeleting
2012-01-08 14:51:00 +01:00
Petr Skoda
e7157a0054
MDL-30928 include course and user deletion time in event
...
Credit goes to Luis Gustavo Mueller de Alcantara.
2012-01-08 14:29:18 +01:00
Petr Skoda
7cfe640499
MDL-30944 improve enrol_cohort plugin
...
List of changes:
* configurable unenrol action
* cron period increased to 1 hour in order to lower server load, courses should not get out of sync often
* CLI sync script for debugging or manual sync after configuration change
* phpdocs fixes
* when plugin is disabled all roles are removed, enrollments are kept
* uninstall script
* other bugfixing and performance improvements
2012-01-08 14:06:05 +01:00
Petr Skoda
08157bfe76
MDL-30969 add support for suspending in uploaduser admin tool
2012-01-08 14:01:10 +01:00
AMOS bot
feff40c220
Automatically generated installer lang files
2012-01-07 00:31:13 +00:00
David Mudrak
68e550e6b2
MDL-30966 print_object() output made CLI-friendly
2012-01-06 22:48:12 +01:00
Tim Hunt
f8a3a3fb9a
MDL-30757 questions: kill legacy global $QUESTION_EDITTABCAPS
2012-01-06 18:43:03 +00:00
Tim Hunt
c2f5e2ab81
MDL-30635 enable standard cron for all question and quiz plugin types.
...
* Support for old non-standard cron for quiz reports dropped. (Standard
cron support was added in 2.2
* Cron support added for qbehaviour, qformat and quizacces plugins.
* qtypes were already supported in the standard way.
2012-01-06 18:42:35 +00:00
Dan Marsden
0f6d934941
MDL-31043 allow themes to set custommenu instead of using global settings
2012-01-06 12:48:01 +13:00
Eloy Lafuente (stronk7)
0e84b1664d
weekly release 2.3dev (blame stronk7 for 0202 mistake)
...
On 20120102 version was incorrectly bumped to 2012-02-02. So,
until then (< 1mo) we are going to be incrementing decimal digits
only and not date ones (first 8).
2012-01-05 15:02:23 +01:00
Sam Hemelryk
cf6d069afd
Merge branch 'MDL-31017' of git://github.com/stronk7/moodle
2012-01-05 11:17:31 +13:00
Andrew Robert Nicols
feaae39dfb
MDL-31018 Improve consistency of horizontal alignment across grade reports
2012-01-04 16:19:16 +00:00
Eloy Lafuente (stronk7)
fb95ef9ecd
MDL-31017 whitespace clean - take1
2012-01-04 16:27:32 +01:00
Andrew Robert Nicols
696c748da7
MDL-31013 Add iconsmall class to 'Export to portfolio' icon
2012-01-04 10:27:08 +00:00
Eloy Lafuente (stronk7)
45ad2d871c
Merge branch 'wip-MDL-26869-m23-after-MDL-26155' of git://github.com/samhemelryk/moodle
2012-01-04 03:08:24 +01:00
David Mudrak
a1373126eb
MDL-30865 Workshop method aggregate_grading_grades_process() accepts explicit aggregation timestamp
2012-01-04 02:20:06 +01:00
Eloy Lafuente (stronk7)
5d25ef18c5
Merge branch 'MDL-30879-master' of git://github.com/sammarshallou/moodle
2012-01-04 02:14:18 +01:00
Eloy Lafuente (stronk7)
a46eb101b3
Merge branch 'w52_MDL-30945_m23_unenrol' of git://github.com/skodak/moodle
2012-01-04 01:51:10 +01:00
Eloy Lafuente (stronk7)
96f888506c
Merge branch 'w52_MDL-30948_m23_messagesuspended' of git://github.com/skodak/moodle
2012-01-04 00:47:48 +01:00
Eloy Lafuente (stronk7)
792182713a
Merge branch 'w52_MDL-30951_m23_catsync' of git://github.com/skodak/moodle
2012-01-04 00:39:51 +01:00
Sam Hemelryk
3b53b85b47
Merge branch 'w52_MDL-29917_m23_autocomplete' of git://github.com/skodak/moodle
2012-01-04 10:58:03 +13:00
Sam Hemelryk
44d5c138a2
Merged branch 'w52_MDL-30548_m23_suspenduser' of git://github.com/skodak/moodle.git with conflict resolution
2012-01-04 10:50:20 +13:00
Eloy Lafuente (stronk7)
831e48be01
Merge branch 'w52_MDL-30950_m23_adminblock' of git://github.com/skodak/moodle
2012-01-03 22:33:11 +01:00
Eloy Lafuente (stronk7)
bb2308a33a
Merge branch 'wip-MDL-26155-m23' of git://github.com/samhemelryk/moodle
...
Conflicts:
admin/settings/security.php
2012-01-03 17:26:31 +01:00
Andrew Robert Nicols
ef72c7942e
MDL-31000 Respect sortorder of repositories when displaying the filepicker
2012-01-03 15:58:58 +00:00
Petr Skoda
daa8b1ac06
MDL-30948 do not generate new passwords for suspended accounts because they would not get any emails
2012-01-03 16:48:15 +01:00
Petr Skoda
4ad72c284d
MDL-30548 support user suspended flag in admin UI
...
This patch includes:
* user management suspend UI tweaks and other coding style improvements
* suspended info in user profiles
* suspend option in advanced edit form
* suspended user filtering
* hidden user fields option for suspended field
Thanks Sam Hemelryk for valuable feedback.
2012-01-03 16:35:21 +01:00