pozorvlak
ae482ecab6
Merge pull request #802 from cesy/issue690
...
Issue 690 Switch on CMS and remove old files
2016-05-23 12:24:49 +01:00
pozorvlak
a8e63ab397
Merge pull request #898 from CloCkWeRX/adjust_plantings_card_ui
...
Improve the styling of a planting to be more like the other card-layouts
2016-05-23 12:17:47 +01:00
pozorvlak
a2717ad058
Merge pull request #900 from CloCkWeRX/clip_long_text
...
Clip long text in definition lists within panels
2016-05-23 12:07:32 +01:00
Daniel O'Connor
92cce5910e
Improve planting card UI on mobile
2016-05-23 16:35:58 +09:30
Daniel O'Connor
ab897f05f9
Use panel-body and panel-heading more effectively
2016-05-23 16:21:13 +09:30
Daniel O'Connor
cd8ca02322
Merge remote-tracking branch 'upstream/dev' into adjust_plantings_card_ui
2016-05-23 16:17:39 +09:30
Daniel O'Connor
5104225d11
#856 Clip long text in definition lists within panels
2016-05-23 16:13:53 +09:30
Mackenzie
24d6087ea7
Merge pull request #899 from CloCkWeRX/improve_nearby_places_links
...
Improve nearby places links
2016-05-22 23:39:53 -04:00
Daniel O'Connor
dc9ee18e96
Update stale test expectation
2016-05-23 12:56:37 +09:30
Daniel O'Connor
b4060b7903
Update stale test expectation
2016-05-23 12:55:50 +09:30
Daniel O'Connor
884a3aad2c
Check we have a location before linking to it
2016-05-23 11:51:14 +09:30
Daniel O'Connor
80f826421b
Add page anchors to put you to the area you are most interested in
2016-05-23 11:41:42 +09:30
Daniel O'Connor
7872bb48e2
Fixes #872 Add more links and explain them better
2016-05-23 11:35:49 +09:30
Daniel O'Connor
7d10101c57
For a place, talk about the community as a vaguer way of explaining 'members, seeds, plantings, etc'
2016-05-23 11:31:29 +09:30
Daniel O'Connor
d9ed21ba53
Styling the show view of a planting more like the card view (though 100% card view looks funny with the crop thumbnail floating to the right)
2016-05-23 11:24:32 +09:30
Daniel O'Connor
5e8211172b
Only show a heading for Notes if there are notes
2016-05-23 11:12:42 +09:30
Daniel O'Connor
24956255d7
Fix layout of view all plantings link
2016-05-23 11:03:23 +09:30
Daniel O'Connor
55380dab04
Fix style regression by moving garden content properly into the container
2016-05-23 10:58:09 +09:30
Daniel O'Connor
e7926b6f22
Improve the styling of a planting to be more like the other card-layouts
2016-05-23 10:48:49 +09:30
Mackenzie
47d7f001fe
Merge pull request #895 from cesy/precompile
...
Precompile css and js with sass
2016-05-22 15:10:43 -04:00
Cesy Avon
23a6722ddb
Precompile css and js with sass
2016-05-22 16:34:36 +00:00
Cesy
23e2b756fd
Merge pull request #886 from pozorvlak/fix_duplicated_class_warning
...
Fix "duplicated key: :class" warning in HAML code
2016-05-22 17:21:47 +01:00
pozorvlak
8bea05a77b
Merge pull request #803 from cesy/issue734bootstrapaccessibility
...
Bootstrap accessibility
2016-05-22 17:19:55 +01:00
Cesy
d5ac4bac48
Merge pull request #894 from pozorvlak/upgradegibbon
...
Fix mailchimp newsletter subscriptions
2016-05-22 17:13:59 +01:00
pozorvlak
1af9b2e6db
Merge pull request #892 from cesy/databaseconfig
...
Moving database.yml and adding gitignore
2016-05-22 17:09:35 +01:00
Cesy
daa3c08706
Fixing broken links to pages that are now in CMS
2016-05-22 16:05:07 +00:00
Cesy
29102e3b52
Cleaning up more tests
2016-05-22 16:05:07 +00:00
Cesy
8c0fc54344
Sorting tests related to moving to CMS
2016-05-22 16:04:39 +00:00
Cesy
f5b20c2f32
About is empty, policy won't work without the routes
2016-05-22 16:01:40 +00:00
Cesy
79734ff603
Fix #690 Removing old static files that are now in CMS
2016-05-22 16:01:40 +00:00
twconquest
397bfd8bca
Start removing static page references.
2016-05-22 16:01:40 +00:00
Miles Gould
52dc111210
Merge branch 'dev' into upgradegibbon
2016-05-22 16:57:38 +01:00
Cesy Avon
da1375e34d
Making database.yml locally editable
2016-05-22 15:50:22 +00:00
Cesy
7be346d92f
Merge pull request #890 from maco/gem_udpate
...
upgrade gems and make API change for ruby-units
2016-05-22 08:54:07 +01:00
Mackenzie Morgan
51a0a33b2a
upgrade gems and make API change for ruby-units
2016-05-21 16:33:42 -04:00
Mackenzie Morgan
0df52b3cd8
update paperclip
2016-05-20 11:28:55 +01:00
Daniel O'Connor
18cd8f5966
#507 #813 Add spec
2016-05-19 15:53:11 -04:00
Kevin Rio
5a31619b46
If i reply to a notification directly, it's not marked as read. #507
2016-05-19 15:53:11 -04:00
Daniel O'Connor
4b4e0cf69a
$ rubocop --only HashSyntax --auto-correct
...
483 files inspected, 2018 offenses detected, 2018 offenses corrected
2016-05-19 15:53:11 -04:00
Mackenzie Morgan
8659ebca2d
switch from less to sass
...
* dependency hell + bit rot on upstream libraries prevents installation on OS X
2016-05-19 15:52:54 -04:00
Miles Gould
238e0be682
Merge branch 'upgrade_misc_dev_tools' into dev
2016-05-19 15:02:32 +01:00
Mackenzie
4324ceb8ca
Merge pull request #884 from pozorvlak/bump_ruby_22x
...
Bump ruby to 2.2.x
2016-05-19 09:40:48 -04:00
Miles Gould
79db3c4c1d
Fix "duplicated key: :class" warning in HAML code
...
The warning was
app/views/harvests/_form.html.haml:32: warning: duplicated key at line 32 ignored: :class
We were specifying two `:class` attributes on an HTML tag; I've combined
them into one.
2016-05-19 14:40:24 +01:00
Mackenzie
19d6c8f293
Merge pull request #882 from pozorvlak/install_all_gems_on_travis
...
Install *all* gems in TravisCI
2016-05-19 09:37:08 -04:00
Miles Gould
bcb74c7ed8
Merge branch 'dev' into bump_ruby_22x
2016-05-19 14:15:33 +01:00
Miles Gould
4a341bb7ab
Install *all* gems in CI
...
Previously we were only installing the gems needed for testing. This
caused our CI to miss an incompatibility problem with a gem that was
only needed for another environment:
https://github.com/Growstuff/growstuff/pull/878#discussion_r63745751
2016-05-19 13:33:36 +01:00
Daniel O'Connor
02615dc522
$ bundle update selenium-webdriver guard guard-rspec rails factory_girl pg simplecov coveralls newrelic_rpm better_errors minitest
2016-05-17 13:33:12 +09:30
Cesy
260b16da11
Merge pull request #865 from CloCkWeRX/fix_progress
...
Fix progress calculations
2016-04-21 08:02:37 +01:00
Daniel O'Connor
cf0a646699
Add EOF newlines
2016-04-14 09:59:36 +09:30
Daniel O'Connor
12ad16a05a
Newlines
2016-04-13 08:41:05 +09:30
