alaveteli - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Lines
*	Merge branch 'hotfix/0.18.0.11' into rails-3-develop	Louise Crow	2014-08-05	-1/+7
\|\
\| *	Try a smaller min-height for smaller devices.0.18.0.11 hotfix/0.18.0.11	Louise Crow	2014-08-05	-0/+1
\| \|
\| *	Set height for IE7, don't use min-height for small devices.	Louise Crow	2014-08-05	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|	IE7 doesn't implement min-height, so force the iframe height. We don't want to set min-height for mobile as it's just a workaround for desktop browsers setting a too-small height.
* \|	Merge branch 'issues/1709-eager-load-for-api-speed' into rails-3-develop	Louise Crow	2014-08-04	-24/+11
\|\ \
\| * \|	Try some eager loading to speed up body_request_events	Louise Crow	2014-08-04	-24/+11
\| \|/
* \|	Merge branch 'hotfix/0.18.0.10' into rails-3-develop	Louise Crow	2014-07-30	-1/+1
\|\\|
\| *	Add viewport to head when using responsive styles.0.18.0.10 hotfix/0.8.0.10	Louise Crow	2014-07-29	-1/+1
\| \|
* \|	Merge branch 'hotfix/0.18.0.9' into rails-3-develop	Louise Crow	2014-07-29	-1/+12
\|\\|
\| *	Don't use stylesheet_link_tags0.18.0.9 hotfix/0.18.0.9	Louise Crow	2014-07-29	-1/+12
\| \| \| \| \| \| \| \|	There attachments will be cached, so we don't want timestamped references to stylesheets.
* \|	Merge branch 'hotfix/0.18.0.8' into rails-3-develop	Louise Crow	2014-07-29	-1/+3
\|\\|
\| *	Add min-height for iframe0.18.0.8 hotfix/0.18.0.8	Louise Crow	2014-07-29	-1/+3
\| \|
\| *	Use new status icon names (with old icons)0.18.0.4 hotfix/0.18.0.4	Louise Crow	2014-06-09	-22/+106
\| \| \| \| \| \| \| \| \| \|	Defining the basic css for status icons here so that themes can just set colours and add their own icons.
* \|	whitespace	lizconlan	2014-07-28	-31/+24
\| \| \| \| \| \| \| \|	includes various code layout fixes
* \|	Sending an invalid state value to add_correspondence now aborts the entire ↵	lizconlan	2014-07-28	-3/+12
\| \| \| \| \| \| \| \|	operation
* \|	Refactor state update API, better error handling	lizconlan	2014-07-28	-51/+47
\| \| \| \| \| \| \| \|	Filters; more 403s, fewer 500s; added logging; less duplication
* \|	Extend add_correspondence API method to optionally accept a state param	lizconlan	2014-07-28	-7/+22
\| \|
* \|	New API method for updating request state	lizconlan	2014-07-28	-0/+34
\| \|
* \|	Don't display locale options when there's only one.	Louise Crow	2014-06-30	-1/+1
\| \| \| \| \| \| \| \|	Fixes bug introduced in 039fb5cc0f2965346ef23a4ba1b9d20f6cf73805
* \|	Merge branch 'issues/1415-bulk-update-public-bodies' into rails-3-develop	Gareth Rees	2014-06-25	-51/+25
\|\ \
\| * \|	Move PublicBody domain logic from controller	Gareth Rees	2014-06-06	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves the magic 'site_administration' tag logic to the PublicBody model. Easier to make the string passed to `PublicBody#has_tag?` configurable if we want to allow this to be set per install.
\| * \|	Extract public body CSV export to its own class	Gareth Rees	2014-06-06	-50/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- SRP: Do one thing. PublicBodyCSV converts a collection of bodies in to a CSV formatted String - Adds some parenthesis around parameters in PublicBodyController#list_all_csv - Let the controller handle what records to pull out for the CSV export Arguably this doesn't really need to be anything to do with PublicBody, but it allows us to set nice defaults.
\| * \|	Remove FasterCSV dependency	Gareth Rees	2014-06-04	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	The last remaining usage was removed in c1ee22fe
* \| \|	Handle unhelpful stemming	Gareth Rees	2014-06-25	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stemming returns 'bore' as the word to highlight which can't be matched in the original phrase. Also removes duplicates from the results
* \| \|	Add spec for highlight_and_excerpt	Gareth Rees	2014-06-25	-0/+1
\| \| \|
* \| \|	Use regex based highlighting	Gareth Rees	2014-06-25	-15/+20
\| \| \|
* \| \|	Add helper to highlight and excerpt by regex	Gareth Rees	2014-06-25	-19/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of https://github.com/rails/rails/pull/11793/ Contains integration tests to check that it works as expected with ActsAsXapian.
* \| \|	Merge branch 'rails-3-develop' of ↵	Louise Crow	2014-06-16	-130/+159
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
\| * \ \	Merge branch 'replace-xxx-todo' into rails-3-develop	Gareth Rees	2014-06-16	-61/+61
\| \|\ \ \
\| \| * \| \|	Rename XXX comments with TODO:	Gareth Rees	2014-06-10	-61/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Picks these up in `rake notes` and adds semantic meaning
\| * \| \| \|	Merge branch 'issues/788-notification-email-cache-buster' into rails-3-develop	Gareth Rees	2014-06-16	-69/+98
\| \|\ \ \ \
\| \| * \| \| \|	Remove DateTimeHelper#year_from_date	Gareth Rees	2014-06-05	-16/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DateTime, Date and Time all have #year methods
\| \| * \| \| \|	Minor tidying of DateTimeHelper and specs	Gareth Rees	2014-06-05	-4/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Add specs for DateTimeHelper#simple_time	Gareth Rees	2014-06-05	-1/+11
\| \| \| \| \| \|
\| \| * \| \| \|	Add specs for DateTimeHelper#year_from_date	Gareth Rees	2014-06-05	-1/+11
\| \| \| \| \| \|
\| \| * \| \| \|	Move date helpers to DateTimeHelper	Gareth Rees	2014-06-05	-62/+66
\| \| \| \| \| \|
\| \| * \| \| \|	Remove duplication from new correspondence urls	Gareth Rees	2014-06-05	-12/+27
\| \| \| \| \| \|
\| \| * \| \| \|	Add cache-busting to request response notification	Gareth Rees	2014-06-04	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Users get a new response email, click the link, but get a cached page. This is a quick fix to ensure they always see the response when clicking the link.
* \| \| \| \| \|	Restore search term highlighting in the responsive stylesheets.	Louise Crow	2014-06-13	-1/+4
\|/ / / / /
* \| \| \| \|	Merge branch 'hotfix/0.18.0.2' into rails-3-develop	Louise Crow	2014-06-06	-7/+8
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| / \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Allow a message with more than one event to be destroyed.hotfix/0.18.0.2	Louise Crow	2014-06-06	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1569
* \| \| \|	Merge branch 'issues/1496-main-banner-cta-copy' into rails-3-develop	Gareth Rees	2014-06-04	-1/+1
\|\ \ \ \
\| * \| \| \|	Reword CTA copy on frontpage banner	Gareth Rees	2014-05-22	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In user testing no one clicked "Start Now" to make a request. All users clicked "Make a Request" in the main nav, so lets try that here.
* \| \| \| \|	Merge branch 'feature/responsive-icon-css' into rails-3-develop	Louise Crow	2014-06-04	-22/+106
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Use new status icon names (with old icons)	Louise Crow	2014-06-04	-22/+106
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Defining the basic css for status icons here so that themes can just set colours and add their own icons.
* \| \| \| \|	Add translation to /body_statistics	Gareth Rees	2014-06-04	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'issues/1315-link-to-public-body-stats' into rails-3-develop	Gareth Rees	2014-06-04	-1/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Link to public body stats	Gareth Rees	2014-06-04	-0/+5
\| \| \| \| \|
\| * \| \| \|	Add clarification to /body_statistics	Gareth Rees	2014-06-04	-0/+2
\| \| \| \| \|
\| * \| \| \|	Use @title for /body_statistics title	Gareth Rees	2014-06-04	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Ensures other installs get the translated version.
* \| \| /	Handle IE7 not understanding css inherit.	Louise Crow	2014-06-04	-0/+4
\| \|_\|/ \|/\| \|