mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-09 18:30:03 +01:00
Code Issues Projects Releases Wiki Activity
52,717 Commits 36 Branches 523 Tags
Commit Graph

867 Commits

Author SHA1 Message Date
Andrew Robert Nicols
9d40f585da Revert MDL-31215 Add the ability to change activity titles using AJAX calls 
This *partially* reverts commit 6a14c4ffdd01d6b2069e8c27bb2b7df26dcdbd6a.

Note however parts of that commit were unrelated and haven't been
reverted.
 2012-04-26 17:25:06 +08:00
Eloy Lafuente (stronk7)
ee5855687e Merge branch 'MDL-31052-js-rewrite' of git://github.com/danpoltawski/moodle 2012-04-26 03:32:08 +02:00
Andrew Robert Nicols
ede323e2b3 MDL-31914 Ensure that completion criteria are deleted when removing a course module 
Conflicts:

	lib/db/upgrade.php
	version.php
 2012-04-24 12:25:53 +02:00
Andrew Robert Nicols
6a14c4ffdd MDL-31215 Add the ability to change activity titles using AJAX calls 2012-04-24 13:25:49 +08:00
Ruslan Kabalin
5683815612 MDL-31263 Rewrite block drag/drop using YUI3 2012-04-24 13:25:43 +08:00
Ruslan Kabalin
15e2552f00 MDL-31216 Create dragdrop course module 2012-04-23 21:28:39 +01:00
Andrew Robert Nicols
ebaa29d107 MDL-31096 Convert course resource/section javascript to YUI3 Module 
AMOS BEGIN
  MOV [hideweekfromothers,moodle],[hidefromothers,format_week]
  MOV [showweekfromothers,moodle],[showfromothers,format_week]
  MOV [hidetopicfromothers,moodle],[hidefromothers,format_topics]
  MOV [showtopicfromothers,moodle],[showfromothers,format_topics]
AMOS END
 2012-04-23 21:28:39 +01:00
Dan Poltawski
e7e0f8d27f Merge branch 'MDL-32215-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	course/simpletest/testcourselib.php
    lib/db/upgrade.php
	version.php
 2012-04-23 12:20:57 +08:00
sam marshall
cf76b3353c MDL-32215 Course: Ensure section entries are unique on course, section 2012-04-19 15:16:56 +01:00
Petr Skoda
c9c2027332 MDL-32251 E_STRICT fix 2012-04-01 15:22:42 +02:00
Dan Poltawski
a4051353d1 Revert "Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle" 
This reverts commit 296c0247c6cc9e525721fc92b5a78c7146e6887d, reversing
changes made to 2511b0742a3695298d8216fe9723581c089909d7.

Conflicts:

	lib/db/upgrade.php
	version.php
 2012-03-29 16:07:30 +08:00
Eloy Lafuente (stronk7)
296c0247c6 Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-03-27 10:10:17 +02:00
Sam Hemelryk
ef844d0a15 Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle 2012-03-20 16:47:17 +13:00
Petr Skoda
f20edd5208 MDL-32094 fix various E_STRICT compatibility problems 2012-03-18 18:37:24 +01:00
Andrew Robert Nicols
cac06a034d MDL-31914 Ensure that completion criteria are deleted when removing a course module 2012-03-16 16:07:05 +00:00
Tim Hunt
9665ecd275 MDL-19125 module restrictions: use a capability 
1. This used to use a complex legacy system which was buggy.

2. It now relies on a new mod/...:addinstance capability for each module.

3. All the legacy code has been stripped out.

4. Old restriction data is upgraded by creating the necessary permission
overrides. Similarly, when old backups are restored, the old settings
are converted to be overrides.

5. The required addinstance capabilities will be added as a separate
commit.

6. There is a developer debug warning about modules that are missing the
addinstance capability, unless they are MOD_ARCHETYPE_SYSTEM mods.
 2012-03-15 17:11:27 +00:00
Sam Hemelryk
772685e983 MDl-30616 course: Fixed bug with module subtype links 2012-03-14 13:56:22 +13:00
Eloy Lafuente (stronk7)
9767526f88 Merge branch 'MDL-30616-master-7' of git://git.luns.net.uk/moodle 2012-03-13 23:40:39 +01:00
Rajesh Taneja
9e4baaf96f MDL-30817 activity_completion: Fixed title and alt string (on checkbox) to have module name prefixed 2012-03-12 10:16:31 +08:00
Eloy Lafuente (stronk7)
bb77ead0a4 Merge branch 'MDL-31255-master-3' of git://git.luns.net.uk/moodle 2012-03-07 00:18:27 +01:00
Petr Skoda
f8311defeb MDL-31301 use static textlib methods 2012-03-03 11:46:13 +01:00
Ruslan Kabalin
93d46f4802 MDL-31255 Fix move of highlighted section when JS is off 2012-02-29 09:08:58 +00:00
Andrew Robert Nicols
59155a3fb3 MDL-30616 Move module metadata retrieval to new function 2012-02-28 13:44:42 +00:00
Petr Skoda
dc76704067 MDL-31177 fix notices when exporting logs to ods 2012-01-21 19:51:28 +01:00
Petr Skoda
927010240f MDL-31006 some more PHP54 notices 
PHP54 compatibility - PhpStorm IDE is the best tool for this kind of work!!
 2012-01-18 01:17:25 +01:00
Petr Skoda
b85b25ebb8 MDL-31006 fix various notices in PHP54 
PHP54 compatibility
 2012-01-18 01:03:20 +01:00
Eloy Lafuente (stronk7)
ec43e2267c Merge branch 'MDL-30408-master' of git://github.com/sammarshallou/moodle 2012-01-17 01:43:19 +01:00
Sam Hemelryk
3ce3bb8861 MDL-31011 course: Fixed typo in comment 2012-01-16 14:49:56 +08:00
Sam Hemelryk
371fa34ecc Merge remote-tracking branch 'skodak/w03_MDL-31011_m23_loglinks' 2012-01-16 14:49:55 +08:00
Petr Skoda
d48f6068e0 MDL-31011 fix report links in logs 2012-01-15 19:02:08 +01:00
sam marshall
5813c7f7dc MDL-30408 Allow modules the choice to not appear on 'Add a...' lists 
This is useful for modules which are created by the system and are not supposed to be created by users. There are various reasons for doing this in third-party modules.
 2012-01-12 17:29:54 +00:00
Andrew Robert Nicols
6dc5908ef7 MDL-31040 Correct LTR language issue and inconsistency in display 2012-01-11 10:58:23 +00:00
sam marshall
ce2a7a9186 MDL-30879 Course page: missing space after class for new 'description on course page' feature 2012-01-03 12:40:09 +00:00
Petr Skoda
af18993548 MDL-30787 fix use of module and section edit capabilities 2011-12-18 13:54:38 +01:00
Sam Hemelryk
e3dfd1a1d9 Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution 2011-11-10 10:15:50 +13:00
Eloy Lafuente (stronk7)
c443a1cdb6 MDL-30175 cm_info - add support to external url icon images 2011-11-07 22:14:13 +01:00
Petr Skoda
fad8e0248c MDL-29030 move user log reporting to report_log plugin 2011-11-06 12:22:52 +01:00
Petr Skoda
033af4b7ba MDL-29030 migrate and cleanup log report 
AMOS BEGIN
 MOV [log:view,coursereport_log],[log:view,report_log]
 MOV [log:viewtoday,coursereport_log],[log:viewtoday,report_log]
AMOS END
 2011-11-06 12:22:49 +01:00
Petr Skoda
8a8f29c2f5 MDL-29030 new loglive report plugin 
AMOS BEGIN
 CPY [log:viewlive,coursereport_log,[loglive:view,report_loglive]
 MOV [livelogs,core],[livelogs,report_loglive]
 CPY [loglive,coursereport_log],[pluginname,report_loglive]
AMOS END
 2011-11-06 12:22:49 +01:00
Dan Poltawski
e52a8ebdd2 MDL-29902: Course contacts display cleanup 
This fixes warnings in course description when searching courses with
users assigned multiple display roles. It cleans up inconsistent behaviour
which I noticed whilst fixing the bug. Now course search and course listing
use the same logic to display users.
 2011-10-24 15:52:35 +01:00
sam marshall
7fb4699266 MDL-29719 Option to display course shortname alongside fullname on course lists 2011-10-17 10:50:59 +01:00
Dan Poltawski
eea78ebc03 MDL-27295 Course Category View - Only display count when more than 0 courses 2011-09-30 11:59:58 +01:00
Aparup Banerjee
d1e362405e Merge branch MDL-29186-master of git://github.com/samhemelryk/moodle 
- resolved conflicts, minor whitespace and fixed quote.
- note: textlib_get_instance() is already deprecated
 2011-09-13 16:06:21 +08:00
Aparup Banerjee
7eae2c5ae2 Merge branch MDL-29187-master of git://github.com/samhemelryk/moodle 
- resolved conflict.
 2011-09-13 13:52:31 +08:00
Aparup Banerjee
5433da6064 Merge branch MDL-29189-master of git://github.com/samhemelryk/moodle 
- resolved conflicts.
 2011-09-13 11:39:06 +08:00
Sam Hemelryk
62b214d9a6 Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle 2011-09-13 12:45:34 +12:00
Eloy Lafuente (stronk7)
ce9d0673d0 Merge branch 'MDL-29236-master' of git://github.com/sammarshallou/moodle 2011-09-12 20:37:24 +02:00
Petr Skoda
138c76789b MDL-29014 fix a few incorrect uses of strlen and substr 2011-09-10 10:21:31 +02:00
Eloy Lafuente (stronk7)
8645a28f3e MDL-28488 backup - activity duplication requires 2 capabilities in ctx 2011-09-09 15:53:02 +02:00
Sam Hemelryk
91d284c145 MDL-29186 multilang Reviewed the uses of course fullname and ensured things were being formatted consistently 2011-09-08 09:38:46 +12:00