53695 Commits

Author SHA1 Message Date
Marina Glancy
b5e7b6385e MDL-31901: Introducing renderers for filepicker:
- create repository renderer, implement functions for returning HTML templates used in filepicker
- let filepicker use HTML from templates
- move CSS for filemanager and filepicker to the separate css file in base theme
- use only YUI3 in filepicker (get rid of YUI2)
- add button for 'View details' in filepicker (though this view mode is still not ready)
2012-05-21 11:57:51 +08:00
Marina Glancy
4adecd7beb MDL-31901: brushing the filepicker code
- use the same function for displaying request result for list/search/login/logout commands since sometimes we can not predict what kind of result is going to be returned
- prevent default behaviour for links, so ### does not appear in URL
- use flag issearchresult as received in the response from repository because we can't guess it right sometimes
- do not make excessive AJAX request when user switches to list view
2012-05-21 11:57:51 +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
Sam Hemelryk
2cd972c1c6 MDL-32709 Pre-integration trivial clean up
* Added a comment for the BOOK_NUM_* defines.
* Fixed broken redirects in tool/importhtml/index.php
* Fixed typo in book_preload_chapters [subchpaters => subchapters]
* Fixed copy paste docblock error in tool/print/locallib.php
* Removed the .gitignore file as Eloy had previously mentioned that.
2012-05-21 14:06:00 +12:00
Eloy Lafuente (stronk7)
079be74dd5 MDL-32709 book: finish coding style review (errors only) 2012-05-21 01:50:20 +02:00
Eloy Lafuente (stronk7)
a1448fc012 MDL-32709 book: fix send_stored_file() call 2012-05-21 01:27:40 +02:00
Eloy Lafuente (stronk7)
9717aa2ddd MDL-32709 book: delete some not needed stuff 2012-05-21 01:26:52 +02:00
Eloy Lafuente (stronk7)
f7e6dd4d41 MDL-32709 book: now standard module + new strings added
Note the lang file is completely disordered yet
2012-05-21 00:54:53 +02:00
Eloy Lafuente (stronk7)
a87aa28d51 MDL-32709 book: Fix logs handling 2012-05-21 00:33:58 +02:00
Mary Evans
fc11586b03 MDL-33118 theme_mymobile: changed MAIN_CONTENT_TOKEN in layout/embedded.php to new format 2012-05-20 22:37:54 +01:00
Eloy Lafuente (stronk7)
b9a363548d MDL-32709 book: DB definition & upgrade cleanup 2012-05-20 21:48:07 +02:00
Eloy Lafuente (stronk7)
29656fe24b MDL-32709 book: coding style, deprecated and minor fixes 2012-05-20 21:47:58 +02:00
Eloy Lafuente (stronk7)
1fc9e895ef MDL-32709 book: replace some deprecated stuff. Some pending yet, blame $PAGE 2012-05-20 21:47:50 +02:00
Eloy Lafuente (stronk7)
98cef39d28 MDL-32709 book: Add some missing MOODLE_INTERNALs 2012-05-20 21:47:38 +02:00
Eloy Lafuente (stronk7)
3542c4f4a9 MDL-32709 book: general comments and phpdocs cleanup 2012-05-20 21:47:29 +02:00
Eloy Lafuente (stronk7)
e81c01b676 Subtree merged git://github.com/skodak/moodle-mod_book.git (master branch) into mod/book 2012-05-20 21:43:40 +02:00
Petr Skoda
103f34d88d MDL-32379 fix forum cron user caching 2012-05-19 18:56:19 +02:00
Petr Skoda
fb1ec806c5 MDL-32564 fix admin/timezone.php page setup 2012-05-19 18:52:58 +02:00
Eloy Lafuente (stronk7)
4f7f2a8828 weekly release 2.3dev 2012-05-19 12:24:31 +02:00
Eloy Lafuente (stronk7)
5204c07bd4 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-05-19 12:17:09 +02:00
AMOS bot
f348b9dac6 Automatically generated installer lang files 2012-05-19 00:31:42 +00:00
Eloy Lafuente (stronk7)
128af10645 MDL-32005 Avoid some notices restoring old backup files without idnumber 2012-05-18 13:36:03 +02:00
Dan Poltawski
4a3d07972c Merge branch 'MDL-30617-master-patches' of git://git.luns.net.uk/moodle 2012-05-18 17:40:33 +08:00
Adrian Greeve
0a498686c0 MDL-32126 replaced _order with sortorder to make sorting work in oracle 2012-05-18 11:37:21 +02:00
Andrew Robert Nicols
2d1151817f MDL-30617 Center dialogue title 2012-05-18 10:28:53 +01:00
Andrew Robert Nicols
af75421c54 MDL-30617 Adjustments to styling of module chooser
These changes fix several points and suggested changes:
* increase the size of the help popup to 800x600
* fix issues with centering of the dialogue
* swap next/cancel buttons
* convert next button to use string for 'Add'
* convert add text to 'Add an activity or resource'
2012-05-18 10:10:20 +01:00
Dan Poltawski
eeba64d02e MDL-32727 - quiz: fix incorrect variable name in upgrade 2012-05-18 15:08:07 +08:00
Dan Poltawski
5316007e08 MDL-24419 section availability: display availability info to teachers 2012-05-18 14:56:00 +08:00
Dan Poltawski
1edff8c7ed MDL-30617 lang: improve mod chooser strings 2012-05-18 12:46:13 +08:00
Dan Poltawski
ad10c481e1 Merge branch 'MDL-33048' of git://github.com/timhunt/moodle 2012-05-18 12:12:51 +08:00
Sam Hemelryk
d5e6fe3ecc Merge branch 'MDL-32727' of git://github.com/timhunt/moodle
Conflicts:
	mod/quiz/db/upgrade.php
2012-05-18 16:07:20 +12:00
Dan Poltawski
82258830b7 Merge branch 'MDL-32933' of git://github.com/netspotau/moodle-mod_assign 2012-05-18 11:23:47 +08:00
Dan Poltawski
a4d0f6f06a Merge branch 'w20_MDL-32868_m23_iplookup' of git://github.com/skodak/moodle 2012-05-18 11:05:28 +08:00
Dan Poltawski
7e89cbe0ac Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle 2012-05-18 10:30:22 +08:00
Dan Poltawski
79f3d0e027 Merge branch 'MDL-32535-master' of git://github.com/sammarshallou/moodle 2012-05-18 10:28:19 +08:00
Dan Poltawski
33e693b5e1 Merge branch 'MDL-32909' of git://github.com/netspotau/moodle-mod_assign 2012-05-18 10:05:32 +08:00
AMOS bot
2f7bd55c0c Automatically generated installer lang files 2012-05-18 00:31:47 +00:00
Eloy Lafuente (stronk7)
ad4dc7d265 MDL-33079 Enable IMS-CC export (backup converter) 2012-05-18 01:35:07 +02:00
Sam Hemelryk
67cfce0245 Merge branch 'MDL-33069' of git://github.com/danpoltawski/moodle 2012-05-18 10:48:23 +12:00
Sam Hemelryk
957983b702 MDL-33066 navigation: Fixed ambiguously defined columns in DB queries for Oracle 2012-05-18 10:37:44 +12:00
Eloy Lafuente (stronk7)
f823158b07 MDL-32941 Add transaction support to delete_categories 2012-05-18 00:06:42 +02:00
Eloy Lafuente (stronk7)
3ec163ddf1 MDL-32941 Reorganise functions a bit 2012-05-17 23:45:41 +02:00
Eloy Lafuente (stronk7)
754c2deab6 Merge branch 'MDL-32941' of git://github.com/mouneyrac/moodle
Conflicts:
	course/externallib.php
	lib/db/services.php
	version.php
2012-05-17 22:35:57 +02:00
Davo Smith
5a4decbc2d MDL-22504 Course drag and drop upload - (mostly) fixed the dragging of text between Firefox <==> Chrome 2012-05-17 21:19:52 +01:00
Dan Poltawski
46e046b7b3 MDL-30617 modchoser: minor tweaks
* Change markup way from 'activity module style' to its own markup
* Remove 'a new' from the 'add an activity' string
* Remove the 'personalisation' from the nohelp lang string
2012-05-18 00:27:42 +08:00
Andrew Robert Nicols
01e0e7044a MDL-30617 Add a javascript interface for adding modules to a course
This interface allows for additional metadata, such as the module's help
and icon, to be displayed.
2012-05-18 00:27:16 +08:00
Helen Foster
2e6b68f4a8 MDL-32925 lang: Add extended help texts for all modules
Thanks to Mary Cooch & Martin Dougiamas who contributed to this
rewording.

AMOS BEGIN
   REM These module help texts are going to be displayed more prominently in the Moodle interface
AMOS END
2012-05-18 00:27:04 +08:00
Tim Hunt
36e48cb82f MDL-33048 quiz / my moodle: fatal error due to missing include. 2012-05-17 16:06:41 +01:00
Dan Poltawski
bc449b18a6 Merge branch 'MDL-33025-master-1' of git://git.luns.net.uk/moodle 2012-05-17 21:19:37 +08:00
Dan Poltawski
03ba9dac94 Merge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle 2012-05-17 21:04:30 +08:00