mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-01 06:22:39 +01:00
Code Issues Projects Releases Wiki Activity
60,792 Commits 36 Branches 523 Tags
Commit Graph

15710 Commits

Author SHA1 Message Date
Sam Hemelryk
7376692527 Merge branch 'MDL-39281-master' of git://github.com/danpoltawski/moodle 2013-04-23 10:17:03 +12:00
Dan Poltawski
596791eb69 MDL-39281 portfolio: missing setType call 2013-04-22 17:01:37 +01:00
Dan Poltawski
789ce8202b Merge branch 'MDL-39148-uninstall' of git://github.com/mudrd8mz/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 14:33:28 +01:00
Dan Poltawski
816659ed9e Merge branch 'MDL-39249-upgrade-wizard' of git://github.com/mudrd8mz/moodle 2013-04-22 13:12:48 +01:00
Dan Poltawski
e39ef3d124 Merge branch 'wip-MDL-37942-master' of git://github.com/jason-platts/moodle 2013-04-22 12:42:10 +01:00
Dan Poltawski
4bb3f29e02 Merge branch 'w16_MDL-39141_m25_toolbar' of git://github.com/skodak/moodle 2013-04-22 12:38:47 +01:00
Damyon Wiese
946f2b0826 MDL-36959 file_storage: Preserve each file in a hash collision 2013-04-22 12:07:43 +08:00
Damyon Wiese
e9cd87eef2 Merge branch 'w16_MDL-36959_m25_poolhashes' of git://github.com/skodak/moodle 2013-04-22 11:38:07 +08:00
Sam Hemelryk
9c2cbcdc04 Merge branch 'MDL-39220' of git://github.com/colchambers/moodle 2013-04-22 11:37:34 +12:00
Petr Škoda
fd4592bbbc MDL-36959 test reworked adding of files to sha1 content pool 2013-04-20 21:59:08 +02:00
Petr Škoda
d91e2c15db MDL-36959 rework adding of content files to the file pool 
This patch includes refreshing of borked files in file pool and basic prevention of race conditions. It also helps with diagnosing of file pool permission problems, detects coding errors and some other type of problems including sha1 collision jackpot.
 2013-04-20 21:41:41 +02:00
David Mudrák
7b1e0645c1 MDL-39249 Fix typo in available_update_deployer class 
I have accidentally spotted this typo while working on this branch. It
has never caused any harm as both parameters callerurl and returnurl are
always passed. Blame copy/pasting of code blocks.
 2013-04-20 03:01:36 +02:00
David Mudrák
5d7a4bab3f MDL-39249 Return to the correct page after successful update deployment 
The method available_update_deployer::make_execution_widget() used to
have hard-coded return URL. Now it accepts the return URL as the second
parameter and passes it to the mdeploy.php utility.

The callerurl parameter is now correctly passed and used.
 2013-04-20 03:00:19 +02:00
Dan Poltawski
00a850b33e Merge branch 'wip-MDL-38565-m25' of git://github.com/samhemelryk/moodle 2013-04-19 13:29:07 +01:00
David Mudrák
badf464792 MDL-39148 Non-installed plugins cannot be uninstalled 
If the plugin has been only deployed to the disk without installing into
the database, do not allow going through the uninstallation procedure.
Not only it does not have much sense. But it can also lead to some
tricky situation due to dependencies. Better to block it and wait till
the plugin is either fully installed or removed from the disk.
 2013-04-19 11:24:43 +02:00
Damyon Wiese
747230d564 Merge branch 'wip-MDL-39211-m25' of git://github.com/marinaglancy/moodle 2013-04-19 13:53:14 +08:00
Sam Hemelryk
476554bbca Merge branch 'MDL-38777-m' of git://github.com/andrewnicols/moodle 2013-04-19 15:20:44 +12:00
Sam Hemelryk
5cba0c4ba3 MDL-38565 cache: tidy up pre-integration 2013-04-19 10:13:36 +12:00
Sam Hemelryk
fbf76dcd17 MDL-38565 cache: upgrade code to amend default stores 2013-04-19 10:12:59 +12:00
Sam Hemelryk
059102e728 MDL-38565 cache: cron routine to clean up old session data 2013-04-19 10:11:48 +12:00
Petr Škoda
9a1c818d28 MDL-39141 fix customtoolbar notices during upgrade 2013-04-18 20:22:01 +02:00
Colin Chambers
919834f2eb MDL-39220 Javascript: Editor shrinks using collapse button 2013-04-18 15:46:07 +01:00
Damyon Wiese
1d0c0c4a23 MDL-38592: Add major version redirect for settings used frontpage. 2013-04-18 16:42:33 +08:00
Dan Poltawski
5ca1899e6e Merge branch 'MDL-39203-master' of git://github.com/FMCorz/moodle 2013-04-18 08:50:29 +01:00
Frederic Massart
926a3512a5 MDL-39203 repository: Fixed authentication errors with Dropbox 2013-04-18 14:47:22 +08:00
Marina Glancy
473d5f74c7 MDL-39211 forgotten include of /course/lib.php 2013-04-18 13:47:04 +10:00
Andrew Nicols
c0123ff2c3 MDL-38777 JavaScript: Remove YUI cache persistence 
The cache does not need to be persistent within the same request and this
just holds memory open for no good reason.
 2013-04-17 22:45:23 +01:00
Dan Poltawski
73f5a0d864 MDL-39021 pluginlib: theme_simple is a core plugin 
Don't list as an add-on.
 2013-04-17 12:27:24 +01:00
Dan Poltawski
c6101ef441 Merge branch 'MDL-39087-plugins-uninstall' of git://github.com/mudrd8mz/moodle 2013-04-17 12:09:20 +01:00
Eloy Lafuente (stronk7)
9b81eef05d Merge branch 'w15_MDL-39052_m25_csvtemp' of git://github.com/skodak/moodle 2013-04-17 02:43:49 +02:00
Eloy Lafuente (stronk7)
a821c10b86 Merge branch 'w15_MDL-39069_m25_helpwindow' of git://github.com/skodak/moodle 2013-04-17 01:55:45 +02:00
Eloy Lafuente (stronk7)
9004d7a51c Merge branch 'wip-MDL-39145-m25' of git://github.com/marinaglancy/moodle 2013-04-17 01:27:39 +02:00
Eloy Lafuente (stronk7)
359c1d4756 Merge branch 'w15_MDL-39075_m25_userdesc' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-04-17 01:04:09 +02:00
Dan Poltawski
b90bd21c5f Merge branch 'MDL-27814-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	lib/deprecatedlib.php
 2013-04-16 14:47:14 +01:00
Petr Škoda
e88419a2fd MDL-39069 open new window for help when JS disabled 2013-04-16 14:12:31 +02:00
Dan Poltawski
7e43a15ffe MDL-39063 badges: fix whitespace errors 2013-04-16 12:11:30 +01:00
Dan Poltawski
19226a309f Merge branch 'MDL-39063' of github.com:totara/openbadges 
Conflicts:
	admin/settings/badges.php
	lib/db/upgrade.php
	version.php
 2013-04-16 12:00:46 +01:00
Damyon Wiese
5073388e74 Merge branch 'wip-MDL-38592-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-04-16 16:03:33 +08:00
Damyon Wiese
6a508eaccf Merge branch 'w15_MDL-34674_m25_spell' of git://github.com/skodak/moodle 2013-04-16 15:56:10 +08:00
Petr Škoda
667447d129 MDL-39052 create temp files only in Moodle temp folder 2013-04-16 09:38:28 +02:00
Petr Škoda
ca117d1e5b MDL-34674 add CTRL+right click hint to tinymce context menus 2013-04-16 08:37:21 +02:00
Damyon Wiese
e0cded5d44 Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle 2013-04-16 14:32:53 +08:00
Marina Glancy
0fd2635038 MDL-38592 Settings for courses lists on front page are made more user friendly 
- 'List of courses' is split into 'List of courses' (available) and 'Enrolled courses', CFG->disablemycourses is deprecated;
- CFG->frontpageloggedin by default shows list of available courses;
- There is separate item to display course search box
- CFG->maxcoursesincombo is deprecated
- CFG->maxcategorydepth changed default value to 2 since we have AJAX loading now
- FRONTPAGECOURSELIMIT is transformed to CFG->frontpagecourselimit

c
 2013-04-16 15:00:55 +10:00
Marina Glancy
b1c2fc65e4 MDL-39145 add text in upgrade.txt about functions deprecated in MDL-37085 2013-04-16 11:50:19 +10:00
Sam Hemelryk
2fb77a96b3 MDL-39127 navigation: fixed loading of categories for navbar 2013-04-16 11:02:06 +12:00
Yuliya Bozhko
e280531436 MDL-39063 badges: Improve external backpack usability and workflow 2013-04-16 10:47:40 +12:00
Dan Poltawski
e5e5097081 NOBUG - reduce whitespace errors a little 2013-04-15 13:29:14 +01:00
Dan Poltawski
34ddaf7146 Merge branch 'MDL-39047_master' of https://github.com/markn86/moodle 2013-04-15 12:15:24 +01:00
Mark Nelson
12cb45f199 MDL-39047 forms: set the z-index of the calendar pop-up so that it renders above the filemanager 2013-04-15 17:37:41 +08:00
Dan Poltawski
3d7414b399 MDL-38309 fix whitespace issues 2013-04-15 10:26:53 +01:00