Commits · be5df33f4ed817247136e87235629b872166a0f4 · mahara / mahara

31 Oct, 2010 10 commits

Remove unused gallery artefactchooser method · be5df33f
Richard Mansfield authored Oct 28, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
be5df33f
Fix warning when a gallery block without images is configured · aad4f540
Richard Mansfield authored Oct 28, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
aad4f540
Include jquery & blocktype js on all view pages · 3b72d6bf
Richard Mansfield authored Oct 28, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
3b72d6bf
Fix missing db prefix · 9434f0dc
Richard Mansfield authored Oct 28, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
9434f0dc
Fix php warning in logs · 20938093
Richard Mansfield authored Oct 28, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
20938093

Evan Goldenberg authored Oct 28, 2010

(Gallery-related patches collected from gallery-premerge on git://gitorious.org/~naveg/mahara/navegs-mahara.git, without flickr blocktype)

7997450b

Make jquery optional & avoid extra request for jquery-shortname.js · 5ef7be15
Richard Mansfield authored Oct 28, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
5ef7be15
use get_instance_config_javascript for the creative commons block · e9f4ed62
Evan Goldenberg authored Jan 15, 2010
```
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
```
e9f4ed62

Add plugin specific javascript capability. · a7287d28

Evan Goldenberg authored Jan 18, 2010

Blocktype plugins can now specify javascript files
to be called at the top of the view. The files should
be specified relative to lib.php, and must be instance
independent. Each file will be called once per blocktype
in a view, not once per block instance.

Blocktypes can also specify javascript to be loaded when
instances of the blocktype are being configured.

a7287d28

Add jquery support · b56cdf14

Evan Goldenberg authored Jan 14, 2010



jQuery can be accessed using $j, while Mochikit
remains tied to $

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

b56cdf14

29 Oct, 2010 1 commit

Fixed encoding issue in LEAP2A export: · a44ccdca

Adrian Schlegel authored Oct 16, 2010


Accented characters in views were garbled in the export.

Signed-off-by: Adrian Schlegel <adrian@liip.ch>

a44ccdca

27 Oct, 2010 2 commits

Fix timing problems in Resume tests · 37d8c16b

Richard Mansfield authored Oct 27, 2010



Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
(cherry picked from commit 3dcea251)

37d8c16b

Update selenium tests · 973c021e

Richard Mansfield authored Oct 27, 2010



Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
(cherry picked from commit 14280c3f)

973c021e

26 Oct, 2010 1 commit
- Define default first day of week to fix calendar for some languages (bug #663056) · b706cb2d
  Richard Mansfield authored Oct 27, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  b706cb2d
25 Oct, 2010 3 commits
- Add simple locking in config table to stop cron jobs running simultaneously · 03203d96
  Richard Mansfield authored Oct 22, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  03203d96
- Fix false user avatar in message reply form (bug #663763) · adf39639
  Ruslan Kabalin authored Oct 25, 2010
```
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
```
  adf39639
- Added support for tags and description (also cleaned up unneccessary catch code) · 9f171de5
  Alan McNatty authored Oct 25, 2010
  
  9f171de5
24 Oct, 2010 1 commit
- Leap2: Fixed category namespace in import as well as export · a76e0a2e
  Penny Leach authored Oct 24, 2010
```
This fixes a regression I introduced in
4cb74998



Signed-off-by: Penny Leach <penny@mjollnir.org>
```
  a76e0a2e
20 Oct, 2010 7 commits
- Added support for title · 1d839271
  Alan McNatty authored Oct 21, 2010
  
  1d839271
- Merge branch 'master' of git://gitorious.org/mahara/mahara · c2f8961f
  Alan McNatty authored Oct 21, 2010
```
Conflicts:
	htdocs/artefact/file/mobileupload.php
	htdocs/auth/user.php
```
  c2f8961f
- Fix first access of secret url view (bug #661613) · 1c807f3f
  Richard Mansfield authored Oct 20, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  1c807f3f
- Add missing username param to mobileupload.php · 0d89a21c
  Richard Mansfield authored Oct 20, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  0d89a21c
- Require username as well as token for mobile uploads · 3535cc53
  Richard Mansfield authored Oct 20, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  3535cc53
- Page and configuration for file uploads from mobile application · 6839a281
  Alan McNatty authored Oct 20, 2010
  
  6839a281
- Allow users to view files attached to feedback they can see (bug #663545) · 0183678b
  Richard Mansfield authored Oct 20, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  0183678b
19 Oct, 2010 4 commits
- Fix mp3 player for IE7 (bug #663594) · 6e479421
  Richard Mansfield authored Oct 20, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  6e479421
- Load the user account details each time .. they may have changed · ed794dfd
  Alan McNatty authored Oct 19, 2010
  
  ed794dfd
- Fix calendar display in German (bug #663056) · 0863aad0
  Richard Mansfield authored Oct 19, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  0863aad0
- Check for spam domains in forum posts (bug #663039) · 191d9bf9
  Richard Mansfield authored Oct 19, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  191d9bf9
18 Oct, 2010 11 commits
- Now check for no folder = base folder · 457ff773
  Alan McNatty authored Oct 19, 2010
  
  457ff773
- Auto create folder if it doesn't exist · 77b25893
  Alan McNatty authored Oct 19, 2010
  
  77b25893
- Added check for global config enabled/disabled, etc · 5f289f26
  Alan McNatty authored Oct 19, 2010
  
  5f289f26
- Removed bogus usr table fields (old commit cleanup) · 974c6a59
  Alan McNatty authored Oct 19, 2010
  
  974c6a59
- Merge branch 'master' of git://gitorious.org/mahara/mahara · 1778d6d1
  Alan McNatty authored Oct 19, 2010
  
  1778d6d1
- Added the refresh mobileuploadtoken feature/functionality and removed the... · 73689206
  Alan McNatty authored Oct 19, 2010
```
Added the refresh mobileuploadtoken feature/functionality and removed the erroneous mobileuploadtoken from usr object
```
  73689206
- Added windows locales to default langpack · 5ccbb142
  Richard Mansfield authored Oct 18, 2010
```
See http://mahara.org/interaction/forum/topic.php?id=2370


Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  5ccbb142
- Make upload submit button compulsory for FF but settable by forms too (see bug #623648) · c464d87a
  Richard Mansfield authored Oct 18, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  c464d87a
- Add browser check to upload form (bug #623648) · e79afb33
  Ruslan Kabalin authored Oct 18, 2010
  
  e79afb33
- Allow automatic upload on file selection to be disabled (part of workaround for bug #623648) · ba5fd5a6
  Richard Mansfield authored Oct 18, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  ba5fd5a6
- Manually managed merge · d0548af9
  Alan McNatty authored Oct 18, 2010
  
  d0548af9