mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity
69,938 Commits 36 Branches 527 Tags
Commit Graph

12139 Commits

Author SHA1 Message Date
Sam Hemelryk
f3973676e8 MDL-46481 backup: implemented quick backup process (one click) 2014-10-03 09:43:08 +13:00
Dan Poltawski
76e348d46d Revert "MDL-45893 user_menu: revised based on action_menu" 
Was not yet ready for the prime time.

This reverts commit dc4bff329dc2faf56445effebaa6790e0bc76713.
This reverts commit a535004e5c54689dc664d780b15900e1e6e19f83.
This reverts commit c8398fb95af3533a1945e0b4f45ac939f3044d8d.
This reverts commit d24b8e52d38526bf62612c3569db1d3174613c77.

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
 2014-10-01 08:58:22 +01:00
Eloy Lafuente (stronk7)
ed3e85755c Merge branch '47428-28' of git://github.com/samhemelryk/moodle 2014-09-30 23:42:58 +02:00
Dan Poltawski
d62f99195a Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-09-30 09:55:03 +01:00
Dan Poltawski
d452f49cf9 Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle 2014-09-30 08:29:02 +01:00
Dan Poltawski
190ceae64b Merge branch 'MDL-47069-master-plugin-dependency' of git://github.com/mudrd8mz/moodle 2014-09-29 12:46:11 +01:00
Dan Poltawski
f03b612191 Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-09-29 10:30:42 +01:00
Brian Barnes
11edf09c61 MDL-46127 core_calendar: Removed tables when rendering a single event 2014-09-29 10:45:39 +13:00
Dave Cooper
e89682d822 MDL-32275 enrol: Last site access column now shows last course access 2014-09-26 10:51:47 +08:00
Andrew Davis
0e99979638 MDL-20250 core_grade: added some settings to disable or hide gradebook functionality 2014-09-26 10:19:00 +08:00
Sam Hemelryk
3a6ef60a5b MDL-47428 language: fixed typo 2014-09-26 10:05:24 +12:00
David Mudrák
2cdea9c7ac MDL-47069 admin: Add option to upload required ZIP at the check page 
The plugins check page displays other plugins that the current one
depends on.  Previously, we always displayed the other plugin as a link
to the plugins directory. This did not work well in two scenarios:

* The admin wants/needs to upload the other plugin from the ZIP file
  (e.g. it is not available in the plugins directory),

* the other plugin is actually a standard plugin that is not supposed to
  be registered with the plugins directory.

This patch displays the Install or Upload or Check for updates links
next to the required plugin instead, as appropriate.
 2014-09-25 16:54:21 +02:00
Jetha Chan
d24b8e52d3 MDL-45893 user_menu: revised based on action_menu 2014-09-25 13:43:06 +08:00
Marina Glancy
e0c22222b6 MDL-45336 questionbank: use core strings instead of quiz 
AMOS BEGIN
 CPY [categories,mod_quiz],[categories,question]
 CPY [unusedcategorydeleted,mod_quiz],[unusedcategorydeleted,question]
 CPY [export,mod_quiz],[export,core_question]
 CPY [import,mod_quiz],[import,core_question]
AMOS END
 2014-09-24 01:22:59 +02:00
Marina Glancy
5a0221f7c0 MDL-45336 question: moved used string from quiz plugin 
AMOS BEGIN
 MOV [erroritemappearsmorethanoncewithdifferentweight,quiz_statistics],[erroritemappearsmorethanoncewithdifferentweight,question]
AMOS END
 2014-09-24 01:22:58 +02:00
Marina Glancy
3a58e7ebc5 MDL-45336 backup: moved the string from quiz to core 
AMOS BEGIN
 CPY [timetaken,mod_quiz],[timetaken,backup]
AMOS END
 2014-09-24 01:22:58 +02:00
Dan Poltawski
546acfbf67 Merge branch 'MDL-47238_guest' of https://github.com/andyjdavis/moodle 2014-09-22 16:13:20 +01:00
Dan Poltawski
bd75ef826e Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle 2014-09-22 15:02:51 +01:00
Andrew Davis
005fa74115 MDL-47238 core_user: added an error message if guests access user profiles and they aren't allowed to 2014-09-22 11:02:54 +08:00
Adrian Greeve
b3d5f7bc50 MDL-40356 lib: New setting to display full names. 
This adds a new setting to display more name information for users
with the viewfullnames capability.
 2014-09-16 11:01:42 +08:00
Dan Poltawski
0908fb4221 Merge branch 'wip-MDL-46585-master' of git://github.com/marinaglancy/moodle 2014-09-15 13:00:24 +01:00
Damyon Wiese
dff9a97350 MDL-44447 Grade: Re-order lang strings 2014-09-15 17:02:43 +08:00
Damyon Wiese
20a2e554f9 Merge branch 'MDL-44447-master' of git://github.com/lameze/moodle 2014-09-15 16:44:41 +08:00
Simey Lameze
be289f57b2 MDL-44447 grade_export: Added multiple grade display types to grade export. 2014-09-15 16:42:07 +08:00
Damyon Wiese
7114249071 Merge branch 'MDL-46747' of git://github.com/timhunt/moodle 2014-09-15 14:03:39 +08:00
Marina Glancy
5076b96171 MDL-35468 cohorts: upload cohorts from csv file 2014-09-12 10:24:04 +08:00
Marina Glancy
c78cf06d9e MDL-46585 lang: 6 unused strings 'hidden' are deprecated 
Strings are not used in the components where they are defined.
If they are used in other components they should be defined in appropriate locations
since the translation may depend on the subject that is being hidden.
 2014-09-12 10:15:43 +08:00
Tim Hunt
9cc01bf323 MDL-46747 questions: add More info link to qbehaviour help. 
Thanks to Tony Gardner-Medwin for the suggestion.
 2014-09-11 16:16:57 +01:00
Marina Glancy
e0dfc380c6 Revert "Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle" 
This reverts commit 4b5fd6eb6d34b5c519d778a8d9c5c1a014146f54, reversing
changes made to a788aade7ce694b3f36c8e27295c60a5178c5b23.
 2014-09-11 10:54:40 +08:00
Dan Poltawski
4b5fd6eb6d Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle 2014-09-09 10:35:48 +01:00
Adrian Greeve
ea6f548081 MDL-40356 lib: Added a new setting to display more information from the fullname function. 2014-09-09 09:22:43 +08:00
Syxton
60df67878b MDL-46428 course: Remove confirm when duplicating 
A confirm dialog is given when Javascript is off but not when it is on.
This aligns the two so that they neither have a confirm when duplicating
an activity.
 2014-09-04 15:19:17 -04:00
Eloy Lafuente (stronk7)
4191191735 Merge branch 'MDL-47031-master-enfix' of git://github.com/mudrd8mz/moodle 2014-09-03 19:25:38 +02:00
Helen Foster
9447cdc206 MDL-47031 Merge English strings from the en_fix language pack 2014-09-03 10:02:56 +02:00
sam marshall
4717a5fca6 MDL-44725 Availability: Replace groupmembersonly - forms (4) 
Remove groupmembersonly option from module editing forms.
 2014-09-02 13:03:13 +01:00
sam marshall
061e6b2864 MDL-44725 Availability: Replace groupmembersonly - upgrade, core (1) 
* Upgrades existing data so that the groupmembersonly option is
  replaced with equivalent data for the new availability API.
* Removes the database field and admin setting used for
  groupmembersonly.
* Changes core modinfo library to remove/deprecate groupmembersonly
  data and functions.
* Changes other core library files to remove groupmembersonly
  references.

Includes deprecation of several functions, listed in lib/upgrade.txt.
 2014-09-02 13:03:07 +01:00
Tim Hunt
5ff815508f MDL-46979 backup: remove duplicate string. 
Thanks to Matt Sammarco for spotting this.
 2014-08-28 20:45:52 +01:00
Adrian Greeve
1899519c6b MDL-39888 mnet: Removed tab and links to the log report. 
The link would include parameters which generates warnings
on the log report page.
 2014-08-26 15:11:56 +08:00
Marina Glancy
e12ffe254e Merge branch 'MDL-46600_import_failed' of git://github.com/andyjdavis/moodle 2014-08-12 15:01:19 +08:00
Dan Poltawski
c7a042bfcf Merge branch 'master_MDL-46524' of https://github.com/greg-or/moodle-mod_assign 2014-08-11 17:06:54 +01:00
Andrew Davis
23a62c47af MDL-46600 core_grades: made it explicit in the error message that a failed grade import means nothing was imported. 2014-08-06 10:58:59 +08:00
Gregory Faller
e4ebf7ef0f MDL-46524: Auto-create groups from existing group or grouping membership 2014-08-06 10:50:14 +09:30
Dan Poltawski
a43be9d8f2 Merge branch 'MDL-46548-master' of git://github.com/damyon/moodle 2014-08-05 19:24:32 +01:00
Damyon Wiese
6c6d05a651 MDL-46548 grades: Add warning to export form when users with no idnumber are excluded. 2014-08-04 16:18:25 +08:00
Andrew Davis
e54e51931d MDL-46175 core_grading: updated grading related strings 2014-08-01 10:28:57 +08:00
Damyon Wiese
cca51baa07 MDL-46548 grades: Add support for simplified one-step exports and update txt exporter 
This ui change requires changes to the API so I have deprecated the old functions while maintaining
compatibility (if you don't mind lots of debugging).
 2014-07-31 17:00:01 +08:00
Marina Glancy
274dc06881 MDL-34189 cohorts: Allow admin/manager to see all cohorts on one page 2014-07-28 15:02:27 +08:00
Dan Poltawski
65f00f063b Merge branch 'MDL-45847_master' of https://github.com/Syxton/moodle 2014-07-21 12:09:10 +01:00
Sam Hemelryk
6a91c41a49 Merge branch 'wip-MDL-37812-master' of git://github.com/marinaglancy/moodle 2014-07-15 12:07:05 +12:00
Sam Hemelryk
628e818be2 Merge branch 'MDL-45991_master' of https://github.com/Syxton/moodle 2014-07-14 15:19:21 +12:00