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

18058 commits

Author SHA1 Message Date
Marina Glancy
40dd8899ab Merge branch 'MDL-42081-phpunitfix' of git://github.com/mouneyrac/moodle 2013-11-11 20:55:19 +11:00
Sam Hemelryk
d0647301a0 MDL-41392 course: management accessibility tweaking 2013-11-11 17:09:44 +08:00
Sam Hemelryk
9b22eeff5d MDL-42806 dock: check title exists before using it 2013-11-11 16:51:06 +08:00
Sam Hemelryk
4b6d9ea248 MDL-42805 dock: fixed {} appearing in undock icon title 2013-11-11 16:26:12 +08:00
Jerome Mouneyrac
316283c72b MDL-42081 fix file_storage phpunit tests following adding new stamp files on fresh install 2013-11-11 16:01:32 +08:00
Andrew Nicols
04653aa010 MDL-42809 ActionMenu: Increase specifity of hide on select selector 2013-11-11 15:33:30 +08:00
Frederic Massart
7c9753a713 MDL-42808 library: Google API was resetting the timezone 2013-11-11 15:25:00 +08:00
Sam Hemelryk
0fd6069ecd Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle 2013-11-11 13:10:44 +08:00
Adrian Greeve
5b1944bbba MDL-40612 libraries: Tidy up and improvement of the code for additional name fields. 
Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()
 2013-11-11 11:01:14 +08:00
Adrian Greeve
f490f988b7 MDL-40612 libraries: Unit test expansion for get_all_user_name_fields() 
and the inclusion of tests for set_user_name_object()
 2013-11-11 10:52:24 +08:00
Damyon Wiese
bbdb369868 Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle 2013-11-11 10:41:40 +08:00
Damyon Wiese
d5c0f0453c Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges 
Conflicts:
	version.php
 2013-11-11 10:17:07 +08:00
Damyon Wiese
e3552170da Merge branch 'MDL-42772-master' of git://github.com/FMCorz/moodle 2013-11-08 16:15:17 +08:00
David Mudrák
069c29b987 MDLSITE-2455 Do not throw coding exception when the activity is not found 
Under certain conditions, coding exception is thrown when fetching items from
the navigation bar. The patch prevents them. See more details in the tracker.
 2013-11-08 16:08:39 +08:00
Dan Poltawski
d06d812c51 Merge branch 'wip-MDL-40883-master' of git://github.com/marinaglancy/moodle 2013-11-08 15:32:11 +08:00
Frederic Massart
4bceea11be MDL-42772 upgrade: Force alternate fields in session user 2013-11-08 14:01:39 +08:00
Marina Glancy
2e84b4b323 Merge branch 'MDL-42775-master' of git://github.com/danpoltawski/moodle 2013-11-08 16:37:55 +11:00
Jason Fowler
d37ec4b6a7 MDL-42684 TinyMCE: Including details of patch in moodle-readme.txt 2013-11-08 12:57:46 +08:00
Jason Fowler
762a29690e MDL-42684 TinyMCE: make tinymce start at full width 2013-11-08 12:57:46 +08:00
Dan Poltawski
356d33a866 MDL-42775 dml: remove invalid unit test assertion 2013-11-08 12:25:49 +08:00
Damyon Wiese
16fd6fb6d7 Merge branch 'w46_MDL-42769_m26_admineditor' of https://github.com/skodak/moodle 2013-11-08 11:43:10 +08:00
Marina Glancy
61d1e9c44d Merge branch 'MDL-41586-master' of git://github.com/ankitagarwal/moodle 2013-11-08 14:13:24 +11:00
Ankit Agarwal
6cff6350df MDL-41586 libaries: Fix issues with scale in sqlsrv libraries 
0 is a valid value
null is the default scale we set in other DBs
 2013-11-08 10:49:35 +08:00
Marina Glancy
a9d11e3cd0 MDL-40883 ddl: unittest for objects name length 2013-11-08 13:17:47 +11:00
Jason Fowler
46f763ed4a MDL-42660 TinyMCE: Ensure upgrade is only performed when possible 
Conflicts:

	lib/editor/tinymce/db/upgrade.php
 2013-11-08 09:49:02 +08:00
Marina Glancy
dcde391b44 MDL-40883 ddl: make sure object name never exceeds max length 
Many thanks to Ray Bon for finding the problem
 2013-11-08 11:58:35 +11:00
Petr Škoda
8213007c7f MDL-42769 use only text area editor before install completed 2013-11-07 23:51:59 +01:00
Dan Poltawski
0967c74a3d Merge branch 'MDL-42737-master' of git://github.com/andrewnicols/moodle 2013-11-07 17:21:54 +08:00
Yuliya
be2b37cf4b MDL-39923 badges: Fix unit tests 2013-11-07 21:48:01 +13:00
Frederic Massart
d130777df5 MDL-42668 portfolio_boxnet: Migration to APIv2 2013-11-07 15:28:34 +08:00
Dan Poltawski
b74c8389b1 Merge branch 'MDL-42666-master-fixup' of git://github.com/FMCorz/moodle 2013-11-07 14:19:14 +08:00
Marina Glancy
cc58ba267d Merge branch 'w46_MDL-42708_m26_mymobile' of https://github.com/skodak/moodle 2013-11-07 17:17:42 +11:00
Frederic Massart
7cb353ff69 MDL-42666 tests: Setting new Box.net mandatory arguments 2013-11-07 13:54:47 +08:00
Rajesh Taneja
9a90e7c57a MDL-42754 Messages: Show noreply user notifications 
With fake noreply and support users, the notifications were not accessible by user
Support for viewing messages from noreply user has been added.

Signed-off-by: Rajesh Taneja <rajesh@moodle.com>
 2013-11-07 13:08:30 +08:00
Jason Fowler
2106d4b351 MDL-42660 TinyMCE: Shuffle icons in default toolbar layout 2013-11-07 12:15:11 +08:00
Jason Fowler
525d094a47 MDL-42660 Filepicker: Fix padding etc on filepicker/manager toolbars 
Conflicts:

	theme/bootstrapbase/style/moodle.css
 2013-11-07 12:15:11 +08:00
Jason Fowler
f897dbcb24 MDL-42660 TinyMCE: Fix padding etc to make TinyMCE work better on small screens 2013-11-07 12:15:11 +08:00
Marina Glancy
1dd53c7a5a Merge branch 'MDL-41586-master' of git://github.com/ankitagarwal/moodle 2013-11-07 15:06:38 +11:00
Dan Poltawski
f6a2a36bcd Merge branch 'MDL-42666-master' of git://github.com/FMCorz/moodle 2013-11-07 11:44:01 +08:00
Dan Poltawski
57d14266a8 Merge branch 'wip-mdl-42692' of https://github.com/rajeshtaneja/moodle 2013-11-07 11:23:11 +08:00
Dan Poltawski
0b353ee03e Merge branch 'MDL-42742-master' of git://github.com/damyon/moodle 2013-11-07 11:19:15 +08:00
Frederic Massart
16dc4c13ae MDL-42605 portfolio_flickr: Photos can be added to a set on export 2013-11-07 11:14:47 +08:00
Frederic Massart
51ada519a6 MDL-42666 repository_boxnet: Downloading a file follows locations 2013-11-07 10:54:48 +08:00
Marina Glancy
27199cfce8 Merge branch 'MDL-42696-collator' of git://github.com/mudrd8mz/moodle 2013-11-07 12:59:36 +11:00
Yuliya Bozhko
f5d17c14ea MDL-39923 badges: Send badge messages through internal messaging system 2013-11-07 14:49:27 +13:00
Petr Škoda
e0caccb410 MDL-42708 force mymobile uninstallation during upgrade 2013-11-06 20:04:58 +01:00
sam marshall
db0f0097e8 MDL-42084 Unit tests: Remove unnecessary 'clear time limit change' lines 2013-11-06 16:40:04 +00:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere 
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
 2013-11-06 16:40:01 +00:00
sam marshall
366b19a954 MDL-42084 Core: Create new static class for use instead of set_time_limit 2013-11-06 16:39:57 +00:00
Iñaki Arenaza
3f9562cc5d MDL-42723: Hide and handle LDAP error when user not in context being checked 
MDL-41304 only fixed the case when 'Search subcontext' is enabled. We need to
fix the case when it's not enabled too.

While silencing errors with an @ should be avoided if possible, there's no
other way to prevent the warnings in this case.
 2013-11-06 17:31:55 +01:00