moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62375 commits 37 branches 540 tags 1.3 GiB
Commit graph

62375 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marina Glancy
f64998fab3 Merge branch 'MDL-39020-master' of git://github.com/ankitagarwal/moodle 2013-07-09 16:32:16 +10:00
Andrew Davis
766fd0d92f MDL-34454 core_message: removed a deprecated function 
Conflicts:

	lib/deprecatedlib.php
 2013-07-09 14:11:07 +08:00
Rajesh Taneja
df6c384d55 MDL-40218 Assignment: updated upgrade.txt and version number 2013-07-09 14:09:11 +08:00
Rajesh Taneja
1ecb8044b6 MDL-40218 Assignment: Added lazy loading for showactiveenrol option and supended users 2013-07-09 14:09:11 +08:00
Marina Glancy
8bed37619e Merge branch 'MDL-23646-master' of git://github.com/damyon/moodle 2013-07-09 15:55:51 +10:00
Marina Glancy
84842f54dd Merge branch 'wip-MDL-37565-master' of git://github.com/phalacee/moodle 2013-07-09 15:54:45 +10:00
Damyon Wiese
8a011a9f0a Merge branch 'w28_MDL-40243_m26_ldapsuspend' of https://github.com/skodak/moodle 2013-07-09 13:44:01 +08:00
Dan Poltawski
bb0458aa7c Merge branch 'MDL-40403-master' of git://github.com/FMCorz/moodle 2013-07-09 13:38:10 +08:00
Frederic Massart
82c9aa843e MDL-40403 tests: Fix pointless assertion 2013-07-09 13:34:44 +08:00
Frederic Massart
8e8891b76b MDL-40403 libraries: Deprecate get_parent_contexts() 2013-07-09 13:34:44 +08:00
Damyon Wiese
c2bee5e0d1 Merge branch 'master_MDL-37484' of git://github.com/danmarsden/moodle 2013-07-09 13:33:42 +08:00
Rajesh Taneja
e6cc5347eb MDL-40218 Assignment: Added unit test to check suspended users 2013-07-09 13:32:10 +08:00
Rajesh Taneja
3fa106d0d6 MDL-40218 Assignment: User should not be able to view submissions, whithout proper permissions 2013-07-09 13:32:09 +08:00
Rajesh Taneja
c494e18cbd MDL-40218 Assignment: Participants/submission/grade count only include active users 2013-07-09 13:32:08 +08:00
Rajesh Taneja
a69944eb8b MDL-40218 Assignment: Show suspended user, similar to the way they are shown in grader report 2013-07-09 13:32:08 +08:00
Rajesh Taneja
4c4c7b3f3f MDL-40218 Assignment: Added show/hide suspended users functionality 2013-07-09 13:32:08 +08:00
Damyon Wiese
eb729e0391 Merge branch 'MDL-40499' of git://github.com/jmvedrine/moodle 2013-07-09 13:26:49 +08:00
Damyon Wiese
b9bca41b53 MDL-23646: Tinymce wrap plugin fixes. 
Added info to upgrade.txt
Removed wrap plugins from the tinymce plugin list.
Fix trailing comma in wrap plugin javascript.
Removed non functioning "!" handling.
Fixed icons for wrap plugin.
 2013-07-09 13:22:33 +08:00
Damyon Wiese
46a24596b8 MDL-23646 tinymce: Fix for pdw plugin 
This plugin was changing the display of the toolbar tables from "display: table"
to "display: block" when hiding/unhiding the toolbars.

This broke the wrapping plugin.
 2013-07-09 13:22:33 +08:00
Damyon Wiese
650a44fc26 MDL-23646 tinymce: Add upgrade algorithm for custom toolbars. 2013-07-09 13:22:33 +08:00
Damyon Wiese
05e9c136e6 MDL-23646 tinymce: Add plugin to wrap toolbar on small screens 2013-07-09 13:22:33 +08:00
Jason Fowler
3b62cd64d7 MDL-37565 - HTMLEditor - Adding a toggle plugin to TinyMCE to improve the appearance of the editor 2013-07-09 13:02:05 +08:00
Damyon Wiese
26616e4b6d Merge branch 'MDL-40386' of https://github.com/prateeksachan/moodle 2013-07-09 12:34:31 +08:00
Jamie Pratt
596ea56f6b MDL-40388 Reset globals after each unit test 2013-07-09 12:26:28 +08:00
Tony Levi
00726467f6 MDL-40035: Avoid rebuild_course_cache always for empty course 2013-07-09 13:53:27 +10:00
Adrian Greeve
a327f25ef1 MDL-31776 - lib: Alternate name fields 
Add support for additional name fields and flexible formating of
user names.
 2013-07-09 11:45:50 +08:00
Damyon Wiese
9d871499fe Merge branch 'MDL-40318' of git://github.com/timhunt/moodle 2013-07-09 11:11:42 +08:00
Damyon Wiese
9ac5809512 Merge branch 'MDL-40562_master' of git://github.com/dmonllao/moodle 2013-07-09 11:04:58 +08:00
Damyon Wiese
35a8f0cb77 Merge branch 'wip-MDL-40368-m26' of git://github.com/samhemelryk/moodle 
Conflicts:
	admin/tool/capability/index.php
 2013-07-09 10:48:47 +08:00
Sam Hemelryk
a13ee8e18a Merge branch 'MDL-40402-master2' of git://github.com/ankitagarwal/moodle 2013-07-09 14:42:03 +12:00
Damyon Wiese
b080d5b688 Merge branch 'wip-MDL-40490-master' of git://github.com/abgreeve/moodle 2013-07-09 10:03:22 +08:00
Marina Glancy
b4a044f3fb Merge branch 'MDL-40434' of git://github.com/timhunt/moodle 2013-07-09 11:30:42 +10:00
Tim Lock
a9166e8210 MDL-40436: auth_ldap: Fixed warning when adding new LDAP users 2013-07-08 22:57:25 +08:00
Damyon Wiese
15b726d584 Merge branch 'MDL-40561-master' of git://github.com/FMCorz/moodle 2013-07-08 22:28:21 +08:00
Adam Olley
dd8ba80005 MDL-40195: mod_assign: Display grades when quickgrading to 2 decimal places 2013-07-08 20:04:59 +09:30
David Monllao
bda1dea4de MDL-40562 behat: Catch NoSuchElement exception 2013-07-08 12:05:45 +02:00
Frederic Massart
dc95bdd8d9 MDL-40561 phpunit: Return the right guessed class 2013-07-08 17:58:38 +08:00
Damyon Wiese
64830bf658 Merge branch 'MDL-38314-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2013-07-08 15:10:58 +08:00
Frederic Massart
0d8eac408b MDL-40555 cache: Static store is searchable 2013-07-08 15:09:04 +08:00
Matt Debus
cde6172df8 MDL-40524: mod_wiki: Display comments in order 2013-07-08 16:27:31 +09:30
Damyon Wiese
3536560eff Merge branch 'w28_MDL-40415_m26_opcache' of https://github.com/skodak/moodle 2013-07-08 13:40:09 +08:00
Petr Škoda
83f45bfd56 MDL-40450 update links to TinyMCE 3.x docs 2013-07-07 16:11:19 +02:00
Petr Škoda
d03e450857 MDL-40243 use suspended flag in auth_enrol instead of nologin auth 2013-07-07 14:40:46 +02:00
Petr Škoda
c118e4c112 MDL-40537 mark new major upgrade version 
This is required for cache invalidation of classloader class map.
 2013-07-07 14:34:31 +02:00
Matteo Scaramuccia
78030f9db1 MDL-39832 Files: Fixed ETag format according with RFC2616. 
ETag must be double quoted,
http://tools.ietf.org/html/rfc2616#section-3.11:

      entity-tag = [ weak ] opaque-tag
      weak       = "W/"
      opaque-tag = quoted-string
 2013-07-07 09:02:17 +02:00
Matteo Scaramuccia
264631cdc8 MDL-39832 Files: Revert MDL-39688 commit, f111746140 
MDL-39688 has been successful in providing a solution for the issue but further
investigations done in MDL-39832 have got the evidence that the given solution
is more likely a workaround.
 2013-07-07 09:02:15 +02:00
Mary Evans
5cb2f1ad9a MDL-40455: theme_formfactor: Move slash comments to be before code (not after) add missing layouts in formfactor/config,php 2013-07-06 18:53:44 +01:00
Petr Škoda
a36d42a5ae MDL-40488 improve $CFG->admin docs 2013-07-06 11:47:15 +02:00
Tim Hunt
70f4ac5aea MDL-40527 enrol meta: respect $CFG->courselistshortnames 
Thanks to James Henestofel for working this out in MDL-37558. That issue
got complex, so I am just submitting this simple part of it for
integration.
 2013-07-05 15:30:17 +01:00
Frederic Massart
ce58136547 MDL-40466 libraries: Not deprecating get_sorted_contexts() 2013-07-05 16:15:24 +08:00