Commits · 3015027ace3294f15c7fda6fadd16601d8a9bf00 · mahara / mahara

15 Jun, 2015 24 commits

Admin (bootstrap) · 3015027a
Naomi Guyer authored Apr 08, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Iaac575babb46a09eb246ac76b9a406124c800ab8
```
3015027a
Style my friends and find friends (bootstrap) · ecff21a9
Pat Kira authored Mar 31, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I6c0088a8ce6cb27e4c1093246320a1de734eda1d
```
ecff21a9

Pat Kira authored Mar 25, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Add template closing if to fix the broken layout

Change-Id: Ie63d26fc281a7f5d2b23216d5ffe0cdb9472b2b3

c19c19d0

Notifications (bootstrap) · d678d1eb

Naomi Guyer authored Mar 24, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Fix merge regression
Fix padding on expanded inbox
FIX: sidebar panels

Change-Id: Ie7cbcb185c075c3c80ce9270fef6df482dd7f763

d678d1eb

Style resume pages (bootstrap) · c2b85abf

Pat Kira authored Mar 23, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Re-style attachment list

Change-Id: Ib8d7f9c4ada175ad899ca34e3473f0a23b8bb214

c2b85abf

Style journal page (bootstrap) · b51ac01e
Pat Kira authored Mar 18, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Iff9d3aae7465aa8482b0881973badb1e36dd2b2e
```
b51ac01e

Notifications (bootstrap) · 06d3eb82

Naomi Guyer authored Mar 11, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Refactor notifications to use panel styling
BUG: search panel
Notifications
Re-style sendmessage page to use panel classes
Refactor blocktype to use list-group
Adding panels to resume tables

Change-Id: I6da2081e15fb8c2ea933f847958186290596b7c4

06d3eb82

User search (bootstrap) · 6cd4de6a
Naomi Guyer authored Mar 10, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I4703db38c49d2fe9c60fbecce49be91b2d92ea27
```
6cd4de6a
Resume (bootstrap) · a17bbc39
Pat Kira authored Mar 10, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I475760728e91d3fcde406a63284c0934f8366619
```
a17bbc39
Notification styles (bootstrap) · 8ec2d041
Pat Kira authored Mar 10, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I3ec5e98ff17c9889dd095b6692030f75d3a69b18
```
8ec2d041
Cookie consent (bootstrap) · 704788e6
Naomi Guyer authored Mar 10, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I0a77c4ed4bd9bf39fd05421b3dc77799881b2544
```
704788e6
BUG: Fix fieldsets · 5ba34184
Naomi Guyer authored Mar 10, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I3257f5d5aab81fcb6df6497a388fb9224344e78d
```
5ba34184

Notifications (bootstrap) · b9a75deb

Pat Kira authored Feb 24, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Notifications (bootstrap)
Send message styling (work in progress)
Style inbox and outbox (work in progress)
Style inbox and outbox notification (Done)
Add class control-buttons to a tablecell that has 2 or more buttons
Notifications (bootstrap)
Amend inbox & outbox styles
Notificatiosn

Change-Id: I3216395b1b1a100ae38ee7687b255f099b90513d

b9a75deb

Plans and tasks (bootstrap) · cb93a0c4

Pat Kira authored Feb 23, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Style plans and tasks pages
Style resume pages excluding collapsible elements
Style plans and tasks pages

Change-Id: Ied782c101b231d919cf1dcd6b267a70d18d39c70

cb93a0c4

Admin (bootstrap) · cfde5745

Naomi Guyer authored Feb 24, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Admin area
File browser fixes
Style resume pages excluding collapsible elements

Change-Id: Ica76a112b6fcf589f34bcb667ecc1cf426bd7339

cfde5745

Dashboard and fontawesome (bootstrap) · fbd59ac7

Naomi Guyer authored Feb 18, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Dashboard and font awesome
Icon upgrade (bootstrap)

Change-Id: I76485618a595e0c4dc5269922d8f5ac94a30c2ae

fbd59ac7

Profile files, journals, and resumes (bootstrap) · 0d5637a6

Pat Kira authored Feb 09, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Style profile file page
Refinements
Style profile file browser
Style journal page
Edit journal page (work in progrerss)
Tidy up sideblock and blockinstances
Style edit journal view (completed)
Style resume introduction page

Change-Id: I662d8120952c371f7dec57ecf7cd84978c5177d2

0d5637a6

Style notifications pages and profile pages · 29c6d7ae
Pat Kira authored Feb 05, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I8c11611c32f29ca461945332926d8fbe0431daef
```
29c6d7ae

Dashboard (bootstrap) · c55e73aa

Pat Kira authored Jan 23, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Dashboard widgets styling
Style dashboard and user's setting

Change-Id: I2ca8f561117daa7d4e6b1fd6b163a2a6421751c5

c55e73aa

Typography styling (bootstrap) · 3edfb01d
Pat Kira authored Jan 21, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ie02bb3bb178921bc16a6deae3016915f8ca3b51d
```
3edfb01d
Form styling (bootstrap) · 737386ee
Pat Kira authored Jan 14, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ic24bdd78f9207c4f09adce6b20ca55583c1403b8
```
737386ee

Navigation (bootstrap) · 85b78c1f

Naomi Guyer authored Jan 08, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Applied bootstrap tabs and tidy up form styling
Mobile menu
Add bootstrap accessibility, tab styling to bootstrap

Change-Id: Ifa42d482f5fd7e1cdfb52bae1ebb5ff3bf5085a9

85b78c1f

Forms and grid · 506c5805

Pat Kira authored Jan 07, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Styling forms
Bootstrap grid, respsonsive, menus

Change-Id: I3378f05bddf4636a8a02631919c23ca4b9dfb5df

506c5805

Bootstrap set up · 0cc32f9b

Naomi Guyer authored Jan 06, 2015 and

Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Initial bootstrap dependencies
Initial grid
Add brand colours
Bootstrap variables

Change-Id: Ic08f8ab8ad0435c2e92794c4c605cfe8095823dc

0cc32f9b

09 Jun, 2015 2 commits
- editing behat test: Displaying groups on page · 73980105
  Jinelle Foley-Barnes authored Jun 09, 2015
```
(Bug 1426983)

Change-Id: I57d74ae409df367a266e5537fb4b9fc9454542a6
```
  73980105
- Merge "elasticsearch: Add index name to _bulk command path" · 8e87e895
  Robert Lyon authored Jun 09, 2015
  
  8e87e895
08 Jun, 2015 3 commits
- Merge "Use ZipArchive for export and import (Bug #1338381)" · dbdeb077
  Robert Lyon authored Jun 08, 2015
  
  dbdeb077
- Merge "Lazy-load list of textboxes when opening textbox form (Bug 1393734)." · 9a495c2f
  Robert Lyon authored Jun 08, 2015
  
  9a495c2f
- Merge "Behat Testsuite: Tidying features in Artefact (Bug #1446395)" · 2b15469b
  Robert Lyon authored Jun 08, 2015
  
  2b15469b
07 Jun, 2015 1 commit
- Merge "Show warning icon when plugin has nothing to upgrade (Bug 1445280)" · 47ea115a
  Son Nguyen authored Jun 07, 2015
  
  47ea115a
04 Jun, 2015 6 commits
- Merge "Making sure user is logged in before they can see the tinymce" · d2ff5a09
  Son Nguyen authored Jun 05, 2015
  
  d2ff5a09
- Merge "Bug 1460911: forgotpass page not checking the correct $SESSION instance" · 6e80232e
  Son Nguyen authored Jun 05, 2015
  
  6e80232e
- Merge "Bug 1460368: stopping anonymous comments on artefacts" · a1719bbd
  Son Nguyen authored Jun 05, 2015
  
  a1719bbd
- Merge "Adding a couple of new plugins to tinymce init (Bug #1461741)" · 1aef6b75
  Son Nguyen authored Jun 05, 2015
  
  1aef6b75
- Merge "Allowing lang strings in js to be loaded via ajax (Bug #1450995)" · 44d34181
  Son Nguyen authored Jun 05, 2015
  
  44d34181
- Adding a couple of new plugins to tinymce init (Bug #1461741) · d71e3a32
  Robert Lyon authored Jun 04, 2015
```
Change-Id: Ic54abae41ec2d8773d097eb930fb78ef859f2656
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
```
  d71e3a32
03 Jun, 2015 4 commits

Bug 1461040: Stopping layout thumbs being created from langstring info · b913791c

Robert Lyon authored Jun 04, 2015



There is no need to go to tha lang string info as the items already
have the layout info we need.

Currently breaks where lang packs have the strings defined to
something else

Change-Id: I93dfef6975a60b26980fbea7aefa645d30948a32
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

b913791c

Lazy-load list of textboxes when opening textbox form (Bug 1393734). · 0a1e5e0e

Robert Lyon authored May 02, 2015



The query to load other textboxes when displaying textbox config. forms
is very heavy in a large instance of Mahara. This patch postpones the
listing of other textboxes in the textbox config. form, until the link
to display them is clicked.
This enables the textbox config. form to load and display quickly.

TODO: optimise loading speed of list of textboxes. This process is still
as slow as it was before - all this patch does is defer it until it's
actually required!

Change-Id: I92c77e22753882a2b9ed5be3738b8d26b7f5709d
Signed-off-by: Mike Kelly <m.f.kelly@arts.ac.uk>

0a1e5e0e

Allowing lang strings in js to be loaded via ajax (Bug #1450995) · 05a80e6a

Robert Lyon authored May 02, 2015



So that they can be added to the strings object after page load

Change-Id: I4ba00accfad1e0981997488de600d9d53c561602
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

05a80e6a

Merge "Behat Test: Required social media (Bug 1432988)" · 6c2d7992
Robert Lyon authored Jun 03, 2015

6c2d7992