Commits · 736892063693e7d5beaf904947e6b47874430529 · mahara / mahara · GitLab

18 Oct, 2010 3 commits
- 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
- Manually managed merge · d0548af9
  Alan McNatty authored Oct 18, 2010
  
  d0548af9
- Merge branch 'master' of git://gitorious.org/mahara/mahara · 58098a0c
  Alan McNatty authored Oct 18, 2010
```
Conflicts:
	htdocs/lib/db/upgrade.php
```
  58098a0c
15 Oct, 2010 1 commit
- leap2a: added trailing / on the end of categories namespace in xml header · 456a2f1a
  Penny Leach authored Oct 15, 2010
```
Signed-off-by: Penny Leach <penny@mjollnir.org>
```
  456a2f1a
10 Oct, 2010 1 commit
- Debugging and had a go at getting the upgrade / install bits right · 71f2ced7
  Alan McNatty authored Oct 10, 2010
  
  71f2ced7
08 Oct, 2010 4 commits
- First round of changes for mobileupload handler for MaharaDroid · 84a5025d
  Alan McNatty authored Oct 08, 2010
  
  84a5025d
- Allow for unencoded '&' when rewriting download links during html export (see bug #548308) · aac4f665
  Richard Mansfield authored Oct 08, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  aac4f665
- Revert "Corrected & to & in URL for internalmedia (Fixes #3438)." · 6a88b5d1
  Richard Mansfield authored Oct 08, 2010
```
This reverts commit e7f95427.

This was causing problems for some media players; see bug #638751
```
  6a88b5d1
- Stop previous cron upgrade hanging with floating login form · 78cfd0d2
  Richard Mansfield authored Oct 08, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  78cfd0d2
07 Oct, 2010 10 commits
- Remove block height option introduced in 688a5063; handled better by tinymce... · 55a8fead
  Richard Mansfield authored Oct 08, 2010
```
Remove block height option introduced in 688a5063

; handled better by tinymce autoresize (see bug #530656)

Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  55a8fead
- Remove excessive queries on find friends page · 8bf60130
  Richard Mansfield authored Oct 07, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  8bf60130
- cron: Added relevant cronjobs and functions for cleaning activity... · 2c899f77
  Eugene Venter authored Oct 08, 2010
```
cron: Added relevant cronjobs and functions for cleaning activity notifications (notification_internal_activity) (bug #645744)
```
  2c899f77
- Fix bug with IE & autoresize when editor is initially hidden (bug #654963) · 4339a0b4
  Richard Mansfield authored Oct 07, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  4339a0b4
- Fix warnings during installation · 93f8e493
  Richard Mansfield authored Oct 07, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  93f8e493
- Revert "Fix image url rewriting in blog blocks (bug #656096)" · 658a6927
  Richard Mansfield authored Oct 07, 2010
```
This reverts commit 4a47b821.
```
  658a6927
- artefact/blog: Append 'view' param onto URL for inline image files and file... · 1393fd5e
  Eugene Venter authored Oct 07, 2010
```
artefact/blog: Append 'view' param onto URL for inline image files and file attachments on blog posts (bug #530656)
```
  1393fd5e
- Fix image url rewriting in blog blocks (bug #656096) · 4a47b821
  Richard Mansfield authored Oct 07, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  4a47b821
- Remove assignment to unused testing variable · e3539d5e
  Richard Mansfield authored Oct 07, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  e3539d5e
- Don't query a blocktype's artefact plugin multiple times · 22fbfe3c
  Richard Mansfield authored Oct 07, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  22fbfe3c
06 Oct, 2010 4 commits
- ldap auth: Don't try to set profile fields before creating user record (bug #649409) · f3590035
  Richard Mansfield authored Oct 06, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  f3590035
- Allow users to choose view themes with underscores in the name (bug #641718) · f56d9ffc
  Richard Mansfield authored Oct 06, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  f56d9ffc
- Implement default artefact render_self method & allow blocktypes to disable... · e006bdf9
  Eugene Venter authored Oct 06, 2010
```
Implement default artefact render_self method & allow blocktypes to disable title links (bug #617159)
```
  e006bdf9
- Don't allow invalid number of view columns during parallel editing (bug #645040) · 29fc9513
  Richard Mansfield authored Oct 06, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  29fc9513
05 Oct, 2010 6 commits
- filebrowser: update tags list on editing form opening (bug #653890) · 5fd0cabd
  Ruslan Kabalin authored Oct 05, 2010
```
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
```
  5fd0cabd
- Add confirmation message after leaving feedback (bug #643654 ?) · 5c9dc650
  Richard Mansfield authored Oct 05, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  5c9dc650
- More polite message when leaving empty feedback · 708e30bc
  Richard Mansfield authored Oct 05, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  708e30bc
- Fix description when inserting attached image into a blogpost (bug #652784) · a417592f
  Richard Mansfield authored Oct 05, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  a417592f
- Move export tab to the right of My Plans (bug #653897) · 47d6a685
  Richard Mansfield authored Oct 05, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  47d6a685
- Throw pieform exception rather than fatal error (bug #654689) · 17a6987f
  Richard Mansfield authored Oct 05, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  17a6987f
04 Oct, 2010 4 commits
- Enable tinymce autoresize plugin (bug #530656) · 5525cb60
  Eugene Venter authored Oct 05, 2010
  
  5525cb60
- Add missing unit when setting width property · ff8b17d3
  Richard Mansfield authored Oct 05, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  ff8b17d3
- Merge branch 'master' of git://gitorious.org/mahara/mahara · 9d51effc
  Alan McNatty authored Oct 05, 2010
  
  9d51effc
- Improve invalid password on csv upload error message (bug #654589). · c1468bcf
  Andrew Robert Nicols authored Oct 04, 2010
```
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
```
  c1468bcf
02 Oct, 2010 1 commit
- Fix for forms parameter in auth/saml config · 72353dcd
  Piers Harding authored Oct 03, 2010
```
Bug #653839

Signed-off-by: Piers Harding <piers@catalyst.net.nz>
```
  72353dcd
01 Oct, 2010 5 commits
- artefact/blog/lib: fixed comment counts · 68ac1055
  Eugene Venter authored Oct 01, 2010
```
Bug #643642
```
  68ac1055
- lib/cron: Adding line to signify cron finishing · 9c32e324
  Brett Wilkins authored Sep 27, 2010
```
Will also show finishing time relative to fake cron time, if the feature is used.
```
  9c32e324
- lib/cron: Checking if dataroot is writeable · fba71e3c
  Brett Wilkins authored Sep 27, 2010
```
Bug #646397
```
  fba71e3c
- Change query in myviews block to avoid fetching each view record separately · 5043e87c
  Richard Mansfield authored Oct 01, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  5043e87c
- Move query counting inside adodb to count queries that were being missed · bd5535a9
  Richard Mansfield authored Oct 01, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  bd5535a9
29 Sep, 2010 1 commit
- Don't set a fixed height on block config form unless config.blockeditormaxwidth is on · 0e7a938a
  Richard Mansfield authored Sep 29, 2010
```
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
```
  0e7a938a