pozorvlak
63f8a2c5c0
Merge pull request #897 from maco/menu_fix
...
darken navbar item text when it opens (and the background turns light)
2016-05-23 12:25:22 +01:00
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
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
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 Morgan
fe7d8f73f3
darken navbar item text when it opens (and the background turns light)
...
Fixes #896
2016-05-22 20:49:51 -04: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
daa3c08706
Fixing broken links to pages that are now in CMS
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
Mackenzie Morgan
51a0a33b2a
upgrade gems and make API change for ruby-units
2016-05-21 16:33:42 -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
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
Miles Gould
bcb74c7ed8
Merge branch 'dev' into bump_ruby_22x
2016-05-19 14:15:33 +01:00
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
Cesy
d525afb07c
Merge pull request #866 from CloCkWeRX/fix_posts_path
...
Fixes #851 Correct the link to be specific to the author
2016-04-11 18:56:45 +01:00
Daniel O'Connor
3ff3ffa457
Don't update that link, geesh. Need more coffee!
2016-04-11 09:55:03 +09:30
Daniel O'Connor
e3c689ba6b
Fixes #851 Correct the link to be specific to the author
2016-04-11 09:51:52 +09:30
Daniel O'Connor
3644a8124f
Tweak specs, implementation properly
2016-04-09 22:54:03 +09:30
Daniel O'Connor
69fb98146b
Adjust logic
2016-04-09 22:01:05 +09:30
Cesy
594e3470b4
Merge pull request #858 from CloCkWeRX/fix_plant_parts
...
Fix plant parts / harvests issue #853
2016-04-09 13:25:46 +01:00
Daniel O'Connor
7bb7a18b66
Fixes #850 Refactors percentage grown to model, stops rendering progress bars in situations it doesn't make sense. Adds specs.
2016-04-09 21:45:13 +09:30
hcbviolet
e8d7ed0c2d
Edit display_harvest_description method for no description
2016-04-08 17:34:58 -07:00
Cesy
b69bb219a3
Merge pull request #859 from CloCkWeRX/add_title_validations
...
Add title validations
2016-04-03 11:45:10 +01:00
Daniel O'Connor
a9330f2d77
#857 Add length validations to UI
2016-04-03 00:15:45 +10:30
Daniel O'Connor
de8bcc38d3
#857 Add length validations to models
2016-04-03 00:13:38 +10:30
Daniel O'Connor
99a3be08eb
Fixes #853
2016-04-03 00:08:19 +10:30
Daniel O'Connor
d9f04d1fa9
Fixes #853
2016-04-03 00:08:12 +10:30
Daniel O'Connor
668f6d3a2b
Fix 'app/views/harvests/_form.html.haml:39: warning: duplicated key at line 39 ignored: :class'
2016-03-29 00:43:14 +10:30
Mackenzie
90e9017a19
Merge pull request #841 from CloCkWeRX/fix_840_performance
...
Eager load photos to reduce the number of queries executed
2016-03-28 09:55:40 -04:00
Daniel O'Connor
b57cb581dd
#840 Eager load photos
2016-03-28 23:08:26 +10:30
Daniel O'Connor
f23cb78dcb
#840 Eager load photos, which are used in the .interesting? call; so we don't have to do a photos.size call on every single crop.
2016-03-28 23:08:20 +10:30
