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

17109 commits

Author SHA1 Message Date
Juan Leyva
e10df76f49 MDL-41914 New table user_devices 2013-10-04 11:36:04 +02:00
Petr Škoda
ef5e1151c1 MDL-41197 ignore all problems when converting texts 2013-10-04 10:59:41 +02:00
Mark Nelson
6b7d0d3ec3 MDL-41792 core_form: used the new get_name() calendar function in the date selectors 2013-10-04 16:17:02 +08:00
Mark Nelson
da3041379a MDL-41792 core_calendar: refactored the calendar to allow the use of multiple calendar types 2013-10-04 16:17:02 +08:00
Adrian Greeve
73d363f0fa MDL-42098 - Libraries: Unit test for fullname function to ensure that debug message is 
shown even when additional names are enabled.
 2013-10-04 15:03:00 +08:00
Adrian Greeve
a49bc6c940 MDL-42098 - Libraries: Alter fullname debugging logic to display when user name fields are missing. 2013-10-04 15:03:00 +08:00
David Monllao
5458ab3e2a MDL-42013 behat: Fixing problem with should not see 
Using 'should see' outputs rather than an incorrect
xpath query. Also our custom selectors are not properly
used by WebAssert so switching to find xpath.
 2013-10-04 14:38:11 +08:00
Sam Hemelryk
cf8943779e NOBUG: Fixed file access permissions 2013-10-04 15:43:58 +13:00
Marina Glancy
25b2b0ec13 MDL-42141 Change wrong spacing from MDL-41725 2013-10-04 12:03:03 +10:00
Marina Glancy
32e375bdcb Merge branch 'MDL-42023-master' of git://github.com/damyon/moodle 2013-10-03 13:08:03 +10:00
Sam Hemelryk
322ca2fc66 Merge branch 'MDL-41241-master-fix3' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2013-10-03 16:03:22 +13:00
Jason Fowler
dc48715eb7 MDL-40770 TinyMCE - Restoring border to colour selectors 2013-10-03 15:59:17 +13:00
Damyon Wiese
8c11cd2e09 MDL-41241 Atto: Restrict searching for anchor tags to selection. 2013-10-03 10:54:10 +08:00
Adrian Greeve
4d83abd052 MDL-42089 - Administration: Update to sql to include alternate name fields. 2013-10-03 10:34:07 +08:00
Damyon Wiese
5c3864723a MDL-42023 assign: Edit PDF plugin - Damyon's contributions 2013-10-03 09:30:32 +08:00
Adrian Greeve
e5d53a1c2f MDL-40844 - Activity completion: Update of the sql to include additional name fields. 
The activity completion report wasn't showing the additional name fields.
 2013-10-02 16:29:17 +08:00
Marina Glancy
d794391d8b Merge branch 'MDL-41241-master-fix2' of github.com:damyon/moodle 2013-10-02 17:27:03 +10:00
Damyon Wiese
30509335dd MDL-41241 Atto: Make searching for the anchor tag more reliable 2013-10-02 15:21:11 +08:00
Marina Glancy
3b06d7b22b Merge branch 'MDL-42021-master-int' of git://github.com/FMCorz/moodle 2013-10-02 17:01:12 +10:00
Marina Glancy
0880a52c9a Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle 2013-10-02 16:54:59 +10:00
Damyon Wiese
766c6401b7 MDL-41912 Atto: Min-height fix - div was too small by default. 2013-10-02 13:13:35 +08:00
Frederic Massart
ee2df1a8b2 MDL-40050 webservice: Remove token from events 2013-10-02 13:00:28 +08:00
Damyon Wiese
3d27180e94 MDL-40493 User preference: Allow users to set their preferred text editor. 
This changes the setting htmleditor in the user table from a 0 or 1 column
to a user preference for the name of their preferred html editor.
 2013-10-02 12:49:30 +08:00
Frederic Massart
4fb6600eae MDL-42021 enrol: Missing objectid in enrolment_deleted event 2013-10-02 10:45:28 +08:00
Sam Hemelryk
274399c00e MDL-40770 tinymce: fixed svg files included with moodle theme 2013-10-02 10:52:15 +13:00
Sam Hemelryk
55fcb3504f Merge branch 'MDL-40770-master' of git://github.com/phalacee/moodle 2013-10-02 10:52:03 +13:00
Eloy Lafuente (stronk7)
268f4cb503 Merge branch 'MDL-42021-master' of git://github.com/FMCorz/moodle 2013-10-01 21:36:13 +02:00
Sam Hemelryk
7f58018843 Merge branch 'MDL-41878-master' of git://github.com/andrewnicols/moodle 2013-10-02 08:14:36 +13:00
Eloy Lafuente (stronk7)
91c49b8cf4 Merge branch 'MDL-41752-master' of git://github.com/jamiepratt/moodle 2013-10-01 19:18:36 +02:00
Eloy Lafuente (stronk7)
00a6df6b02 Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle 2013-10-01 15:59:06 +02:00
Marina Glancy
3a3e3fa3b5 Merge branch 'MDL-41989-master' of git://github.com/phalacee/moodle 2013-10-01 14:45:14 +10:00
Marina Glancy
5c06e84ab2 Merge branch 'MDL-41912-master' of git://github.com/FMCorz/moodle 2013-10-01 14:21:50 +10:00
Damyon Wiese
900f571c3a MDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button) 2013-10-01 11:58:15 +08:00
Sam Hemelryk
d451eb4dc5 MDL-41900 events: avoid new debug call within unit tests 2013-10-01 16:20:57 +13:00
Andrew Nicols
03e36e7077 MDL-41878 JavaScript: Add an alias for Moodle in the YUI loader 2013-10-01 10:51:40 +08:00
Yuliya Bozhko
56b9a02eea MDL-41956 messages: Accept attachments in send_message() in email message provider 2013-10-01 15:38:02 +13:00
Sam Hemelryk
421dd2e8eb Merge branch 'MDL-41900-m' of git://github.com/micaherne/moodle 2013-10-01 14:35:49 +13:00
Sam Hemelryk
5101954f03 Merge branch 'MDL-41241-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
	lib/editor/atto/plugins/link/yui/src/button/js/button.js
 2013-10-01 13:58:17 +13:00
Sam Hemelryk
52dc898d16 Merge branch 'MDL-41228_master' of https://github.com/totara/openbadges 2013-10-01 13:37:44 +13:00
Tim Lock
9c390d62ed MDL-41908 QuickForm: Fix PEAR Non-static method error 2013-10-01 09:53:26 +09:30
Eloy Lafuente (stronk7)
b744b90df5 Merge branch 'w40_MDL-41707_m26_exttests' of https://github.com/skodak/moodle 2013-10-01 02:14:23 +02:00
Marina Glancy
f09ecc6d8b Merge branch '41988-26' of git://github.com/samhemelryk/moodle 2013-10-01 10:01:17 +10:00
Sam Hemelryk
7da590c11b Merge branch 'MDL-40572_master' of https://github.com/totara/openbadges 2013-10-01 11:05:59 +13:00
Sam Hemelryk
8e5f86bcb3 MDL-41988 behat: improvements to spin 2013-10-01 10:24:36 +13:00
Eloy Lafuente (stronk7)
94211c02c3 Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle 2013-09-30 21:55:41 +02:00
Marina Glancy
e6ec2366a8 Merge branch 'MDL-41885-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	mod/upgrade.txt
 2013-09-30 17:57:30 +10:00
Mark Nielsen
50ae8814e4 MDL-40248 mod: Allow xxx_get_types() to use default display 
* Added new constant: MOD_SUBTYPE_NO_CHILDREN
* When MOD_SUBTYPE_NO_CHILDREN is returned from xxx_get_types()
  then default display is used for activity chooser.
* Updated mod/upgrade.txt
* Removed dead code from navigationlib.php instead of updating
  it for new behavior of xxx_get_types
* Updated lib/upgrade.txt
 2013-09-30 16:49:37 +10:00
Sam Hemelryk
5e8331c814 NOBUG fixed up whitespace 2013-09-30 15:51:08 +13:00
Sam Hemelryk
4754755625 Merge branch 'wip-MDL-33416-master' of git://github.com/marinaglancy/moodle 2013-09-30 15:42:03 +13:00
Sam Hemelryk
28a2ecc6c4 Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle 2013-09-30 11:55:19 +13:00