Commits · ac66401583adb1e47cfb765212c2917f41d8ed47 · mahara / mahara

16 Jun, 2015 6 commits

Fixing up behat tests post bootstrap merge (Bug #1465462) · ac664015
Robert Lyon authored Jun 16, 2015 and Aaron Wells committed Jun 16, 2015
```
Change-Id: I33197a9f77d72f3b0f98e9d14e8f8cae1da7c2c6
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
```
ac664015

Removing obsolete top submit button from profile (Bug #1465462) · ab8a80a7

Aaron Wells authored Jun 16, 2015

This top submit button was used before we split the edit profile
page into tabs. The old tab JS used to remove it from the page.
The new Bootstrap JS does not remove it, and this causes problems
for Behat. But since we no longer support non-JS operation, it
makes more sense to remove it.

Change-Id: I38c5e451d018e47dc0704fe61892632431ec0c03

ab8a80a7

Regression: Adding back in the site-logo.svg file (Bug #1416890) · 22f59dbb

Robert Lyon authored Jun 16, 2015



And fixing the phpunit tests relating to this change

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

22f59dbb

Removing all hard-coded references to "$themename/$static" · cc057166
Aaron Wells authored Jun 09, 2015 and Robert Lyon committed Jun 16, 2015
```
Bug 1465107

Change-Id: Ib5e87262d97e420667247d3c931d99f8adde75ee
```
cc057166
Relocate theme files out of static (Bug 1465107) · 7def6da9
Aaron Wells authored Jun 16, 2015 and Robert Lyon committed Jun 16, 2015
```
Change-Id: I540e43d27cacde19b2f7a5b5850635a43fbe00c5
```
7def6da9

Adding an id to the 'Add email address' field (Bug #1424916) · dc5f57e8

Robert Lyon authored Feb 24, 2015



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

dc5f57e8

15 Jun, 2015 34 commits
- Update the location of the file used by update_magicdb_path() · bdba7736
  Aaron Wells authored Jun 15, 2015
```
Bug 1465107

Change-Id: Icd8584a70f0f413fe75c3ed7ec388176b2059410
```
  bdba7736
- Merge branch 'sprint-6' (bootstrap) · d22a42d5
  Aaron Wells authored Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework
```
  d22a42d5
- FIX conflict resolution (bootstrap) · b769d828
  Pat Kira authored Jun 15, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I800ce2a6ffa78ee406e52631882c9d7a5603f1ed
```
  b769d828
- Style annotationlist, fix jounal button (bootstrap) · 17361373
  Pat Kira authored Jun 15, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ib3db7843c7fa5285b2aa3bd9f2f34a56580ff4a7
```
  17361373
- MINOR: css bug fix button group · 29916ea1
  Naomi Guyer authored Jun 15, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I1e0dc9a76dcb4c599e284ae22103216292e20d38
```
  29916ea1
- Remove more unneeded dependencies (bootstrap) · 08f53d1f
  Naomi Guyer authored Jun 15, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I4d63827b9d0fd7d13a391476f0f623e5e0c8927d
```
  08f53d1f
- Webservices (bootstrap) · c3a5b865
  Naomi Guyer authored Jun 14, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ib8c79dc8d1e951a497e4ace72752a604455c9493
```
  c3a5b865
- FIX: search boxes in dock (bootstrap) · 94e7e658
  Naomi Guyer authored Jun 14, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I872942b4aafb6aa01dff2785f97c2290c21c9cef
```
  94e7e658
- FIX: remove deprecated css · 7bbb9da3
  Naomi Guyer authored Jun 14, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I83a5945d5cfd051eefc0752d910253d193e14042
```
  7bbb9da3
- FIX: institution dropdowns · 518cbda1
  Naomi Guyer authored Jun 14, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ie42c449f093c30a8ccea8355e6bec6e262cd1396
```
  518cbda1
- BUG: Location of pieform templates · ffabc527
  Naomi Guyer authored Jun 14, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I834e78e2c7cd5d2fd5c2e7dd0d51352b12934c20
```
  ffabc527
- Webservices (bootstrap) · b1f9a51c
  Naomi Guyer authored Jun 14, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Iac22116f528a2b11e852d1a8dc2f8c2cb031455d
```
  b1f9a51c
- BUG: web service plugins in the wrong directory · 0be400c0
  Naomi Guyer authored Jun 14, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Idb81e657b8f0de44e44e678188b8fb6f275a4ad0
```
  0be400c0
- Admin area fixes (bootstrap) · 47d3dd0f
  Naomi Guyer authored Jun 14, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ie28d14609edb7e7ca929d5891b50a499acc3f31b
```
  47d3dd0f
- Style commentlist (bootstrap) · 82c62011
  Pat Kira authored Jun 12, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ie3f92c96048a84f4860613932bd021c12e57d26c
```
  82c62011
- removed extra dropdoen that wasnt needed (Bootstrap) · 6ea9f8a4
  Liam Sharpe authored Jun 12, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I166d09b74da8e87ac1e2c3a5ea190475605f19ac
```
  6ea9f8a4
- Added global institution selector to all pages. Styled statistics page (Bootstrap) · 70b4f02e
  Liam Sharpe authored Jun 12, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I6e1e80e880757b20b3ccf87a109197000b868a7a
```
  70b4f02e
- FIX: regressions from file location changes (bootstrap) · c7322f28
  Naomi Guyer authored Jun 12, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ia316b94f5335537a73855c576d7aa4a22a20fade
```
  c7322f28
- Changes to theme sass post file moving (bootstrap) · b4d368ac
  Naomi Guyer authored Jun 12, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I1727a554e1b9a8f6150d128e2b454c1cc4a430a4
```
  b4d368ac
- Removing all hard-coded references to / · 31060b35
  Aaron authored Jun 09, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I9906a7cead1e2214ff68229d9a6f4d74e573f54d
```
  31060b35
- Moving everything around to match the new theme file locations · 9886c0a0
  Aaron authored Jun 09, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Id81660174d9f79d74935a65a817f660a71dc0199
```
  9886c0a0
- Reorganizing theme files: Adding "plugintype"; eliminating "static". · 5d7bdaea
  Aaron Wells authored Jun 09, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

1. Moving all the pluginfiles for themes into a "plugintype" directory. So
e.g. htdocs/theme/raw/blocktype/clippy/templates/clippy.tpl becomes
htdocs/theme/raw/plugintype/blocktype/clippy/templates/clippy.tpl.

2. Moving all the things under "static" in themes, to the theme's root.
So htdocs/theme/raw/static/style/style.css becomes htdocs/theme/raw/style.css
and htdocs/theme/raw/blocktype/clippy/static/images/clippy.png becomes
htdocs/theme/raw/blocktype/clippy/images/clippy.png

This should make things a little clearer for new theme devs. It's
still confusing to have all the images scattered throughout the plugin
subdirectories, but that's hard to fix because we treat the asset type
as part of the filename, e.g. $THEME->get_url('style/style.css') instead
of $THEME->get_url('style', 'style.css');

Change-Id: Ia216a40fb72624113e56d7eac698bfeb5adafcf0
```
  5d7bdaea
- WIP fancying up the admin area (Bootstrap) · 68d57850
  Liam Sharpe authored Jun 12, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I1cb47169e96c91aa1dbd65ebd6eb5318f58c9496
```
  68d57850
- Commentlist (wip), refactor list-group (bootstrap) · bcf0eb37
  Pat Kira authored Jun 09, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework
FIX: remove btn class for submitcancel
Tweak resume blocks on page view (bootstrap)
Comment list WIP (bootstrap)

Change-Id: Id77524e7bdb03569920091d3b895359b24511644
```
  bcf0eb37
- BUG: change get_url to get_image_url (bootstrap) · 75f77523
  Naomi Guyer authored Jun 12, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I6b2267104cde7fd7741c42dbae19abbb9176b543
```
  75f77523
- BUG: remove method_exists for get_link, add on base class (bootstrap) · a4b1ad67
  Naomi Guyer authored Jun 12, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I0a0a78d67909392613cd630faa542dd9b8145797
```
  a4b1ad67
- Input group fixes (bootstrap) · 77aa623b
  Naomi Guyer authored Jun 12, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I21419cad1eb8885568c004b27b3d3d4464e40541
```
  77aa623b
- Admin areas (bootstrap) · 4c7356a2
  Naomi Guyer authored Jun 11, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ida951e4e4350ba68734dbc3726eeab8c80f5f599
```
  4c7356a2
- Resume blocks - DONE (bootstrap) · 4daa7827
  Pat Kira authored Jun 11, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ic3b404f438ecfb11c39acca7e832b1271ed6fc86
```
  4daa7827
- FIX: To allow the use jQuery within function(s) (bootstrap) · 16039897
  Pat Kira authored Jun 09, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework
Change-Id: I3b56a1e1d2b7993d4848f1d65e7f87736167a312
```
  16039897
- Admin regression fixes (bootstrap) · 0cb71655
  Naomi Guyer authored Jun 11, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: If744da7a2fc236fcb6d6eca7015fe649a4687a31
```
  0cb71655
- Regression fixes (bootstrap) · 6ef7c9ae
  Naomi Guyer authored Jun 11, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Id31eebf3d4b066091bce3e1c7398f9848bc75095
```
  6ef7c9ae
- Standardize css (bootstrap) · 3c46c68d
  Naomi Guyer authored Jun 10, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I991b636473d7a4f2d3f0d091331c849e413b925e
```
  3c46c68d
- Resume blocks (bootstrap) · d37d67e6
  Pat Kira authored Jun 10, 2015 and Aaron Wells committed Jun 15, 2015
```
Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ia67b172d8f21c0e796063dbcc9ed3c79bcc1829e
```
  d37d67e6