diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-04-29 18:14:32 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-04-29 18:14:32 +0100 |
| commit | 16061e060354affb25701a8c6111ee30df2ac19c (patch) | |
| tree | a2d0f949b532f582becff31ef7f79b5deacc4186 /notes | |
| parent | b38ba427f7facd6e8042ae667b5b3bac1724803a (diff) | |
| parent | 1fc50dcc7f65ae04055a803579445a9397e3ffdf (diff) | |
Merge branch 'master' into barnet-integration
(prior to go-live... amongst other things, the Barnet web templates had changed.
NB conflict with carton.lock, accepted master in full)
Conflicts:
carton.lock
Diffstat (limited to 'notes')
| -rw-r--r-- | notes/INSTALL.pod | 2 | ||||
| -rw-r--r-- | notes/code_structure.txt | 2 | ||||
| -rw-r--r-- | notes/states.txt | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/notes/INSTALL.pod b/notes/INSTALL.pod index b795a0043..ea549bd7e 100644 --- a/notes/INSTALL.pod +++ b/notes/INSTALL.pod @@ -105,7 +105,7 @@ C<bin/install_perl_modules> script, so run that now. This will install them into a directory called local. It uses cpanminus and Carton under the hood but should install these -of they are missing. You may need to install some source packages to +if they are missing. You may need to install some source packages to allow some of the included modules to be built, including: =over diff --git a/notes/code_structure.txt b/notes/code_structure.txt index 8c01fba8b..c90db1784 100644 --- a/notes/code_structure.txt +++ b/notes/code_structure.txt @@ -3,7 +3,7 @@ The code is broken down into the following sections: website: code to display the website and handle user submissions backend: send alerts to the councils, work out who should get the alert, various -confirmtaion emails +confirmation emails mobile apps: currently for iPhone and Android - two separate apps diff --git a/notes/states.txt b/notes/states.txt index b885b252b..70515c41b 100644 --- a/notes/states.txt +++ b/notes/states.txt @@ -2,13 +2,13 @@ Problems exist in four broad state categories: unconfirmed - the report has been made but the user hasn't clicked the confirmation link. open - the report has been confirmed - fixed - exactly what it says + fixed - any user has marked this problem as fixed closed - a registered user from a council has marked the problem as closed When a problem is created it will be unconfirmed, The problem becomes confirmed when the user clicks on the link sent to them in -the confirmation email. At this point the problem is confirmed. +the confirmation email. If a problem is uploaded from a mobile app then it is initally created with a state of partial. @@ -17,7 +17,7 @@ If a user is logged in then any problem they create is confirmed automatically. If a council user is logged in then they can change the state of the -problem to one of the following provifing they are from the council that +problem to one of the following, providing they are from the council that the problem has been reported to: Open ( a synonym for confirmed ) Investigating |