Dan Poltawski
b1a7fcf2b3
Merge branch 'wip-MDL-36413-MOODLE_23_STABLE' of https://github.com/nicolasconnault/moodle into MOODLE_23_STABLE
2012-11-14 09:18:33 +08:00
Nicolas Connault
3522c1dca4
MDL-36413 Added "this->" to exclude variable assignment
...
The this-> keyword was missing from the $exclude = array() statement.
2012-11-07 14:52:09 +08:00
Sam Hemelryk
e3ac126161
MDL-36379 user_view: fixed issue with page layout when editing was on
2012-11-06 14:01:30 +13:00
Dan Poltawski
59d01f93cd
Merge branch 'wip-mdl-35489-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
2012-10-30 12:11:52 +08:00
Rajesh Taneja
4e15f69cb1
MDL-35489 users: Check added before using form data
2012-10-18 17:23:41 +08:00
Ankit Agarwal
16ab3642e7
MDL-35880 user: Adding a heading to profile edit page
2012-10-16 14:18:44 +08:00
Tim Hunt
ea29e3141a
MDL-35776 user ajax: fix sort order in chrome.
...
It seems that Chrome orders fields of objects in order of array key.
Therefore we must stop using user.id in the PHP arrays, and instead
ensure that we use sequential numbers.
This commit fixes the user selector.
Conflicts:
user/selector/module.js
user/selector/search.php
2012-10-03 19:14:41 +01:00
Dan Poltawski
373d3178e4
Merge branch 'MDL-35680_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-10-02 09:52:35 +08:00
Jerome Mouneyrac
b843f7aee2
MDL-34971 PHPunit test: user/externallib.php
2012-10-01 12:56:41 +02:00
Tim Hunt
28c9348405
MDL-35680 user selector: more usable when queries are slow.
...
The problem is to do when you pause a bit, so a search starts, and then
type a bit more before the search finishes. It was behaving like this:
1. Type a bit, then pause.
2. First search request sent.
3. Type a bit more, then pause.
4. Second search request sent.
5. First search request completes.
6. You try to select one result.
7. Second search request comples, overwriting what you are selecting.
This fix works by cancelling the first request before sending the
second.
2012-09-27 19:10:41 +01:00
Jerome Mouneyrac
3f676aa5bd
MDL-35644 user_get_details: admin should be able to see description
2012-09-26 14:29:21 +08:00
Ankit Agarwal
800abd6faf
MDL-33374 profile: Use correct text for buttons when creating a new user
2012-09-07 10:19:34 +08:00
Eloy Lafuente (stronk7)
31ae0e5984
Merge branch 'wip-mdl-34606-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
2012-09-04 02:09:25 +02:00
Sam Hemelryk
b739e2d71a
MDL-26822 user: Minor improvements post integration
2012-09-03 11:41:24 +12:00
Sam Hemelryk
bcbfd02574
Merge branch 'MDL-26882-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
2012-09-03 11:26:07 +12:00
Ankit Agarwal
4d7a664ee7
MDL-26882 profile: Applying cap check (site:viewuseridentity) to email field in user profile
2012-08-30 15:36:26 +08:00
Ankit Agarwal
74c0b55029
MDL-26882 profile: Apllying the cap check site:viewuseridentity to user profile
2012-08-30 15:36:20 +08:00
Aparup Banerjee
fd3e329d94
Merge branch 'MDL-31959_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-08-29 15:33:43 +08:00
Rajesh Taneja
acff486664
MDl-34606 Administration: id for clear button is set properly, and disabled on page load
2012-08-27 15:15:29 +08:00
Juho Viitasalo
1923720566
Changed two notification to output correctly
2012-08-21 15:36:34 +08:00
Petr Škoda
e3a5ed9dd7
MDL-34776 improve multiple "NOT IN" enrolment and role related queries
2012-08-18 09:57:02 +02:00
Rossiani Wijaya
25f8e4f241
MDL-34575: fixed string typo and string duplication for label
2012-08-08 11:37:40 +08:00
Rossiani Wijaya
1445fd1337
MDL-34575 accessibility compliance for notes: Add form input text and select tag
2012-08-03 13:36:27 +08:00
Jerome Mouneyrac
1b158ee8c9
MDL-33869 user_get_user_details: add support for 'Show user identity' fields set by administrator
2012-07-31 10:26:22 +08:00
Crafton Williams
2a3a22a46d
MDL-33869 user_get_user_details: allow return of idnumber
2012-07-31 10:25:21 +08:00
Sam Hemelryk
7df86db31d
Merge branch 'wip-mdl-32787-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
2012-07-04 08:26:03 +12:00
Rajesh Taneja
28f23328c5
MDL-32787 user: rule required for custom profile fields applies to all users editing own profile
2012-07-03 13:48:18 +08:00
Frederic Massart
9152878ed3
MDL-30903 Accessibility: user profile page uses table headers
2012-07-03 11:51:19 +08:00
Dan Poltawski
e570ee4b63
Merge branch 'w27_MDL-34036_m23_bulkrole' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-07-03 11:40:14 +08:00
Andrew Davis
6737eda426
MDL-25476 messages: switched some notification emails to come from the support contact instead of admin
2012-07-02 15:41:29 +08:00
Petr Škoda
5df5bcba99
MDL-34036 fix course role user selector
2012-06-30 15:40:30 +02:00
Sam Hemelryk
1e3d84785a
Merge branch 'wip-mdl-33425' of git://github.com/rajeshtaneja/moodle
2012-06-20 11:32:04 +12:00
Dan Poltawski
a80b5a0cf0
MDL-32908 - drop $USER->ajax
...
Its not been respected for some time and is just confusing
2012-06-19 15:07:18 +08:00
Rajesh Taneja
4e782b32f3
MDL-33425 user: Replaced filepicker with filemanager on edit profile page
2012-06-18 10:19:48 +08:00
Eloy Lafuente (stronk7)
c5e783e512
MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700
2012-06-18 02:37:00 +02:00
Sam Hemelryk
ca774c940e
MDL-31520 user-ws: Optimised if statement for email access by moving admin check to the start
2012-06-06 10:35:19 +12:00
Sam Hemelryk
fd200bc5e5
Merge branch 'MDL-31520-master' of git://github.com/fabiomsouto/moodle
2012-06-06 10:33:31 +12:00
Dan Poltawski
2812b87bab
Merge branch 'MDL-32581' of git://github.com/mouneyrac/moodle
2012-06-05 15:23:28 +08:00
Jerome Mouneyrac
93ce0e8296
MDL-32581 support additional format field with all text field in extrnal lib function + new possible ws params to decide how format is returned (which are stored in a singleton)
2012-05-31 12:31:27 +08:00
Frederic Massart
a960dfa900
MDL-33397 Filepicker: cancel button always present in private files
2012-05-29 15:00:19 +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
f5a68663db
MDL-33173 files: correct @package name
2012-05-25 10:03:33 +08:00
Frederic Massart
4c88645920
MDL-33173 Filepicker: renamed private files edit page to main page
2012-05-25 09:24:39 +08:00
Dan Poltawski
3e832fe3e5
Merge branch 'MDL-32981-master' of github.com:FMCorz/moodle
2012-05-22 11:14:12 +08:00
Frederic Massart
c598ea55fe
MDL-32981 Filepicker: my private files uses edit page instead of view
2012-05-22 10:56:11 +08:00
Fábio Souto
90e30b965f
Allow admin to consult user email address
...
Currently the admin user cannot check the user email using this function. This fix allows the admin user to retrieve the email in any situation.
2012-05-21 10:32:21 +01:00
Marina Glancy
559276b153
MDL-32247,MDL-32831,MDL-32900 Use correct url building of file type icons
...
- function get_mimetypes_array() now contains also information about filetype groups and language strings
- use 'smart' human-readable mimetype description
- never determine filetype group based on filetype icon image! remove function mimeinfo_from_icon()
- get rid of class filetype_parser and file lib/filestorage/file_types.mm, replaced with functions file_get_typegroup(), file_extension_in_typegroup() and file_mimetype_in_typegroup()
- support multiple icon sizes, not only 16 and 32
- retrieve filetype icon only using proper functions file_..._icon() from lib/filelib.php throughout the code
- increase size of repository thumbnails to 90 and icons to 24 (will take effect when new icons exist)
2012-05-21 16:01:04 +08:00
Dongsheng Cai
6723372514
MDL-28666 Extends repository to support references
...
1. Allow repository to create references to external contents
2. Extends files API to handle file references
3. Generic file caching
4. Backup/restore file references
5. Download external contents if repository uninstalled
6. Allow filepicker to display iframe
7. PHPUnit test suits
2012-05-21 11:57:51 +08:00
Petr Skoda
65f78adf42
MDL-27575 use new skype call URI
...
As described in official Skype page at http://www.skype.com/intl/en-us/tell-a-friend/get-a-skype-button/
2012-05-19 20:48:48 +02:00
Aparup Banerjee
defd2dcc13
Merge branch 'wip-mdl-32866' of git://github.com/rajeshtaneja/moodle
2012-05-17 16:48:07 +08:00