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
sam marshall
ce2a7a9186
MDL-30879 Course page: missing space after class for new 'description on course page' feature
2012-01-03 12:40:09 +00:00
Aparup Banerjee
2482570b9f
Merge branch 'MDL-30600b' of git://github.com/rwijaya/moodle
2012-01-03 17:54:14 +08:00
Ankit Kumar Agarwal
85e976e514
MDL-30652 SCORM Fixing report prefrences display for interactions report
2012-01-03 10:38:41 +05:30
Ankit Kumar Agarwal
2af0e47259
MDL-30652 SCORM Fixing report prefrences display issue for basic report
2012-01-03 10:38:37 +05:30
Ankit Kumar Agarwal
e12459baa2
MDL-30652 Scorm adding proper comments
2012-01-03 10:38:07 +05:30
Rossiani Wijaya
0c97dc1a72
MDL-30600 Fix mymobile theme choice renderer
2012-01-03 13:05:55 +08:00
Aparup Banerjee
d7ca9b68ca
Merge branch 'wip-mdl-29844' of git://github.com/rajeshtaneja/moodle.git - resolved conflict
2012-01-03 12:29:12 +08:00
Eloy Lafuente
90911c4ff9
MDL-29844 Administration: Added new config for users to login for viewing profile image
2012-01-03 11:53:49 +08:00
Sam Hemelryk
44141b1881
Merge branch 'w52_MDL-30786_m23_todelete' of git://github.com/skodak/moodle
2012-01-03 16:35:36 +13:00
Sam Hemelryk
a187c1394e
Merge branch 'w52_MDL-30673_m23_loginautocomplete' of git://github.com/skodak/moodle
2012-01-03 14:08:50 +13:00
Sam Hemelryk
b19f834ada
Merge branch 'w52_MDL-30809_m23_guestinstance' of git://github.com/skodak/moodle
2012-01-03 13:05:22 +13:00
Sam Hemelryk
eacb470338
Merge branch 'w52_MDL-30924_m23_pspell' of git://github.com/skodak/moodle
2012-01-03 12:49:06 +13:00
Sam Hemelryk
03edfee475
Merge branch 'w52_MDL-30926_m23_blogassoc' of git://github.com/skodak/moodle
2012-01-03 12:38:51 +13:00
Sam Hemelryk
466973a143
Merge branch 'w52_MDL-30934_m23_modules' of git://github.com/skodak/moodle
2012-01-03 12:26:14 +13:00
Sam Hemelryk
19c6ff514e
Merge branch 'w52_MDL-30943_m23_adminreport' of git://github.com/skodak/moodle
2012-01-03 12:22:44 +13:00
Sam Hemelryk
d0a8d04551
Merge branch 'MDL-30802' of git://github.com/timhunt/moodle
2012-01-03 11:26:02 +13:00
Sam Hemelryk
929ea9ed6b
Merge branch 'MDL-30766' of git://github.com/timhunt/moodle
2012-01-03 11:23:13 +13:00
Sam Hemelryk
221dd28b65
Merge branch 'MDL-30168_tim2' of git://github.com/timhunt/moodle
2012-01-03 11:15:04 +13:00
Sam Hemelryk
a46fe43ba2
Merge branch 'MDL-27200' of git://github.com/timhunt/moodle
2012-01-03 11:12:14 +13:00
Sam Hemelryk
f6b2946a06
Merge branch 'MDL-29266' of git://github.com/bostelm/moodle
2012-01-03 11:09:19 +13:00
Sam Hemelryk
62ff78e6de
Merge branch 'w52_MDL-13572_m23_messaging' of git://github.com/skodak/moodle
2012-01-03 11:00:42 +13:00
Petr Skoda
1f6d1ebf0a
MDL-13572 fix incorrect value printing
2012-01-02 22:52:04 +01:00
Petr Skoda
36a5396417
MDL-13572 fix incorrect value printing
2012-01-02 22:51:38 +01:00
Sam Hemelryk
fe4abbe180
Merge branch 'MDL-30868' of git://github.com/lazydaisy/moodle
2012-01-03 10:38:04 +13:00
Petr Skoda
9a3e8a1fa7
MDL-13572 do not send emails to invalid addresses
2012-01-02 22:36:37 +01:00
Sam Hemelryk
e525c992ca
Merge branch 'MDL-30601' of git://github.com/rwijaya/moodle
2012-01-03 10:30:41 +13:00
Sam Hemelryk
03273b5357
Merge branch 'MDL-29821' of git://github.com/bostelm/moodle
2012-01-03 10:11:58 +13:00
Sam Hemelryk
ed569481a3
Merge branch 'MDL-30706' of git://git.luns.net.uk/moodle
2012-01-03 10:09:11 +13:00
Sam Hemelryk
01dcafd8d5
Merge branch 'MDL-30804-master-1' of git://git.luns.net.uk/moodle
2012-01-03 10:06:20 +13:00
Sam Hemelryk
2fa7c29c06
Merge branch 'MDL-30805-master-1' of git://git.luns.net.uk/moodle
2012-01-03 10:02:18 +13:00
Sam Hemelryk
4b8ae84cd0
Merge branch 'MDL-13572_validate_email' of git://github.com/andyjdavis/moodle
2012-01-03 09:57:00 +13:00
Sam Hemelryk
83f78f8dac
MDL-26869 admin: Added page to view admin categories and included in navigation with a new setting
2012-01-03 09:39:10 +13:00
Sam Hemelryk
2ad2ad0915
MDL-26155 admin: Rebased, fixed conflicts, and fixed final admin string
2012-01-03 09:12:33 +13:00
Sam Hemelryk
d79883ab7f
MDL-26155 string: Improved validation when constructing lang_strings if debugging is enabled
2012-01-03 09:09:40 +13:00
Sam Hemelryk
e106013f34
MDL-26155 admin: Converted admin settings to use new lang_string
2012-01-03 09:09:40 +13:00
Sam Hemelryk
e6d40f8ac2
MDL-26155 string: Implemented moodle_string class
2012-01-03 09:04:58 +13:00
Eloy Lafuente (stronk7)
c31d7ca2e0
Merge branch 'MDL-30851_master_wip' of git://github.com/grabs/moodle
2012-01-02 20:23:11 +01:00
Eloy Lafuente (stronk7)
6f68eabb7e
Merge branch 'w52_MDL-30953_m23_pspell' of git://github.com/skodak/moodle
2012-01-02 20:19:43 +01:00
Eloy Lafuente (stronk7)
2a297e537d
Merge branch 'MDL-30873' of git://github.com/timhunt/moodle
2012-01-02 20:16:02 +01:00
Eloy Lafuente (stronk7)
ae95489d68
MDL-30610 add missing savepoint to get the upgrade checks passing.
...
Note the savepoint is 100% unreachable, because of the exit() call.
But it's needed to have all the upgrade checks (CI) balanced and
passing.
2012-01-02 19:48:33 +01:00
Eloy Lafuente (stronk7)
5f7d519ecf
MDL-30610 Version bump. Time to diverge!
...
Once all the pre 2.2 upgrade code has been deleted, we bump
main version.php to start diverging in master after the
initial 3-4 weeks of on-sync with 22_STABLE.
2012-01-02 19:31:49 +01:00
