aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'add-russia' into developdevelopLouise Crow2015-06-25-2/+5
|\
| * Add link to http://rosotvet.ru/Louise Crow2015-06-25-2/+5
|/
* Merge branch 'hotfix/0.21.0.40' into developLouise Crow2015-06-25-7/+58
|\
| * Bump alaveteli version.hotfix/0.21.0.40Louise Crow2015-06-25-1/+1
| |
| * Handle non-UTF8 encoding in ruby 1.9 and aboveLouise Crow2015-06-25-6/+57
| |
| * Merge branch 'hotfix/0.21.0.39'0.21.0.39Louise Crow2015-06-23-3/+3
| |\
| | * Bump Alaveteli versionhotfix/0.21.0.39Louise Crow2015-06-23-1/+1
| | |
| | * Use BASH_SOURCE to return the script path.Louise Crow2015-06-23-2/+2
| |/ | | | | | | | | It is reliable in the case where the script is sourced from another script.
| * Merge branch 'hotfix/0.21.0.38'0.21.0.38Gareth Rees2015-06-17-1/+1
| |\
* | \ Merge branch 'upgrade-jquery-rails' into developLouise Crow2015-06-23-1026/+74
|\ \ \
| * | | Remove local version of jquery-ui stylesheetLouise Crow2015-06-17-375/+0
| | | | | | | | | | | | | | | | Should be served by jquery-ui-rails.
| * | | Fix issue that was preventing preview from displaying properly.Louise Crow2015-06-17-1/+1
| | | |
| * | | Update JCrop js for latest jquery.Louise Crow2015-06-17-45/+55
| | | |
| * | | Update jquery.JcropLouise Crow2015-06-17-202/+12
| | | | | | | | | | | | | | | | Old version was calling some outdating jquery methods.
| * | | fixup! Remove jquery and jquery-ui.Louise Crow2015-06-17-1/+1
| | | |
| * | | Update .live() to .on()Louise Crow2015-06-17-2/+2
| | | | | | | | | | | | | | | | Required now we're using the latest version of jquery in the admin interface.
| * | | Remove jquery and jquery-ui.Louise Crow2015-06-17-397/+0
| | | | | | | | | | | | | | | | These should be provided by jquery-ui-rails.
| * | | Update jquery-rails to get the fix for CVE-2015-1840.Louise Crow2015-06-17-3/+3
| | | |
* | | | Merge branch 'add-rbenv-comment-to-httpd-conf' into developLouise Crow2015-06-23-0/+4
|\ \ \ \
| * | | | Add a line to httpd.conf to show how to use with rbenvLouise Crow2015-06-23-0/+4
|/ / / /
* | | | Code markupLouise Crow2015-06-23-3/+3
| | | |
* | | | Add upgrade notes for latest changesLouise Crow2015-06-23-3/+18
| | | | | | | | | | | | | | | | CVE fixes, ruby migration examples and FoiAttachment body encoding.
* | | | Merge branch 'add-rbenv-shims' into developLouise Crow2015-06-23-0/+36
|\ \ \ \
| * | | | Add conversion task for config/run-with-rbenv-path.exampleLouise Crow2015-06-23-0/+16
| | | | |
| * | | | Add example of wrapper script used to run mailin and handlemail.Louise Crow2015-06-23-0/+8
| | | | |
| * | | | Add some commented out lines showing how to use with rbenvLouise Crow2015-06-19-0/+12
| | | | |
* | | | | Merge branch 'fix-bad-encodings' into developLouise Crow2015-06-23-0/+96
|\ \ \ \ \
| * | | | | Add script to detect poorly encoded UTF-8 in existing data.Louise Crow2015-06-23-0/+96
|/ / / / /
* | | | | Merge branch 'binary-or-utf8-attachment-bodies' into developLouise Crow2015-06-23-135/+235
|\ \ \ \ \
| * | | | | Use existing UTF-8 conversion method.Louise Crow2015-06-22-10/+1
| | | | | |
| * | | | | Remove redundant UTF-8 conversion.Louise Crow2015-06-22-65/+1
| | | | | | | | | | | | | | | | | | | | | | | | body_as_text has already been converted and scrubbed if needed.
| * | | | | Add body_as_text, default_body.Louise Crow2015-06-22-16/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main intent here is to be more explicit about what form you're getting the attachment body in - valid UTF-8 or binary, and has it been cleaned up in order to be UTF-8?
| * | | | | convert_string_to_utf8 returns struct of string and scrubbing status.Louise Crow2015-06-22-11/+23
| | | | | |
| * | | | | Clearly separate text attachments and binary.Louise Crow2015-06-22-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text type attachments will always have a UTF-8 body (even if it has to be scrubbed).
| * | | | | Round trip through utf-16 to clean utf-8 stringLouise Crow2015-06-22-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As noted in the ruby docs (http://ruby-doc.org/core-1.9.3/String.html#method-i-encode), any conversion from an encoding to the same encoding is a no-op, covert it first to utf-16.
| * | | | | Use ASCII-8BIT for replacement patterns when handling binary data.Louise Crow2015-06-22-23/+74
| | | | | | | | | | | | | | | | | | | | | | | | Also be explicit about using UTF-8 when handling text data.
* | | | | | Merge branch 'add-rack-sanitizer-via-platform' into developLouise Crow2015-06-22-5/+3
|\ \ \ \ \ \
| * | | | | | Use :platform to add rack-utf8_sanitizerLouise Crow2015-06-19-5/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, the conditional used in 090531bf2d2b763e5bb281658e91b58905912130 results in `Gemfile.lock` being inconsistent with `Gemfile` under ruby 1.8.7 so we can't use it until after Alaveteli release 0.22, which is the last release that will support ruby 1.8.7.
* | | | | | Merge branch 'use-bash-source-in-mail-scripts' into developLouise Crow2015-06-22-2/+2
|\ \ \ \ \ \
| * | | | | | Use BASH_SOURCE to return the script path.Louise Crow2015-06-18-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | It is reliable in the case where the script is sourced from another script.
* | | | | | Merge branch 'add-nokogiri-to-main-group' into developLouise Crow2015-06-22-1/+1
|\ \ \ \ \ \
| * | | | | | Add nokogiri to main groupLouise Crow2015-06-19-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | As we're using nokogiri as the XmlMini backend as of bd6e94fc7c9c1790622ba29655f6e7e27044dd64, it should be in the default gem group.
* | | | | | Merge remote-tracking branch 'github/garethrees-patch-1' into developGareth Rees2015-06-22-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add link to more example deploymentsGareth Rees2015-06-19-0/+2
|/ / / / / | | | | | | | | | | | | | | | Link to http://alaveteli.org/deployments/ show how many deployments exist.
* | | | | Merge branch 'switch-xml-mini-backend' into developLouise Crow2015-06-19-0/+2
|\ \ \ \ \
| * | | | | Switch xml backend to nokogiri to avoiC CVE-2015-3227.Louise Crow2015-06-19-0/+2
| |/ / / /
* | | | | Merge branch 'upgrade-rack' into developLouise Crow2015-06-19-3/+3
|\ \ \ \ \
| * | | | | Upgrade rack to get the fix for CVE-2015-3225.Louise Crow2015-06-17-3/+3
| |/ / / /
* | | | | Merge branch 'tidy_public_body' into developGareth Rees2015-06-17-167/+261
|\ \ \ \ \
| * | | | | Add some TODOsGareth Rees2015-06-15-2/+11
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-02 14:02:21 +0000