|
 |
 |
 |
|
| |
|
Recent Commits to alaveteli:master |
|
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
 m doc/INSTALL.md
changed git-code to git-core
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
 m app/helpers/link_to_helper.rb
m app/models/incoming_message.rb
m app/views/request/show.rhtml
m app/views/request_mailer/old_unclassified_updated.rhtml
m app/views/request_mailer/overdue_alert.rhtml
m config/general.yml-example
m public/down.default.html
Merge branch 'master' of github.com:sebbacon/alaveteli
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m spec/controllers/request_game_controller_spec.rb
Make test description be accurate
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m app/models/incoming_message.rb
m commonlib
- config/general-example
m config/packages
m config/routes.rb
m spec/controllers/admin_general_controller_spec.rb
m spec/controllers/admin_request_controller_spec.rb
m spec/controllers/admin_user_controller_spec.rb
Merge branch 'master' of github.com:sebbacon/alaveteli
Conflicts:
app/views/request/_request_listing_single.rhtml
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m app/views/request/_request_listing_single.rhtml
+ spec/controllers/request_game_controller_spec.rb
+ spec/views/request_game/play.rhtml_spec.rb
Fix bug on categorisation page that was stopping game from working
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
 m app/views/request/show.rhtml
The sense of the "is admin" test was accidentally reversed on the request page template
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m config/general.yml-example
Do not specify ADMIN_BASE_URL in the example config file,
because the dynamic default value will be correct for most
installations.
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m app/helpers/link_to_helper.rb
Use the ADMIN_BASE_URL config variable if present, rather than ignoring it
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m app/models/incoming_message.rb
1) You can’t call an instance method from a class method (d’oh)
2) The test coverage is less good than I imagined.
XXXX need test for zip file attachments
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m app/views/request/show.rhtml
Reinstate the additional admin links.
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m config/routes.rb
That is only supposed to be disabled in the wdtk branch, not in master.
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m app/views/request/_request_listing_single.rhtml
+ spec/controllers/request_game_controller_spec.rb
+ spec/views/request_game/play.rhtml_spec.rb
Merge branch 'master' of g...@github.com:sebbacon/alaveteli
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m config/routes.rb
Merge branch 'wdtk' of g...@github.com:sebbacon/alaveteli
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m public/down.default.html
Rationalise unholy mixture of tabs and spaces
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m app/views/request_mailer/old_unclassified_updated.rhtml
m app/views/request_mailer/overdue_alert.rhtml
Putting a space before the parenthesis causes a mandatory Ruby warning
"warning: don't put space before argument parentheses"
|
|
|
|
|
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
|
| |
m config/routes.rb
Disable the locale-specific routing, at least till it actually works.
|
|
|
|
|
|
| |
|
|
 |
|
 |
|
