Commits · 7c1444661d6afb7195cc43f316db956ea5409576 · mahara / mahara

09 Sep, 2012 1 commit

Mark file/folder name as a required field (bug#1036990) · 7c144466

Son Nguyen authored Sep 10, 2012



When click edit button of a file/folder in user/group/institution file
area, the field Name should be marked as Red and followed by '*'

Change-Id: If2db0f22ace27aa18317a8391ae9f023de69deb1
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

7c144466

06 Sep, 2012 11 commits
- Merge "Reorder auth plugins so browserid comes first" · 1b2fd4f2
  Son Nguyen authored Sep 07, 2012
  
  1b2fd4f2
- Merge changes Id8e34cda,I34a72348,I090d6f66,Iaa7aa713 · 9f75f9d8
  Melissa Draper authored Sep 06, 2012
```
* changes:
  Fix instiutution selector on statistics page
  Responsive Design: hide html editing for mobile device,
  Fix the profile block height
  Fix a few theme issues
```
  9f75f9d8
- Merge "Fix a few PHP warning, Bug #1034172" · ba2809eb
  Melissa Draper authored Sep 06, 2012
  
  ba2809eb
- Merge "Reword administration menu title (bug #1037450)" · 5293a56b
  Hugh Davenport authored Sep 06, 2012
  
  5293a56b
- Merge "Fix institution menu (Bug #1045234)" · a52d3be3
  Hugh Davenport authored Sep 06, 2012
  
  a52d3be3
- Reword administration menu title (bug #1037450) · f27757ba
  Hugh Davenport authored Sep 04, 2012
```
Now both site administrators and institution administrators have the
same title for the menu, just "Administration".

Change-Id: I9f421e9881386e5fb0c1da93bc71751853ac30b2
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
```
  f27757ba
- Fix institution menu (Bug #1045234) · 6bd2b12a
  Hugh Davenport authored Sep 04, 2012
```
When an institution admin is viewing the admin menu
and is also a site staff, they can't see the site
statistics

Change-Id: If447e5384da0e067702efbe936ffa909a636e21b
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
```
  6bd2b12a
- Merge "Use institution display name (Bug #941551)" · 52c77a4c
  Hugh Davenport authored Sep 06, 2012
  
  52c77a4c
- Merge "Blog post with only images or allowed embed codes cannot be submitted (Bug #1023630)" · 5bc74f5c
  Hugh Davenport authored Sep 06, 2012
  
  5bc74f5c
- Merge "Use mb_ funcs on new usernames with diacritics. (Bug #1026618)" · efb567e3
  Hugh Davenport authored Sep 06, 2012
  
  efb567e3
- Merge "Rename BrowserID to Persona (bug #1030033)" · dbcb498f
  Melissa Draper authored Sep 06, 2012
  
  dbcb498f
05 Sep, 2012 2 commits
- Merge "Better i18n for group editability date window strings (Bug #1017354)." · 98a64040
  Melissa Draper authored Sep 05, 2012
  
  98a64040
- Better i18n for group editability date window strings (Bug #1017354). · d240a2f0
  Jiri Baum authored Sep 04, 2012
```
* A stray "and" that wasn't translated, plus pass parameters rather than concatenating.
* Additional to bug #1017354.

Change-Id: Ibe19359bc0b7bb6f6a753f86191d66f0610dc69e
Signed-off-by: Jiri Baum <jiri@catalyst-au.net>
```
  d240a2f0
04 Sep, 2012 4 commits

Merge "Use the correct date format for group edit window." · 62264c6c
Melissa Draper authored Sep 04, 2012

62264c6c

Use the correct date format for group edit window. · d22c8b33

Jiri Baum authored Sep 04, 2012



* Fixes Bug #1041638.

Change-Id: I7a272ce47177257505904a5cfa96acefc0b95a49
Signed-off-by: Jiri Baum <jiri@catalyst-au.net>

d22c8b33

Fix instiutution selector on statistics page · c39ca0e8

Evonne Cheung authored Sep 04, 2012



Bug #1041645

Change-Id: Id8e34cdac456ff506d0b9fe077113641af0345ee
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

c39ca0e8

Blog post with only images or allowed embed codes cannot be submitted · 49b37dfa

Son Nguyen authored Sep 04, 2012


(Bug #1023630)

When striping HTML tags from WYSIWYG editor for checking required rules,
allow <img>,<iframe>,<object>,<embed> tags

Change-Id: I12d63d153bee4ef6169a3a6c7252d2491e505056
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

49b37dfa

03 Sep, 2012 19 commits

Responsive Design: hide html editing for mobile device, · cd0fc598

Liuba Kazakov authored Sep 04, 2012



as it doesn't work for some devices

Change-Id: I34a72348b7d9c23a5840754a41022e806349c543
Signed-off-by: Liuba Kazakov <liuba@catalyst-au.net>

cd0fc598

Fix the profile block height · 4d3b4aa2

Evonne Cheung authored Sep 04, 2012

Make sure the background stretches past the floating avatar height

Bug #1041645

Change-Id: I090d6f662d5f3322ad000a97ba82b6063eaf7453

4d3b4aa2

Fix a few theme issues · b05aed4b

Evonne Cheung authored Sep 03, 2012



Misaligned buttons in the blog in IE
Footer needs an extra div wrap in microfooter
Group listings that couldn't be seen

Bug #1041645

Change-Id: Iaa7aa713ecabc121e33caa4326b655e56bd21e17
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

b05aed4b

Reorder auth plugins so browserid comes first · f12809d8

Hugh Davenport authored Sep 03, 2012



Fixes a theming overlap issue

Change-Id: Idd75c4a230f3976c62a4442a030ea16b99581712
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

f12809d8

Rename BrowserID to Persona (bug #1030033) · da37bcd8

Son Nguyen authored Aug 28, 2012



- Rename BrowserID to Persona
- Replace the login via 'BrowserID' button with standard graphical
Persona button.
- Add Persona logo
- Update css style of all availlable themes: raw, aqua, default, primary
school, fresh, sunset, and ultima.
- Change Persona button background for aqua theme

Change-Id: Icf7932dbf3e1dd32660280ab8e269d4b837b3536
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

da37bcd8

Merge changes... · 3f5f517e

Hugh Davenport authored Sep 04, 2012

Merge changes I0deed72e,I74e6de26,Ibea53451,I3d7b5040,I9206f63a,Ie51b967b,I8a666c9c,I27a2cc89,Ibd937026,Icdbd6050,I2783e73e

* changes:
  Responsive Design - hide 'Print' and disable 'Export' functionality
  interaction/forum: Theme update
  Theme update for blocktypes
  artefact/comment: Theme update
  artefact/resume: Theme update
  artefact/plans: Theme update
  artefact/internal: Theme update
  artefact/file: Theme update
  artefact/blog: Theme update
  theme/ultima: Theme update
  theme/sunset: Theme update

3f5f517e

Responsive Design - hide 'Print' and disable 'Export' functionality · f8c7d135

Liuba Kazakov authored Aug 28, 2012



when handheld device is detected

Bug #1041645

Change-Id: I0deed72eb5c695c717d455a231c851f7d0158c4b
Signed-off-by: Liuba Kazakov <liuba@catalyst-au.net>

f8c7d135

interaction/forum: Theme update · 8dc79e19

Evonne Cheung authored Aug 23, 2012



Responsive theme

Bug #1041645

Change-Id: I74e6de26ddbbdb12271f061d35aa652cb7dee967
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

8dc79e19

Theme update for blocktypes · bd0eed54

Evonne Cheung authored Aug 23, 2012



Responsive theme

Bug #1041645

Change-Id: Ibea534518615610773776a301f1b19259e0d0969
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

bd0eed54

artefact/comment: Theme update · a0937634

=Evonne Cheung authored Aug 29, 2012



Responsive theme

Bug #1041645

Change-Id: I3d7b50404c056fef9403cdadf200649049aee92a
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

a0937634

artefact/resume: Theme update · 0ff1bd45

Evonne Cheung authored Aug 23, 2012



Responsive theme

Bug #1041645

Change-Id: I9206f63a5a920c73f46ce3e23419d0c9685d7f8c
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

0ff1bd45

artefact/plans: Theme update · 0e7c5280

Evonne Cheung authored Aug 23, 2012



Responsive theme

Bug #1041645

Change-Id: Ie51b967ba6720d76be82ac682efff82a609d6f0a
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

0e7c5280

artefact/internal: Theme update · 71a7bf59

Evonne Cheung authored Aug 23, 2012



Responsive theme

Bug #1041645

Change-Id: I8a666c9ccedfe0d97a2277e0508f9663599d171a
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

71a7bf59

artefact/file: Theme update · e7f92d66

Evonne Cheung authored Aug 23, 2012



Responsive theme

Bug #1041645

Change-Id: I27a2cc89329fb1c2cd78a3dd53de47fa0d9adecd
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

e7f92d66

artefact/blog: Theme update · 22ae93e1

Evonne Cheung authored Aug 23, 2012



Responsive theme

Bug #1041645

Change-Id: Ibd937026417063df63e9fdfbf5063bbe44d5a5f6
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

22ae93e1

theme/ultima: Theme update · 6358abad

Evonne Cheung authored Aug 23, 2012



Responsive theme

Bug #1041645

Change-Id: Icdbd605006ddb25c705cd582675af0490a556272
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

6358abad

theme/sunset: Theme update · 346eec00

Evonne Cheung authored Aug 23, 2012



Responsive theme

Bug #1041645

Change-Id: I2783e73e668eae0ce0178771a3c34a7c52169755
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

346eec00

Merge "theme/primaryschool: Theme update" · a3c359b3
Hugh Davenport authored Sep 04, 2012

a3c359b3

theme/primaryschool: Theme update · fcf6279c

Evonne Cheung authored Aug 23, 2012



Responsive theme

Bug #1041645

Change-Id: I07c157abf0ca0e4a61c28c5df08eb53b0ecd0b5b
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

fcf6279c

02 Sep, 2012 3 commits
- Merge "Correct capitalization of "coll." & "inst." (Bug 892959)" · 63015d8d
  Hugh Davenport authored Sep 03, 2012
  
  63015d8d
- Merge "Fixed misspelling of administrators per bug #1017903" · cd9b164a
  Hugh Davenport authored Sep 03, 2012
  
  cd9b164a
- Merge "Correct 2 minor lang strings (Bug #1044822)" · bb9c9735
  Son Nguyen authored Sep 03, 2012
  
  bb9c9735