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

4522 Commits

Author SHA1 Message Date
Daniel O'Connor
70f48108b4 #645 Add handling for facebook 2015-08-21 12:21:23 +09:30
Daniel O'Connor
dee7ff34c9 #645 Indicate that a member is omniauthable, so devise knows to render sign-in-with-facebook 2015-08-21 11:36:04 +09:30
pozorvlak
c404d8220d Merge pull request #791 from cesy/cachethumbnails 
Cache thumbnails
 2015-08-19 15:11:16 +01:00
Cesy
48409698ab Merge pull request #787 from twconquest/show-roles 
Show roles in member profile page
 2015-08-19 14:13:32 +01:00
twconquest
24df32ba7f Merge upstream/dev into show-roles and re-add myself to CONTRIBUTORS.md 
Conflicts:
	CONTRIBUTORS.md
 2015-08-17 17:48:50 +00:00
Cesy
b6dfeb980c i18n example 2015-08-12 14:56:36 +00:00
Cesy
e8266480e5 Adding bootstrap-accessibility plugin 2015-08-12 14:17:41 +00:00
Cesy
e784ec9b33 Making it trigger the crop thumbnail cache properly 2015-08-12 11:45:18 +00:00
Cesy
1df0c36e72 Keying the cache correctly 2015-08-12 10:49:48 +00:00
Cesy
a5e7a8d315 Cache crop thumbnails 2015-08-12 10:49:48 +00:00
Cesy
12a1484a26 Merge pull request #800 from CloCkWeRX/fix_all_checkbox_labels 
Fix more checkbox labels in registration and email editing
 2015-08-11 09:51:05 +01:00
Daniel O'Connor
97cf1347d5 Fix clickable area for checkboxes in email editing 2015-08-11 13:45:47 +09:30
Daniel O'Connor
367e298d48 Fix clickable area for checkboxes in registration 2015-08-11 13:44:17 +09:30
Daniel O'Connor
b788cb44ef Remember that we're working in haml, not slim. 2015-08-11 10:23:50 +09:30
Daniel O'Connor
f61e2438e8 Style checkbox for 'remember me' and allow it to be clickable (minor usability/mobile UI annoyance) 2015-08-10 16:08:09 +09:30
pozorvlak
e503b1079d Merge pull request #796 from cesy/issue677 
Fix #677 by adding organic/GMO/heirloom to CSV and RSS
 2015-08-06 14:54:10 +01:00
pozorvlak
ccca343959 Merge pull request #795 from cesy/issue788 
Fix issue #788 with uncaught nil
 2015-08-06 14:46:53 +01:00
Cesy
17c5fd61a3 Fix #677 by adding organic/GMO/heirloom to CSV and RSS 2015-08-06 12:23:00 +00:00
Cesy
44b8500fa8 Fix issue #788 with uncaught nil 2015-08-06 12:12:29 +00:00
Cesy
5a12b47c7c Revert "Revert "Fixing relative caching of post summary on homepage, fixed #789"" 2015-08-06 12:37:59 +01:00
Cesy
de981689fc Revert "Merge pull request #775 from pozorvlak/speed_up_homepage" 
This reverts commit fa50ff47bb, reversing
changes made to 5b19d236d0.

Once fixed, please read https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.html carefully to get it back in properly.
 2015-08-06 10:56:46 +00:00
Cesy
9682300b85 Merge pull request #785 from sha1sum/notification_pagination 
Resolved #562 - Pagination of notifications.
 2015-08-06 10:40:02 +01:00
Cesy
fa50ff47bb Merge pull request #775 from pozorvlak/speed_up_homepage 
Speed up homepage by calculating "interesting" things more efficiently
 2015-08-05 19:18:56 +01:00
Cesy
5b19d236d0 Merge pull request #783 from pozorvlak/remove_last_count_calls 
Replace the last few .count and .length calls with .size where possible
 2015-08-05 18:57:04 +01:00
Cesy
cad2c90a4f Merge pull request #784 from pozorvlak/fail_noisily_if_no_secret 
Check existence of secret token before using it.
 2015-08-05 16:03:31 +01:00
Anthony Atkinson
bc9a025788 Merge branch 'dev' into notification_pagination 2015-08-01 11:38:01 -04:00
pozorvlak
de63fdc952 Merge pull request #786 from sha1sum/open_service_in_footer 
Resolves #617 - Open Service graphic link in footer
 2015-07-28 22:00:19 +01:00
twconquest
1019834c41 Merge branch 'dev' into show-roles 
Conflicts:
	spec/features/member_profile_spec.rb
 2015-07-28 19:42:55 +00:00
twconquest
362f7a78b1 Add feature test for showing roles 2015-07-28 19:33:05 +00:00
Anthony Atkinson
9d62c012f1 Resolves #617 - Open Service graphic link in footer 2015-07-25 13:34:16 -04:00
Anthony Atkinson
cbb50df8d0 Resolved #562 - Pagination of notifications. 2015-07-25 13:18:30 -04:00
Miles Gould
91a128ae7e Check existence of secret token before using it. 
People were forgetting to create config/environment.yml, which meant
that RAILS_SECRET_TOKEN wasn't being set, which meant that all tests
involving notifications failed. Unfortunately, the resulting wall of
error messages (https://gist.github.com/sha1sum/5debae6b700ff8fc0c76)
did not make the root cause remotely clear, leading to much confusion
and head-scratching all round.

This commit checks for the existence of RAILS_SECRET_TOKEN and fails
with an informative error message if it's missing.
 2015-07-24 15:16:31 +01:00
Miles Gould
d9dd797c33 Merge branch 'pr/782' into dev 2015-07-24 11:09:35 +01:00
Miles Gould
f970fc4db2 Fix another whitespace problem. 2015-07-24 11:09:22 +01:00
Miles Gould
8873986562 Merge branch 'pr/779' into dev 2015-07-24 11:05:21 +01:00
Miles Gould
40b5a47aae Remove trailing whitespace 2015-07-23 23:22:45 +01:00
Miles Gould
f29c0ad085 Replace .length calls with .size 2015-07-23 23:21:55 +01:00
Miles Gould
96b0198d41 Replace remaining calls to count() with size() 
The couple that aren't removed are required: for instance, there's a
Crop.count method, but no Crop.size method.
 2015-07-23 23:05:39 +01:00
Mackenzie Morgan
e3738ca0c6 whitespace tab/space correction 2015-07-23 13:56:23 -04:00
Mackenzie Morgan
b0d4f9c731 switch homepage and members/ page member thumbnails to be a flexbox layout so it's more responsive. Fixes #780 2015-07-23 13:56:07 -04:00
Anthony Atkinson
bc058b9152 Missed a few optional field placeholders on Seed form. 2015-07-23 11:36:40 -04:00
AELOGICA
aa3cf729c8 Added feature tests for on gardens, seeds and harvests for the card based thumbnails 2015-07-23 15:44:27 +08:00
AELOGICA
611adc0728 Fixed test errors for seeds and garden thumbnails. 2015-07-23 15:44:26 +08:00
AELOGICA
a97acfb1ca Fixed display of edit glyphicon based on edit priviledge. 2015-07-23 15:44:26 +08:00
AELOGICA
7e03ef1687 Fixed display of plantings on gardens thumbnail. 2015-07-23 15:44:26 +08:00
AELOGICA
c12791e428 Created card-based thumbnails for Seeds and Gardens page. 2015-07-23 15:44:25 +08:00
AELOGICA
bbe7d967b4 Changed px to em and used truncate instead of srolling for long harvest descriptions. 2015-07-23 15:44:25 +08:00
AELOGICA
f5336bd8f8 Created card based template for harvests. 2015-07-23 15:44:25 +08:00
Anthony Atkinson
4786e3e087 Marking required and optional fields on Garden form. 2015-07-22 11:07:32 -04:00
Anthony Atkinson
715a004b13 Marking required and optional fields on Seed form. Purposefully marked required those select fields which have no blank option. 2015-07-22 11:05:21 -04:00