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

17388 commits

Author SHA1 Message Date
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
Jamie Pratt
59abb70716 MDL-41752 question statistics class moved and improved 
quiz_question_statistics_stats renamed to question_statistics_calculator
separate class question_statistics used to store calculated stats
and api changed, also code generally cleaned up.
 2013-09-27 16:24:18 +07:00
Petr Škoda
5fed843324 MDL-41999 warn developers to not use $USER->password directly 2013-09-27 10:51:38 +02:00
Petr Škoda
a9d2f1b414 MDL-41707 allow custom location of external test files used from unit tests 2013-09-27 10:47:56 +02:00
Marina Glancy
6b0b05b32f MDL-41942 course: Allow course listings to work with caches disabled 2013-09-27 18:34:20 +10:00
Petr Škoda
6c3ad77ea5 MDL-41176 fix obvious bugs and typos in new user API 2013-09-27 10:33:48 +02:00
Damyon Wiese
bb76233dd2 MDL-42026 Atto: Remove the styles from the headings menu + focus when opened 2013-09-27 15:55:46 +08:00
Marina Glancy
e2a61ee3db MDL-33416 files: Remove unused reference fields in files table 
Fields files.referencelastsync and files.referencelifetime just waste the space and actually duplicate the fields
files_reference.lifetime and files_reference.lastsync
 2013-09-27 16:50:08 +10:00
Frederic Massart
31e571cdf0 MDL-42021 events: Debug message when objecttable set without an objectid 2013-09-27 14:29:21 +08:00
Marina Glancy
4de0c793b4 fix permissions 2013-09-27 14:21:20 +10:00
Jason Fowler
0c9070c0a3 MDL-41989 Atto - Improving usability for non-touch devices 2013-09-26 15:31:04 +08:00
Frederic Massart
a72a759303 MDL-41912 editor_atto: Padding for editable area 2013-09-26 12:10:29 +08:00
Marina Glancy
65a4f26d8a Revert "Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle" 
This reverts commit 093a6fe77f, reversing
changes made to 88a4cb4734.
 2013-09-26 12:29:03 +10:00
Dan Poltawski
b07ef13be2 MDL-41885 modules now declare use of question bank 
* FEATURE_USES_QUESTION_BANK is now a module_supports flag which declares
  that an activity uses the question engine.

* question_module_uses_questions can be used to determine if a module
  uses the question bank.
 2013-09-26 09:49:34 +08:00
Sam Hemelryk
f8023f3072 Revert "MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined array)" 
This reverts commit e89dfdbce6.
 2013-09-26 11:56:00 +12:00
Andrew Nicols
8295548038 MDL-41986 JavaScript/Dock: Correct log level in Y.log statements 2013-09-26 00:20:22 +01:00
Andrew Nicols
fa64202a86 MDL-41985 JavaScript: Add option to filter YUI logging statements 2013-09-25 23:58:08 +01:00
Sam Hemelryk
e2ad11d87e Revert "MDL-39871 output: improved block manipulation inheritance" 
This reverts commit eeb08203dc.
 2013-09-26 09:12:44 +12:00
Eloy Lafuente (stronk7)
c72cad1f85 Merge branch 'int_uninstall' of https://github.com/skodak/moodle 2013-09-25 13:36:40 +02:00
Eloy Lafuente (stronk7)
a07a9c74de Merge branch 'w39_MDL-41208_m26_yui312' of https://github.com/skodak/moodle 2013-09-25 11:41:45 +02:00
Petr Škoda
723a6e5679 MDL-41437 inform developers that version column was removed from module and block tables 2013-09-25 10:52:23 +02:00
Petr Škoda
5f8012d499 MDL-41437 fix some more forgotten module.version's 2013-09-25 10:50:00 +02:00