mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
54,960 Commits 36 Branches 519 Tags
Commit Graph

1412 Commits

Author SHA1 Message Date
Dan Poltawski
ae5cf02259 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle 2012-07-11 16:34:15 +08:00
Petr Škoda
d3c0f41160 MDL-8249 fix participant page role selection 
Thanks Michael de Raadt for spotting this regression.
 2012-07-11 10:27:14 +02:00
Dan Poltawski
e1980f8bb9 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-10 09:43:23 +08:00
Sam Hemelryk
871c06e583 Merge branch 'MDL-29538_usercond' of git://github.com/markn86/moodle 2012-07-09 11:44:39 +12:00
Petr Skoda
c52551dc3c MDL-8249 localise standard role names and descriptions if empty 2012-07-06 08:22:34 +02:00
Sam Hemelryk
941d1fb2cc Merge branch 'wip-mdl-32787' of git://github.com/rajeshtaneja/moodle 2012-07-04 08:26:14 +12:00
Rajesh Taneja
fc3aa0fbaf MDL-32787 user: rule required for custom profile fields applies to all users editing own profile 2012-07-03 13:46:13 +08:00
Dan Poltawski
f884819546 Merge branch 'MDL-30903-master' of git://github.com/FMCorz/moodle 2012-07-03 11:51:04 +08:00
Dan Poltawski
606319c927 Merge branch 'w27_MDL-34036_m24_bulkrole' of git://github.com/skodak/moodle 2012-07-03 11:40:08 +08:00
Petr Škoda
66c528d2ac MDL-34036 fix course role user selector 2012-06-30 15:39:12 +02:00
Mark Nelson
f99d3a42a2 MDL-29538 core_condition: Deleting profile fields will delete the dependencies in both the modules and sections 2012-06-26 15:18:54 +08:00
Sam Hemelryk
33e657c7e7 MDL-29538 core_condition: Pre-integration merge cleanup 
* Fixed up database installation and upgrade code
* Reverted some whitespace optimisations to minimise conflicts
* Optimised commits made by Mark to reduce complexity and add tracker issue numbers
 2012-06-26 15:18:53 +08:00
Mark Nelson
a8f84c287c MDL-29538 core_condition: code cleanup 2012-06-26 15:18:52 +08:00
Mark Nelson
92fb7dd3a5 MDL-29538 core_condition: made changes to the DB structure - nb. had to rename the table due to length limit 2012-06-26 15:18:51 +08:00
Mark Nelson
76af15bb4c MDL-29538 core_condition: initial commit to add support for making things conditional on user profile fields 2012-06-26 15:18:51 +08:00
Andrew Davis
c968c1b787 MDL-25476 messages: switched some notification emails to come from the support contact instead of admin 2012-06-26 11:44:56 +07:00
Sam Hemelryk
1e3d84785a Merge branch 'wip-mdl-33425' of git://github.com/rajeshtaneja/moodle 2012-06-20 11:32:04 +12:00
Dan Poltawski
a80b5a0cf0 MDL-32908 - drop $USER->ajax 
Its not been respected for some time and is just confusing
 2012-06-19 15:07:18 +08:00
Rajesh Taneja
4e782b32f3 MDL-33425 user: Replaced filepicker with filemanager on edit profile page 2012-06-18 10:19:48 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Sam Hemelryk
ca774c940e MDL-31520 user-ws: Optimised if statement for email access by moving admin check to the start 2012-06-06 10:35:19 +12:00
Sam Hemelryk
fd200bc5e5 Merge branch 'MDL-31520-master' of git://github.com/fabiomsouto/moodle 2012-06-06 10:33:31 +12:00
Dan Poltawski
2812b87bab Merge branch 'MDL-32581' of git://github.com/mouneyrac/moodle 2012-06-05 15:23:28 +08:00
Jerome Mouneyrac
93ce0e8296 MDL-32581 support additional format field with all text field in extrnal lib function + new possible ws params to decide how format is returned (which are stored in a singleton) 2012-05-31 12:31:27 +08:00
Frederic Massart
a960dfa900 MDL-33397 Filepicker: cancel button always present in private files 2012-05-29 15:00:19 +08:00
Dan Poltawski
ada7dbd93a Merge branch 'w21_MDL-27575_m23_skype' of git://github.com/skodak/moodle 2012-05-25 10:44:47 +08:00
Dan Poltawski
f5a68663db MDL-33173 files: correct @package name 2012-05-25 10:03:33 +08:00
Frederic Massart
4c88645920 MDL-33173 Filepicker: renamed private files edit page to main page 2012-05-25 09:24:39 +08:00
Frederic Massart
d17ba1e1a5 MDL-30903 Accessibility: user profile page uses table headers 2012-05-24 10:18:14 +08:00
Dan Poltawski
3e832fe3e5 Merge branch 'MDL-32981-master' of github.com:FMCorz/moodle 2012-05-22 11:14:12 +08:00
Frederic Massart
c598ea55fe MDL-32981 Filepicker: my private files uses edit page instead of view 2012-05-22 10:56:11 +08:00
Fábio Souto
90e30b965f Allow admin to consult user email address 
Currently the admin user cannot check the user email using this function. This fix allows the admin user to retrieve the email in any situation.
 2012-05-21 10:32:21 +01:00
Marina Glancy
559276b153 MDL-32247,MDL-32831,MDL-32900 Use correct url building of file type icons 
- function get_mimetypes_array() now contains also information about filetype groups and language strings
- use 'smart' human-readable mimetype description
- never determine filetype group based on filetype icon image! remove function mimeinfo_from_icon()
- get rid of class filetype_parser and file lib/filestorage/file_types.mm, replaced with functions file_get_typegroup(), file_extension_in_typegroup() and file_mimetype_in_typegroup()
- support multiple icon sizes, not only 16 and 32
- retrieve filetype icon only using proper functions file_..._icon() from lib/filelib.php throughout the code
- increase size of repository thumbnails to 90 and icons to 24 (will take effect when new icons exist)
 2012-05-21 16:01:04 +08:00
Dongsheng Cai
6723372514 MDL-28666 Extends repository to support references 
1. Allow repository to create references to external contents
2. Extends files API to handle file references
3. Generic file caching
4. Backup/restore file references
5. Download external contents if repository uninstalled
6. Allow filepicker to display iframe
7. PHPUnit test suits
 2012-05-21 11:57:51 +08:00
Petr Skoda
65f78adf42 MDL-27575 use new skype call URI 
As described in official Skype page at http://www.skype.com/intl/en-us/tell-a-friend/get-a-skype-button/
 2012-05-19 20:48:48 +02:00
Aparup Banerjee
defd2dcc13 Merge branch 'wip-mdl-32866' of git://github.com/rajeshtaneja/moodle 2012-05-17 16:48:07 +08:00
Rajesh Taneja
1826cf12de MDL-32866 filemanager: Fixed Page url typo 2012-05-09 17:45:10 +08:00
Rajesh Taneja
c106a9bff0 MDL-27562 formslib: applydst should be always true, hence option removed from dateselector and datetimeselector form elements 2012-05-07 15:23:45 +08:00
Dan Poltawski
0dda790c05 Merge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle 
Conflicts:
    lib/db/upgrade.php
	version.php
 2012-05-04 09:28:41 +08:00
Sam Hemelryk
ab45e3b491 Merge branch 'MDL-31762' of git://github.com/mouneyrac/moodle 2012-05-02 17:52:13 +12:00
Dan Poltawski
6b445cb17a Merge branch 'w18_MDL-30686_m23_guessurl' of git://github.com/skodak/moodle 2012-05-01 11:27:16 +08:00
Dan Poltawski
3869858d3e Merge branch 'MDL-30986-attempt2' of git://github.com/mouneyrac/moodle 2012-05-01 10:59:06 +08:00
Petr Skoda
4d254790c4 MDL-32628 add revision for user avatar images 
This should finally resolve all avatar caching issues and should also help with performance.
 2012-04-30 23:36:47 +02:00
Jerome Mouneyrac
4615817d1c MDL-30986 external API, check and update DocBlock 
Conflicts:

	group/externallib.php
 2012-04-30 15:11:56 +08:00
Petr Skoda
789df20f64 MDL-32627 enable ajax by default in new user form 
This change makes the new user form consistent with install.xml default. I do not think we should discourage ajax any more.
 2012-04-27 13:52:38 +02:00
Petr Skoda
f0202ae9a2 MDL-30686 improve accuracy of qualified_me() by trying PAGE->url first 
This should help SSL proxies and returning to current page after require_login().
 2012-04-27 13:39:18 +02:00
Eloy Lafuente (stronk7)
795558d3e5 Merge branch 'MDL-31548-master' of git://github.com/ankitagarwal/moodle 2012-04-24 21:56:57 +02:00
Jerome Mouneyrac
45b4464c76 MDL-31762 username should be lowercase and check against PARAM_USERNAME when creating/updating user by web service 2012-04-24 15:09:37 +08:00
Petr Skoda
cdbea7eed1 MDL-31607 use full course object for require_login() if already available 
This eliminates 1 db query.
 2012-04-22 17:41:47 +02:00
Ankit Agarwal
9ffd29ceb3 MDL-31548 enrollments: Introducing new api enrol_get_all_users_courses() that returns all user courses without any checks 2012-04-20 08:54:06 +08:00