L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,200 Commits 38 Branches 564 Tags
a5fefe0bbdf95e8b429e3afa7bfaef75dca09df3
Commit Graph

883 Commits

Author SHA1 Message Date
Dan Poltawski 950632673b Merge branch 'MDL-32875-master-1' of git://git.luns.net.uk/moodle 2012-05-14 13:08:40 +08:00
Sam Hemelryk 924c34df8c MDL-32873 course: Fixed up unused global + phpdocs 2012-05-14 13:41:15 +12:00
Sam Hemelryk 1c0441bd6a Merge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle 
Conflicts:
	course/lib.php
 2012-05-14 13:39:55 +12:00
Sam Hemelryk 8ec7c2cfd9 Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle 2012-05-14 13:30:16 +12:00
Andrew Robert Nicols 3aaa184399 MDL-32881 Prevent course/view.php from being cached 
This should prevent browser caching which will ensure that changes made
using the course javascript (e.g. drag/drop, show/hide) will not be 'lost'
by using the browser back button.
 2012-05-10 11:38:42 +01:00
Andrew Robert Nicols 5720019d91 MDL-32873 Separate out course ajax enabled detection into new function 2012-05-09 16:19:01 +01:00
Ruslan Kabalin e7b6e6b9f7 MDL-32875: Fix highlighted section drag-drop issue 2012-05-09 11:25:08 +01:00
Dan Poltawski 143d743743 MDL-32508 course: make_editting_buttons now takes optionally returns to section 2012-05-04 10:53:00 +08:00
Dan Poltawski 5218b9bb7d MDL-32508 course: Introduce course_get_url() 2012-05-04 10:52:58 +08:00
Dan Poltawski b9bcdb54da MDL-32505 course: drop course_display table and settings 2012-05-04 10:52:56 +08:00
Dan Poltawski 1156d38d94 MDL-32504 course: Add coursedisplay setting to course table 
This will replace the course_display database table
 2012-05-04 10:49:52 +08:00
Dan Poltawski 7aaed66901 MDL-32509 course: remove enablecourseajax setting 
We just have the single enableajax setting
 2012-05-05 10:56:06 +08:00
Sam Hemelryk 398e6932b0 Merge branch 'MDL-32657-master-1' of git://git.luns.net.uk/moodle 2012-05-02 14:41:11 +12:00
Sam Hemelryk 6caa86747f Merge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle 2012-04-30 12:50:38 +12:00
Ruslan Kabalin c77582fe42 MDL-32657: course dragdrop: define elements changes within the format 
It allows to define M.course.format.swap_sections and
M.course.format.get_section_selector in the course format javascript file, so
that course dragdrop is aware about perculiar layout and changes that need to
be done when sections are swapped.
 2012-04-27 15:01:02 +01:00
Andrew Robert Nicols 9d40f585da Revert MDL-31215 Add the ability to change activity titles using AJAX calls 
This *partially* reverts commit 6a14c4ffdd.

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 b1a8aa73b5 MDL-29044: Move course category creation to a separate function 2012-04-24 10:57:12 +01: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 296c0247c6, reversing
changes made to 2511b0742a.

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