1539 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
76d86181a3 Merge branch 'wip-mdl-38494' of git://github.com/rajeshtaneja/moodle 2013-04-03 23:45:40 +02:00
Eloy Lafuente (stronk7)
c9f8620492 Merge branch 'MDL-26956' of git://github.com/timhunt/moodle 2013-04-03 13:20:23 +02:00
Tim Hunt
d2e32121b0 MDL-26956 user selector: fix regressions sam caused. 2013-04-03 11:44:23 +01:00
Eloy Lafuente (stronk7)
a2f667472e Merge branch 'm25_MDL-38790_Missing_setType_in_My_private_files_form' of https://github.com/scara/moodle 2013-04-02 21:06:21 +02:00
Dan Poltawski
15c2b2c43a Merge branch 'MDL-26956' of git://github.com/timhunt/moodle 2013-04-02 19:49:02 +08:00
Yuliya Bozhko
278065528a MDL-35073 badges: Open badges integration
The badges feature allows to integrate Mozilla "Open Badges" to issue, assign,
manage and display digital badges in Moodle. This feature supports:
-- badge creation and issuing based on criteria
-- badge baking and verification service
-- direct pushing of internal badges to external backpack
-- interanl and external badge display in Moodle
-- Moodle block to display latest badges
2013-04-02 15:49:02 +08:00
Matteo Scaramuccia
0f7d527816 MDL-38790 Repositories: missing call to setType in 'My private files' form 2013-03-28 22:12:53 +01:00
sam marshall
b2ec866fc7 MDL-26956 (1) Library: Move search SQL function to datalib
This function used to be in the user selector, but it is useful in
other areas where we want to search for users as it handles a number
of search options (including extra fields, etc.) and returns SQL
which can be included in a joined query.

A unit test has been added to check the results of these searches.
2013-03-28 10:45:12 +00:00
Damyon Wiese
5df15f2524 MDL-38717 Admin: Change setType for email to PARAM_EMAIL 2013-03-27 12:11:06 +08:00
Damyon Wiese
1b393ce91d Merge branch 'MDL-38717-master' of git://github.com/danpoltawski/moodle 2013-03-27 11:57:14 +08:00
Dan Poltawski
f6343982e1 MDL-38717 admin: missing setType on email 2013-03-27 10:14:35 +08:00
Eloy Lafuente (stronk7)
4efcfaa3ae Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2013-03-26 23:04:48 +01:00
Damyon Wiese
95764ab7ef Merge branch 'MDL-35875-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/upgrade.txt
2013-03-26 14:49:34 +08:00
Damyon Wiese
0c241b980a Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle
Conflicts:
	lib/upgrade.txt
2013-03-26 14:22:11 +08:00
Chris Wharton
7605dba31b MDl-38494 user: Fix uploaded datetime profile fields 2013-03-25 15:48:04 +08:00
Marina Glancy
4e0b6025ad MDL-38147 deprecated make_categories_list(), change usage to coursecat 2013-03-25 13:20:46 +11:00
Petr Škoda
77a5c09354 MDL-37742 simplify dirty one-space oracle hack 2013-03-24 13:43:18 +01:00
Petr Škoda
689096bc26 MDL-38654 do not test $CFG->gdversion
GD PHP extension is now required. Add-ons need to remove $CFG->gdversion tests. The worst case regression is that add-on will think GD is not available.
2013-03-22 16:57:55 +01:00
Damyon Wiese
c2eb74df47 Merge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle
Conflicts:
	lib/db/caches.php
	version.php
2013-03-20 14:08:55 +08:00
Eloy Lafuente (stronk7)
bab8a6724f Merge branch 'MDL-33680-m' of git://github.com/andrewnicols/moodle 2013-03-19 18:27:57 +01:00
Andrew Robert Nicols
c2f47c19ad MDL-33680 JavaScript: Improve error handling on user selector
Since the previous commit to this issue removes the built-in debugging
tests, I've added these back using the M.core libraries.
2013-03-16 10:52:02 +00:00
Andrew Robert Nicols
28037331fb MDL-33680 JavaScript: Use the correct Content-Type for AJAX scripts
The repository_ajax.php script was returning a text/plain Content-Type and
user/selector/search.php was setting the content-type when this should be
handled by with the definition of AJAX_SCRIPT.
2013-03-16 10:52:02 +00:00
Jason Fowler
6e5d002e57 MDL-35875 - User - Modify the profile page to use semantic HTML rather than tables for layout 2013-03-15 17:09:37 +08:00
Aparup Banerjee
87d7c7b578 Revert "Merge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle"
This reverts commit 02dcf9b501d613c077fa51f5f0a35a477ef81c48, reversing
changes made to 61cd50618a5ff227f5a52006f94c5b2310a73abf.
2013-03-14 11:17:23 +08:00
Rajesh Taneja
9a51c3d95c MDL-36395: Converted hard-coded MAX_USER_PER_PAGE to config setting
course, cohort, enrol, role, groups and forum used to use hard-coded
MAX_USERS_PER_PAGE=100 for rendering user list. This has been converted
to $CFG->maxusersperpage.
2013-03-12 17:14:53 +08:00
Aparup Banerjee
02dcf9b501 Merge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle 2013-03-12 16:53:45 +08:00
David Mudrák
ad3ed98b05 MDL-34401 Replace ad-hoc plugin request caches with proper application caches
Data cached in these caches change only at well defined places (during
need for upgrade checks, at the plugin management screen etc). So it
makes sense to use proper application caches instead of request caches.

This saves couple of database queries at almost every page in Moodle.
2013-03-11 12:48:53 +01:00
Jason Fowler
ae18db7025 MDL-35816 - User - Modify the profile page to use semantic HTML rather than tables for layout 2013-03-07 11:00:16 +08:00
Eloy Lafuente (stronk7)
62bf37d8f5 Merge branch 'master_MDL-37907' of git://github.com/danmarsden/moodle 2013-03-05 00:46:12 +01:00
Dan Marsden
c238e1e2ab MDL-37907 Participants layout - move checkbox to first column 2013-03-04 11:28:14 +13:00
Frederic Massart
3ecc63e9db MDL-37481 user: fixed bug when logged in as guest 2013-03-04 11:17:14 +13:00
Damyon Wiese
4e516138e9 Revert "MDL-35875 - Users - Fixing RTL support"
This reverts commit fbb31b0f905c8859cc4f559f4f8148769367ece6.
This reverts commit c111b9f3aeea98542213ff530f59291fd45d1245.
This reverts commit 8afb9b7c4f2bfbb336b3e3af580cb14d32b0e917.

This issue has failed testing and integration will be delayed.
2013-02-28 10:53:03 +08:00
Damyon Wiese
44c3f54c92 Merge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle 2013-02-25 14:09:33 +08:00
Jason Fowler
8afb9b7c4f MDL-35816 - User - Modify the profile page to use semantic HTML rather than tables for layout 2013-02-22 13:59:49 +08:00
Jason Fowler
34348b2b43 MDL-30072 - Notes, Webservices - adding Webservices for notes 2013-02-22 13:58:11 +08:00
Damyon Wiese
503c14a612 MDL-29938 Remove tabs (Grrr!) 2013-02-19 10:47:04 +08:00
Damyon Wiese
ebb1385c39 Merge branch 'MDL-29938-master' of git://github.com/mouneyrac/moodle 2013-02-19 10:10:48 +08:00
Jerome Mouneyrac
85e6bf8e71 MDL-29938 throw exception when a criteria is repeated, used self instead classname when possible, return only not deleted users 2013-02-15 11:03:13 +08:00
Jerome Mouneyrac
0c34e8034d MDL-29938 ignore invalid keys 2013-02-11 13:58:00 +08:00
Jerome Mouneyrac
bb1105ae31 MDL-29938 Fix typo bypassing some code + remove misplaced code in deprecated function + some code cleaning 2013-02-11 13:57:59 +08:00
Jerome Mouneyrac
ec80bc6bf8 MDL-29938 don't validate return user info against PARAM_USERNAME as PARAM_USERNAME only apply to manual authentication (and web service) 2013-02-11 13:57:59 +08:00
Jerome Mouneyrac
b0365ea5d1 MDL-29938 get_users - search users external function 2013-02-11 13:57:59 +08:00
Damyon Wiese
40f1c065b4 Merge branch 'MDL-30637-master' of git://github.com/lucisgit/moodle 2013-02-11 10:37:03 +08:00
Ruslan Kabalin
ac5e6ca4d1 MDL-30637 Refactor Advanced fileds functionality
The displaying of advanced items has been refactored. The changes are:

* The Advanced button is replaced by the Show Less/More link
* The Show less/more link controls advanced elements only within the section
  it is located at
* The Show less/more state of sections is preserved between form submissions
* When javascript is off, all advanced elements will be displayed by default,
  no show/hide controls will exists on the page
2013-02-07 14:38:37 +00:00
Paul Nicholls
606554d5b0 MDL-32652 - Make block drag-drop work throughout Moodle
The central "content" region on My Home / user profile pages also needs to
be initialised in lib/ajax/blocks.php in order to allow blocks to be
dropped into that region successfully.  Some tweaks were also necessary in
order to correct the "content" region's structure in order for drag-drop
to function on this region on these pages.

Non-standard block regions (including the central "content" region
used by My Home and user profile pages) were causing the temporary empty
block region used as a drop target to sometimes appear in the wrong place.

The call to init_requirements_data (which includes the block drag-drop JS)
happens at a late enough stage in page generation that we can simply
pass the context ID through to the JS, so that it can be sent as part of
the AJAX request.  This prevents lib/ajax/blocks.php from having to try
to guess the context from the other bits of information it receives, so
block drag-drop should now work everywhere without issues.
2013-01-29 14:57:28 +13:00
Aparup Banerjee
072844a158 Merge branch 'wip-mdl-37339' of git://github.com/rajeshtaneja/moodle 2013-01-22 16:28:31 +08:00
Rajesh Taneja
68e12697a3 MDL-35780 Administration: current user email should be always displayed on participants page 2013-01-17 11:56:47 +08:00
Rajesh Taneja
3ac4ad0050 MDL-37339 Administration: Unique custom profile should not be checked if it's empty.
Currently we have two options for custom profile fields 'Unique' and 'Required'
If value s not entered for unique and not required field then we should allow
duplicate empty values. If value is entered then we should check for unique input.
In case field is unique and required then it should be always checked as required
field can't be empty.
2013-01-16 09:44:32 +08:00
Eloy Lafuente (stronk7)
493d8f781c Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle
Conflicts:
	message/tests/externallib_test.php
2013-01-15 21:50:31 +01:00
Dan Poltawski
2773aa41de Merge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle 2013-01-15 16:04:57 +08:00