Commits · 5574862063699039658f0a28449ac911244794d2 · moodle / moodle

14 Jan, 2013 2 commits

MDL-36534 question editing: clean up lang strings. · 55748620

Tim Hunt authored Jan 11, 2013

There were a number of lang strings in suboptimal places.
This commit fixes that, and also removed some unused strings.

AMOS BEGIN
 MOV [addmorechoiceblanks,qtype_multichoice],[addmorechoiceblanks,question]
 MOV [youmustenteramultiplierhere,qtype_calculated],[youmustenteramultiplierhere,qtype_numerical]
AMOS END

55748620

MDL-36534 Quiz: Group question type unit fields · c4b2600d
Colin Chambers authored Nov 12, 2012

c4b2600d

11 Jan, 2013 6 commits
- NOBUG: Bumping version to test auto-packaging · ca48fe5f
  Eloy Lafuente authored Jan 11, 2013
  
  ca48fe5f
- weekly release 2.5dev · 2e5d0134
  Eloy Lafuente authored Jan 11, 2013
  
  2e5d0134
- fix permissions · b64a33ba
  Eloy Lafuente authored Jan 11, 2013
  
  b64a33ba
- Merge branch 'install_master' of git://git.moodle.cz/moodle-install · d0942f07
  Eloy Lafuente authored Jan 11, 2013
  
  d0942f07
- MDL-37420 rework pg schema testing · 92b00c32
  Petr Škoda authored Jan 10, 2013 and Eloy Lafuente committed Jan 11, 2013
  
  92b00c32
- MDL-37467 Do not provide blog posts via RSS when blogging is disabled · fe7e411e
  David Mudrák authored Jan 10, 2013 and Eloy Lafuente committed Jan 10, 2013
  
  fe7e411e
10 Jan, 2013 6 commits
- Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle · 72a504dc
  Eloy Lafuente authored Jan 10, 2013
  
  72a504dc
- MDL-36741 mod_forum: fixed the function forum_rss_newstuff that was using... · 941294ef
  Mark Nelson authored Jan 10, 2013
```
MDL-36741 mod_forum: fixed the function forum_rss_newstuff that was using count_records_sql incorrectly as well as generating RSS content when no data exists
```
  941294ef
- MDL-37247 mod_forum: removing unnecessary variable in the get_forums web service · faf3016f
  Mark Nelson authored Jan 10, 2013 and Dan Poltawski committed Jan 10, 2013
  
  faf3016f
- MDL-37247 mod_forum: perform conditional checks before returning forums via web service · 0c246ae5
  Mark Nelson authored Jan 10, 2013 and Dan Poltawski committed Jan 10, 2013
  
  0c246ae5
- Revert "Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle" · 319d9376
  Dan Poltawski authored Jan 10, 2013
```
This reverts commit 8361f557,
2b9e957a and
fae51910
```
  319d9376
- MDL-36600 Add missing sesskey check when previewing the message · 632f3eff
  Andrew Robert Nicols authored Jan 09, 2013 and Dan Poltawski committed Jan 10, 2013
  
  632f3eff
09 Jan, 2013 19 commits
- MDL-32639 phpunit: Hack not to fail on debugging · 1017426c
  Frederic Massart authored Jan 09, 2013 and Dan Poltawski committed Jan 09, 2013
  
  1017426c
- Merge branch 'wip-MDL-37404-master' of git://github.com/marinaglancy/moodle · a0af8cb8
  Sam Hemelryk authored Jan 09, 2013
  
  a0af8cb8
- Merge branch 'w51_MDL-37420_m25_pgschema' of git://github.com/skodak/moodle · f9f750ce
  Eloy Lafuente authored Jan 09, 2013
  
  f9f750ce
- Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle · 8361f557
  Eloy Lafuente authored Jan 09, 2013
```
Conflicts:
	course/tests/courselib_test.php
```
  8361f557
- MDL-36904 mod_assign: Fixed whitespace issue · 73165898
  Sam Hemelryk authored Jan 09, 2013
  
  73165898
- Merge branch 'MDL-35413-master' of git://github.com/damyon/moodle · 6f51092f
  Sam Hemelryk authored Jan 09, 2013
```
Conflicts:
	mod/assign/locallib.php
```
  6f51092f
- Merge branch 'w51_MDL-37183_m25_excelcleanup' of git://github.com/skodak/moodle · e801c74c
  Eloy Lafuente authored Jan 08, 2013
  
  e801c74c
- Merge branch 'wip-MDL-37203-m25' of git://github.com/samhemelryk/moodle · c68f339e
  Eloy Lafuente authored Jan 08, 2013
  
  c68f339e
- Merge branch 'w51_MDL-35356_m25_excel' of git://github.com/skodak/moodle · ac4c7aed
  Eloy Lafuente authored Jan 08, 2013
```
Conflicts:
	lib/odslib.class.php
```
  ac4c7aed
- Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle · 3913743a
  Sam Hemelryk authored Jan 09, 2013
  
  3913743a
- Merge branch 'wip-MDL-35842-master' of git://github.com/phalacee/moodle · 5ba45e34
  Sam Hemelryk authored Jan 09, 2013
  
  5ba45e34
- Merge branch 'wip-MDL-35891-master' of git://github.com/phalacee/moodle · 21117c9d
  Sam Hemelryk authored Jan 09, 2013
  
  21117c9d
- MDL-36357 cache: removed double semicolon · 086e78da
  Sam Hemelryk authored Jan 09, 2013
  
  086e78da
- Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle · f44e7d0a
  Sam Hemelryk authored Jan 09, 2013
```
Conflicts:
	user/view.php
```
  f44e7d0a
- MDL-36600 user: improve course messaging checks · 60fb0ef8
  Andrew Robert Nicols authored Jan 09, 2013
  
  60fb0ef8
- Merge branch 'w51_MDL-37152_m25_smtp' of git://github.com/skodak/moodle · 4f90540e
  Eloy Lafuente authored Jan 08, 2013
  
  4f90540e
- MDL-37420 add support for db schemas in auth test · 59706ff6
  Petr Škoda authored Jan 08, 2013
  
  59706ff6
- MDL-37420 add support for db schemas in enrol test · 917fddb5
  Petr Škoda authored Jan 08, 2013
  
  917fddb5
- MDL-37420 add support for more PostgreSQL schemas · 6ad8d762
  Petr Škoda authored Jan 08, 2013
  
  6ad8d762
08 Jan, 2013 7 commits
- MDL-28183 fix for problem during integration · d55399a0
  Jean-Michel Vedrine authored Jan 08, 2013 and Eloy Lafuente committed Jan 08, 2013
```
Conflicts:
	question/type/multianswer/question.php
```
  d55399a0
- Merge branch 'MDL-37220_dnd_icon' of git://github.com/davosmith/moodle · f9ba4fd8
  Eloy Lafuente authored Jan 08, 2013
  
  f9ba4fd8
- Merge branch 'w51_MDL-37284_m25_mysqlutf8' of git://github.com/skodak/moodle · a74c3851
  Eloy Lafuente authored Jan 08, 2013
  
  a74c3851
- Merge branch 'w51_MDL-37291_m25_paypalrestore' of git://github.com/skodak/moodle · 783a51ba
  Eloy Lafuente authored Jan 08, 2013
  
  783a51ba
- Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle · cf78070a
  Eloy Lafuente authored Jan 08, 2013
  
  cf78070a
- Merge branch 'w51_MDL-37323_m25_dlgstrings' of git://github.com/skodak/moodle · b315a452
  Eloy Lafuente authored Jan 08, 2013
  
  b315a452
- Merge branch 'w51_MDL-7537_m25_paypalcur' of git://github.com/skodak/moodle · 6c8d7fed
  Dan Poltawski authored Jan 08, 2013
  
  6c8d7fed