mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-05 06:37:25 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 64 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
pozorvlak
19f4ee51ed Merge pull request #891 from Growstuff/dev 
Release 10
release10 		2016-05-22 16:34:18 +01: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
Mackenzie
925027f7f0 add code climate test reporter 2016-05-17 14:02:42 -04:00
Mackenzie
1442a9106c add code climate / travis gem 2016-05-17 13:58:55 -04:00
Mackenzie
fafb421a51 Add code climate to README 
Our code climate score is *abysmal*, but now that I've been using it in my job for a few months, I have some ideas how to improve it. It's all about clean code (check out the book of that name from your local library) and readability. So let's add the grade to the README, and I'll figure out how to set it up so that Code Climate is run on pull requests automatically (telling us whether things are going to get better or worse with every PR).
 2016-05-17 13:47:33 -04: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
436527b902 Merge pull request #837 from Growstuff/dev 
Release 9
release9 		2016-05-16 20:09:00 +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
Daniel O'Connor
12ad16a05a Newlines 2016-04-13 08:41:05 +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
82553d6e0a Avoid time travel in favour of calculating a number of past/future dates 2016-04-11 09:29:06 +09:30
Daniel O'Connor
3644a8124f Tweak specs, implementation properly 2016-04-09 22:54:03 +09:30
Daniel O'Connor
5cfa051d75 Update expectations 2016-04-09 22:43:17 +09:30
Daniel O'Connor
69fb98146b Adjust logic 2016-04-09 22:01:05 +09:30
Cesy
01b9e76814 Merge pull request #860 from CloCkWeRX/fix_warnings 
Fix WARNING: Using the `raise_error` matcher without providing a specific error
 2016-04-09 13:26:11 +01:00
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
Cesy
de4b89fdf7 Merge pull request #861 from hcbviolet/descriptions 
#852 Harvest description headings rendered when there's no description
 2016-04-09 13:08:00 +01:00
hcbviolet
e8d7ed0c2d Edit display_harvest_description method for no description 2016-04-08 17:34:58 -07:00