 Cesy
|
73a2ac87da
|
Merge pull request #1075 from Br3nda/bw/garden-link
Bugfix: Link to garden, not member
|
2016-11-27 11:00:49 +00:00 |
|
|
Brenda Wallace
|
9cce0e39f6
|
Limit garden names to one line
|
2016-11-27 14:52:07 +13:00 |
|
|
Brenda Wallace
|
10c20c7f91
|
Narrow-ed regex on wikipedia url
and more tests
|
2016-11-27 14:35:49 +13:00 |
|
|
Brenda Wallace
|
f52b828abe
|
Use rake to create database
|
2016-11-27 13:27:45 +13:00 |
|
|
Brenda Wallace
|
c76fb15cfd
|
Add yamllint settings
|
2016-11-27 13:24:21 +13:00 |
|
|
Brenda Wallace
|
167417a711
|
Indent travis.yml correctly
|
2016-11-27 13:24:02 +13:00 |
|
|
Brenda Wallace
|
7fcd3cba8d
|
Changed phantomjs url to project official
|
2016-11-27 13:22:10 +13:00 |
|
|
Brenda Wallace
|
9cb58ab0c9
|
Wrapped the phantomjs downloading in travis.yml
|
2016-11-27 13:08:53 +13:00 |
|
|
Brenda Wallace
|
702bbeb724
|
"[Member]'s garden" link to garden, not member
|
2016-11-27 10:21:11 +13:00 |
|
|
Brenda Wallace
|
38fbc52a6f
|
String interp doesn't need .to_s
|
2016-11-27 10:17:01 +13:00 |
|
|
Cesy
|
34e86f5881
|
Merge pull request #1066 from pozorvlak/autodeploy_prod
Auto-deploy to production on successful merge
|
2016-11-26 08:30:24 +00:00 |
|
|
Brenda Wallace
|
8c7fcd9d49
|
Fixed all useless assignments
|
2016-11-26 19:36:59 +13:00 |
|
|
Brenda Wallace
|
1fd7233012
|
Plualisation fixups
|
2016-11-26 17:27:13 +13:00 |
|
|
Brenda Wallace
|
d60dcfbddd
|
Use request.referer instead of request.referrer
|
2016-11-26 17:26:44 +13:00 |
|
|
Brenda Wallace
|
b541fe8221
|
puts allowed in some files
|
2016-11-26 17:24:41 +13:00 |
|
|
Brenda Wallace
|
8196d94a73
|
Don't enforce http pos args until rails 5
|
2016-11-26 17:23:31 +13:00 |
|
|
Brenda Wallace
|
07c135eeb5
|
before_filter is now before_action
|
2016-11-26 17:20:13 +13:00 |
|
|
Brenda Wallace
|
bcdd2a9167
|
Changed called to rails dynamic find_by
|
2016-11-26 15:55:38 +13:00 |
|
|
Brenda Wallace
|
20c72e1205
|
Upgrading poltergeist
|
2016-11-26 13:43:04 +13:00 |
|
|
Brenda Wallace
|
c02562518d
|
Fixed double handling in harvest.to_s
|
2016-11-26 12:20:51 +13:00 |
|
|
Brenda Wallace
|
723ebff923
|
Spacing fixes
|
2016-11-26 12:13:17 +13:00 |
|
|
Brenda Wallace
|
62e7c716dd
|
Removed extra empty blank lines
|
2016-11-26 12:06:02 +13:00 |
|
|
Brenda Wallace
|
b17e4eed7d
|
Block indentation fixups
|
2016-11-26 12:02:47 +13:00 |
|
|
Brenda Wallace
|
19727144d8
|
Else statement alignment
|
2016-11-26 11:57:02 +13:00 |
|
|
Brenda Wallace
|
e62adc297a
|
Aligning end on branches
|
2016-11-26 11:55:54 +13:00 |
|
|
Brenda Wallace
|
2e46cccd21
|
Hash alignment
|
2016-11-26 11:52:10 +13:00 |
|
|
Brenda Wallace
|
bbc19a5436
|
Array indentation fixed
|
2016-11-26 11:49:51 +13:00 |
|
|
Brenda Wallace
|
4cf0f85ee8
|
Indent the first parameter one step more than the start of the previous line.
|
2016-11-26 11:46:31 +13:00 |
|
|
Brenda Wallace
|
d268d2b09e
|
Fixed indentation on comments
|
2016-11-26 11:45:25 +13:00 |
|
|
Brenda Wallace
|
200a1c9a84
|
Closing parenthesis indentation fixed
|
2016-11-26 11:44:18 +13:00 |
|
|
Brenda Wallace
|
ebacd83dde
|
Case statement indentation clean up
|
2016-11-26 11:42:34 +13:00 |
|
|
Brenda Wallace
|
c878baa886
|
Indented parameters cleanup
|
2016-11-26 11:41:07 +13:00 |
|
|
Brenda Wallace
|
564731667e
|
Fixed up all remaining hash alignment
|
2016-11-26 11:17:42 +13:00 |
|
|
Brenda Wallace
|
bae25cfe8f
|
Fixed hash alignment in a funky big DDL
|
2016-11-26 11:16:55 +13:00 |
|
|
Brenda Wallace
|
5f3dd04068
|
Fixed array indentation
|
2016-11-26 11:00:49 +13:00 |
|
|
Brenda Wallace
|
2eddaf90cf
|
Fixed access modifier indentation
|
2016-11-26 11:00:04 +13:00 |
|
|
Brenda Wallace
|
91d2998507
|
Fixed multi-line operation indentation
|
2016-11-26 10:56:23 +13:00 |
|
|
Brenda Wallace
|
7eb0ee16b9
|
Indentation for multiline method calls
|
2016-11-26 10:54:51 +13:00 |
|
|
Brenda Wallace
|
83392ddda1
|
Indentation clean ups
|
2016-11-26 10:51:54 +13:00 |
|
|
pozorvlak
|
847f4d88d6
|
Merge pull request #1069 from CloCkWeRX/add-facebook-assets
Add a login splash for facebook
|
2016-11-25 18:06:02 +00:00 |
|
|
pozorvlak
|
fb9a1fdfd3
|
Merge pull request #1061 from Br3nda/bw/long-lines-fixed
Wrapped all lines > 120 chars.
|
2016-11-25 18:02:22 +00:00 |
|
|
Daniel O'Connor
|
783406d730
|
Add a login splash
|
2016-11-25 09:44:12 +10:00 |
|
|
Brenda Wallace
|
be67b858b4
|
Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed
Conflicts:
lib/tasks/growstuff.rake
|
2016-11-25 08:18:18 +13:00 |
|
|
Miles Gould
|
a796ba904a
|
Merge branch 'Br3nda-bw/reduce-complexity' into dev
|
2016-11-24 19:06:31 +00:00 |
|
|
Miles Gould
|
012f2f0cfa
|
Merge branch 'bw/reduce-complexity' of https://github.com/Br3nda/growstuff into Br3nda-bw/reduce-complexity
|
2016-11-24 19:00:06 +00:00 |
|
|
pozorvlak
|
3e8c61c0c3
|
Merge pull request #1064 from Br3nda/bw/normalise-translations
Normalise translation file
|
2016-11-24 18:55:10 +00:00 |
|
|
Miles Gould
|
844f68ef4c
|
Auto-deploy to production on successful merge
I *think* this is all that's necessary, though it's a bit hard to test
:-)
|
2016-11-24 18:48:01 +00:00 |
|
|
pozorvlak
|
e95566ed48
|
Merge pull request #1052 from Growstuff/dev
Release 15
release15
|
2016-11-24 18:30:36 +00:00 |
|
|
Daniel O'Connor
|
916fd73071
|
Merge pull request #1065 from Br3nda/bw/removed-some-duplication
Reduced code duplication in growstuff.rake
|
2016-11-23 18:11:34 +10:30 |
|
|
Brenda Wallace
|
18a8d6c5bf
|
Re-instate usage info when args not as expected
|
2016-11-23 20:38:46 +13:00 |
|