mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-18 13:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,231 Commits 63 Branches 82 Tags
fb9a1fdfd33a7f73df3271f95e4e9ad4e7d6a922
Commit Graph

479 Commits

Author SHA1 Message Date
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
Brenda Wallace
fb6f1ac0a8 Changed whitelisting of what can have photos 2016-11-21 10:05:52 +13:00
Brenda Wallace
069343803e List of types that can have photos in own method 2016-11-20 21:46:58 +13:00
Brenda Wallace
8012d9f6a8 Whitelist which items can have photos 2016-11-20 21:02:43 +13:00
Brenda Wallace
73a050df13 before_filter becomes before_action 
in photos controller
 2016-11-20 20:29:45 +13:00
Brenda Wallace
138080c4d4 Tabulation fix 2016-11-20 20:18:20 +13:00
Brenda Wallace
cf70bfebe9 Further simplified photos controller 2016-11-20 20:17:27 +13:00
Brenda Wallace
f4a26d0580 has_item_id? renamed to item_id? 2016-11-20 09:06:04 +13:00
Brenda Wallace
0a54c2d986 Moved to method: collection to use for photos 2016-11-20 09:05:29 +13:00
Brenda Wallace
9c4f011fbc Reduced percieved complexity in photos_controller.rb 2016-11-19 22:28:38 +13:00
Brenda Wallace
2872a1c29d Wrapped all long lines. 
reduced rubocop's line length limit to 120
 2016-11-17 22:02:18 +13:00
Brenda Wallace
6bd9bd98d9 Removed extra blank lines, & added a end of file 2016-11-16 12:52:48 +13:00
Brenda Wallace
510c31f669 Removed 3 blank lines that codeclimate didn't like 2016-11-14 15:10:13 +13:00
Brenda Wallace
bdb057ca0f Removed all trailing white space 2016-11-14 15:05:32 +13:00
Brenda Wallace
c6413afa67 allow registration and signin/out on the API 2016-09-11 14:23:50 +12:00
Cesy
fe137a11bb Merge pull request #1031 from CloCkWeRX/queue_mail 
Queue mail in sidekiq
 2016-08-24 10:38:13 +01:00
Daniel O'Connor
b91f0e7f63 Whitelist providers to avoid session data being tampered with 2016-08-22 18:59:28 +09:30
Daniel O'Connor
87352b04f1 Refactor to a method to DRY, even if its not 100% the best spot for it to live long term 2016-08-22 18:52:12 +09:30
Daniel O'Connor
20b87e596a Modern syntax 2016-08-22 18:25:57 +09:30
Daniel O'Connor
4b7cffad04 DEPRECATION WARNING: [Devise] bypass option is deprecated and it will be removed in future version of Devise. 2016-08-22 16:42:08 +09:30
Daniel O'Connor
c7be0f3b0e Fix redirects and sign the user in if they weren't yet created 2016-08-22 16:35:58 +09:30
Daniel O'Connor
5d70d822eb #951 Swap to deliver_later implementation 2016-08-16 10:55:40 +09:30
Daniel O'Connor
7f6a1a424d Merge remote-tracking branch 'upstream/dev' into add_facebook_signup 2016-08-15 23:13:55 +09:30
Daniel O'Connor
6b059cb4f4 Clean up a bit as per #1013 with TODO comments 2016-07-08 17:06:05 +09:30
Daniel O'Connor
c803ed4ee6 Merge pull request #976 from pozorvlak/remove_default_shows 
Remove "show" methods that just do the default
 2016-07-08 16:56:25 +09:30
Daniel O'Connor
43e7d6f7c2 Merge remote-tracking branch 'upstream/dev' into add_facebook_signup 2016-07-05 03:09:36 +09:30
Daniel O'Connor
c3d9885525 Merge pull request #987 from CloCkWeRX/upgradazzle_rails 
Upgrade to rails 4.2.0+ (round 2)
 2016-06-29 14:47:05 +09:30
Mackenzie
b08a448fdc hotfix commit: letsencrypt try #2 2016-06-20 13:40:49 -04:00
Mackenzie Morgan
039978357b letsencrypt verification for staging 2016-06-20 11:48:19 -04:00
pozorvlak
a66a040207 Revert "Handled Issue #950 (Branded Error Pages)" 2016-06-16 12:58:22 +01:00
Prashanth
483143f2fe Merge branch 'growstuff-dev' into dev 
Conflicts:
	CONTRIBUTORS.md
 2016-06-14 17:09:06 +05:30
Prashanth
b9f40151d8 Handled Issue #950 (Branded Error Pages) 
Moved error related views from public to errors (asset pipeline can be used).
Header and footer were included along with the error message.
 2016-06-10 18:35:48 +05:30
Daniel O'Connor
7fe75ee52a Fix DEPRECATION WARNING: #deliver is deprecated. 2016-06-10 15:45:01 +09:30
pozorvlak
f3dc2ff7e5 Replace deprecated Devise for method with permit 
This should eliminate the screens-ful of deprecation warnings when
running the test suite.
 2016-06-08 15:00:05 +00:00
pozorvlak
e6209a5906 Remove "show" methods that just do the default 
We can just fall back to the default implementation for these.
 2016-06-08 15:58:45 +01:00
pozorvlak
a8961c3466 Revert "Show concern" 2016-06-08 12:58:32 +01:00
Mackenzie Morgan
ed468e79fc Merge branch 'dev' of gitmaco:Growstuff/growstuff into show_concern 2016-06-07 09:57:47 -04:00
Eric Tillberg
3ac42deae5 crop approval flash alert for wranglers upon sign in 2016-05-29 16:13:21 -04:00
Mackenzie Morgan
8c2aa4844f use CW's case statement idea 2016-05-25 15:15:09 -04:00
Mackenzie Morgan
8648db5518 create SimpleShow concern for models where show's json call is simple 2016-05-25 13:37:01 -04:00
Mackenzie Morgan
b601fe40b3 refactor photo controller create for readability 2016-05-24 16:59:52 -04:00
Daniel O'Connor
083035c924 Merge branch 'dev' of github.com:Growstuff/growstuff into add_facebook_signup 2016-05-23 16:58:22 +09:30
Cesy
f5b20c2f32 About is empty, policy won't work without the routes 2016-05-22 16:01:40 +00:00
twconquest
397bfd8bca Start removing static page references. 2016-05-22 16:01:40 +00: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
Daniel O'Connor
7256c28038 Refactor to a separate class, containing domain logic 2015-09-15 12:13:47 +09:30
Savant Krishna
9e7a80cb86 Fix bug #827 : Error in generating csv file for plantings with owner filter 2015-09-07 04:01:20 -04:00
Daniel O'Connor
8a739b31a1 Minor style 2015-08-27 12:18:09 +09:30
Daniel O'Connor
afec210219 #645 #556 Add facebook links 2015-08-27 12:02:48 +09:30