mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
53,801 Commits 36 Branches 519 Tags
Commit Graph

53801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
9b27ffa042 MDL-29857 - portfolio: Fix E_STRICT errors 2012-05-29 10:13:20 +08:00
Dan Poltawski
4631e39533 on-demand release 2.3dev 2012-05-25 18:07:10 +08:00
Dan Poltawski
cc8801e33d Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-05-25 18:04:43 +08:00
Dan Poltawski
e7b7cd5b98 Merge branch 'w21_MDL-33075_m23_phpunitclassreflex' of git://github.com/skodak/moodle 2012-05-25 15:25:30 +08:00
Aparup Banerjee
66905a4cf7 Merge branch 'MDL-33196' of git://github.com/rwijaya/moodle 2012-05-25 14:13:21 +08:00
Aparup Banerjee
b74ad708b1 Merge branch 'MDL-33307' of git://github.com/danpoltawski/moodle 2012-05-25 12:08:03 +08:00
Aparup Banerjee
09cb95f861 MDL-33324 Filepicker : fixed syntax. 2012-05-25 11:44:04 +08:00
Aparup Banerjee
0479a2873e MDL-33324 Filepicker : removed redundant parantheses. 2012-05-25 11:25:57 +08:00
Aparup Banerjee
708738cd73 Merge branch 'wip-MDL-33324-master' of git://github.com/marinaglancy/moodle 2012-05-25 11:25:25 +08:00
Dan Poltawski
c86d6be226 Merge branch 'MDL-29924-master' of git://github.com/FMCorz/moodle 2012-05-25 11:14:22 +08:00
Dan Poltawski
c46da75917 MDL-28557 - calendar: fix trivial whitespace issue 2012-05-25 11:08:14 +08:00
Dan Poltawski
ccee3cd67f Merge branch 'MDL-28557' of git://github.com/bostelm/moodle 2012-05-25 11:07:14 +08:00
Dan Poltawski
9a16bd1798 Merge branch 'w22_MDL-33114_m23_tinymce3511' of git://github.com/skodak/moodle 2012-05-25 11:00:53 +08:00
Dan Poltawski
588d3a7e1f Merge branch 'MDL-33135-master-3' of git://git.luns.net.uk/moodle 2012-05-25 10:55:49 +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
10a9d27d74 Merge branch 'w21_MDL-33034_m23_roletests' of git://github.com/skodak/moodle 2012-05-25 10:37:48 +08:00
Dan Poltawski
488656491d MDL-29836 webservice: version bump to pickup new string 2012-05-25 10:36:43 +08:00
Vadim Dvorovenko
5e963820a5 MDL-29836 webservices: use individual string 
To allow accurate transalation
 2012-05-25 10:33:02 +08:00
Dan Poltawski
8cba2bb747 Merge branch 'MDL-33028' of git://github.com/mouneyrac/moodle 2012-05-25 10:22:35 +08:00
Dan Poltawski
2ffd7f1824 Merge branch 'MDL-33060' of git://github.com/mouneyrac/moodle 2012-05-25 10:16:12 +08:00
Dan Poltawski
8119141b91 Merge branch 'MDL-33020' of git://github.com/timhunt/moodle 2012-05-25 10:14:17 +08:00
Dan Poltawski
494573dc43 Merge branch 'MDL-32339-css-updates' of git://github.com/mudrd8mz/moodle 2012-05-25 10:13:19 +08:00
Dan Poltawski
2528e8e52f MDL-33139 mod_forum: fix minor whitespace problem 2012-05-25 10:09:09 +08:00
Dan Poltawski
1e448fed27 Merge branch 'MDL-33139-master' of https://github.com/mackensen/moodle 2012-05-25 10:08:33 +08:00
Dan Poltawski
f5a68663db MDL-33173 files: correct @package name 2012-05-25 10:03:33 +08:00
Dan Poltawski
753199ba63 Merge branch 'MDL-33173-master' of git://github.com/FMCorz/moodle 2012-05-25 09:57:35 +08:00
Frederic Massart
4c88645920 MDL-33173 Filepicker: renamed private files edit page to main page 2012-05-25 09:24:39 +08:00
AMOS bot
c291e996c8 Automatically generated installer lang files 2012-05-25 00:31:16 +00:00
Sam Hemelryk
6347a6216d MDL-33172: Fixed whitespace 2012-05-25 11:37:07 +12:00
Dan Poltawski
3447100cdb MDL-33172 - filestorage: Fix oracle incompatibilites 
Fixes the following problems:

* When we select from two tables with the same named fields (id)
  and ask to sort by that field, Oracle doesn't know which table to
  sort frm unless that field is named in the SELECT. Here we do that
  by explicitly naming the fields. This keeps compatibility with before
  the reference table was added.

* Text comparisong without sql_compare_text
 2012-05-25 11:17:56 +12:00
Dan Poltawski
ac29403e39 MDL-33172 - filestorage: Add unit test for breaking oracle functions 2012-05-25 11:17:56 +12:00
Petr Skoda
798f0dece2 MDL-33114 import TinyMCE 3.5.1.1 and fix preview 2012-05-24 23:15:52 +02:00
Dan Poltawski
4b0992ca19 Merge branch 'wip-MDL-33329-master' of git://github.com/marinaglancy/moodle 2012-05-24 23:30:23 +08:00
Dan Poltawski
b6283a4970 MDL-33307 format_weeks - sort out week date display 
* Introduce function format_weeks_get_section_dates which is used
  as the consistent place to calculate the current section start and
  end date

* Rework callback_weeks_get_section_name to not use the above function
  rather than do crazy needless looping through all sections to work
  out the current week title.

* Change the just introduced is_current renderer function to share
  the format_weeks_get_section_dates function to ensure both the title
  and 'current week' are using the same dates to do their job
 2012-05-24 23:10:28 +08:00
Dan Poltawski
2ea6533a36 MDL-33307 format_weeks - highlight current week 2012-05-24 23:10:27 +08:00
Charles Fulton
c2c071a274 MDL-33139 forum: indicate which user's post was edited 2012-05-24 06:14:21 -07:00
Dan Poltawski
5744ea3682 Revert "MDL-33063 course: Reuse get_all_sections()" 
This reverts commit 66b494771ffc731472a374bef1b5cd12befd53b2.
 2012-05-24 20:42:58 +08:00
Dan Poltawski
108526897d Merge branch 'MDL-33063' of git://github.com/srynot4sale/moodle 2012-05-24 20:32:31 +08:00
David Mudrak
5536f2fccf MDL-32339 improving the layout for narrow screens 2012-05-24 11:49:36 +02:00
Dan Poltawski
cf36df4316 Merge branch 'MDL-33315_blog_rss' of git://github.com/andyjdavis/moodle 2012-05-24 16:49:28 +08:00
Dan Poltawski
0fb13aa3d8 Merge branch 'dev_MDL-33127_draft_storing' of git://github.com/dongsheng/moodle 2012-05-24 16:34:32 +08:00
Dan Poltawski
2625d99b52 Merge branch 'wip-MDL-33144-master' of git://github.com/marinaglancy/moodle 2012-05-24 16:32:32 +08:00
Marina Glancy
2d7c111734 MDL-33329 Filepicker form element can not link by reference. Also better handling of maxbytes 2012-05-24 16:14:02 +08:00
Dan Poltawski
505978801f MDL-33162 filepicker: fix trailingw hitespace 2012-05-24 16:12:15 +08:00
Dan Poltawski
77cb9b6ce6 Merge branch 'wip-MDL-33162-master' of git://github.com/barbararamiro/moodle 2012-05-24 16:10:06 +08:00
Dan Poltawski
5c44b03559 Merge branch 'wip-MDL-33146-master' of git://github.com/abgreeve/moodle 2012-05-24 16:05:25 +08:00
Dan Poltawski
ab1c1571a3 Merge branch 'MDL-33186-master-1' of git://git.luns.net.uk/moodle 2012-05-24 15:53:39 +08:00
Aparup Banerjee
a91b4aa661 MDL-33318 lib : code style fix 2012-05-24 15:40:06 +08:00
Barbara Ramiro
a9352f1f3c MDL-33162, MDL-33183, MDL-33150 Adjusted styles filemanager, file picker and file picker form element 
- MDL-33162 Vertical align text to the middle of 24px icon for table view and tree view both on filemanager and filepicker
- MDL-33183 Layout file picker on form element on edit profile for drag and drop with dashed border and animated arrow consistent with filemanager (outputrenderers.php)
- MDL-33150 Added more space in between tool buttons both for file manager and filepicker
 2012-05-24 15:02:52 +08:00
Aparup Banerjee
b9dade0c65 Merge branch 'master_MDL-33318' of git://github.com/danmarsden/moodle 2012-05-24 14:46:38 +08:00