mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-05 04:32:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 100 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
814 Commits
Author SHA1 Message Date
pozorvlak 1b3d106b6d Merge pull request #989 from maco/sparkpost_#917 
update to SparkPost's mailserver
 2016-06-13 18:04:43 +01:00
Mackenzie Morgan e7be006fa7 update to SparkPost's mailserver 2016-06-13 12:12:00 -04:00
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 fd467acc29 Clean up whitespace 2016-06-10 20:51:02 +09:30
Daniel O'Connor df9cf3f5c4 Fix various rails deprecations 2016-06-10 15:58:39 +09:30
pozorvlak b03ccce575 Merge pull request #980 from lucasnogueira/replace_pluralize 
Replace pluralize calls
 2016-06-09 16:39:34 +01:00
Lucas Nogueira 1ca515bd4e Add missing activerecord model to locales 2016-06-08 21:56:29 -03:00
pozorvlak e419acea6e Install BogusPayPalGateway gem 
We were maintaining a vendor fork of active_merchant because they
refused to merge this feature in; it's now been released as a
separate gem.
 2016-06-07 17:43:35 +00:00
Daniel O'Connor bb25cbe5e2 Merge branch 'dev' of github.com:Growstuff/growstuff into likeable 2016-06-04 21:00:52 +09:30
Daniel O'Connor f979da315a Explicitly swap from config.email_regexp = /\A[^@\s]+@([^@\s]+\.)+[^@\W]+\z/ 
to the new default
 2016-06-02 13:50:25 +09:30
Eric Tillberg 3ac42deae5 crop approval flash alert for wranglers upon sign in 2016-05-29 16:13:21 -04:00
Mackenzie Morgan 079cecc529 Swap over to having "(Optional)" (or translation) after optional form elements rather than using placeholder text 
Fixes #848
 2016-05-26 16:53:46 -04:00
Mackenzie Morgan dd0373a3ee Use standardized & translateable strings for the photo show page 
Fixes #876
 2016-05-26 11:51:46 -04:00
Mackenzie Morgan 972518e9fc Stop hard-coding strings for pagination 
Use translation template to set singular/other strings
for .model_name

Fixes #855
 2016-05-25 23:15:36 -04:00
Mackenzie Morgan d227601627 Add config/factory_girl.rb so that rspec doesn't fail with a confusing 
'Could not find mapping for #<Member...' error
http://blog.thefrontiergroup.com.au/2011/03/reloading-factory-girl-factories-in-the-rails-3-console/
 2016-05-25 17:35:57 -04: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
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
Cesy Avon da1375e34d Making database.yml locally editable 2016-05-22 15:50:22 +00: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
Cesy 46ee2168e1 Merge pull request #831 from CloCkWeRX/add_selenium 
Add additional capyabara driver options
 2015-09-16 11:59:22 +01:00
Daniel O'Connor 78a65f26c6 Add configuration into example file 2015-09-16 14:16:42 +09:30
Daniel O'Connor 00ca01dc33 Add coverage of the most basic scenarios around sign up and login 2015-09-15 11:20:33 +09:30
Jim Stallings b8b511e747 GS-658 - use yaml anchor for duplicate values 2015-08-30 11:02:47 -04:00
Jim Stallings 85f7ca4058 GS-658 - internationalize drop down links and page titles 2015-08-29 18:39:38 -04:00
Daniel O'Connor 9a68c7e1c3 #645 Add a 'finish signup' flow 2015-08-24 11:41:36 +09:30
Daniel O'Connor 3a05f75ab0 #645 Add notes around permissions/scopes of later interest 2015-08-21 13:43:24 +09:30
Daniel O'Connor 34b4d30014 #645 Enable account creation or authorisation from a facebook signin (and should work for others with minimal extra work) 2015-08-21 13:22:49 +09:30
Daniel O'Connor 89b6c47bfb #645 Configure devise / omniauth in only one spot, to avoid CSRF errors 2015-08-21 12:21:55 +09:30
Daniel O'Connor df5689ec18 #645 Rename 2015-08-21 11:36:26 +09:30
Daniel O'Connor 22d72b13d5 #645 Add example keys 2015-08-21 11:36:17 +09:30
Daniel O'Connor 07eb305992 #645 Ask for name, email address only 2015-08-21 11:25:57 +09:30
Daniel O'Connor c7f0076ee6 #645 Add facebook omniauth middleware 2015-08-21 11:21:44 +09:30
Cesy fd3e69c9ab Removing footer translation as it's now in the CMS 2015-08-12 14:57:13 +00:00
Cesy b6dfeb980c i18n example 2015-08-12 14:56:36 +00:00
Miles Gould d4d210447a Set staging secret key from environment 2015-07-09 00:47:11 +01:00
pozorvlak edcbc939e3 Merge pull request #728 from oshiho3/575-one-click-email-unsubscribe 
#575 One click email unsubscribe
 2015-07-08 22:06:29 +01:00
AELOGICA 429e54733d Moved the geocoder stub to ./cofig/environments/test.rb 2015-07-01 10:57:28 +08:00
AELOGICA 9bd7448ae6 Added the feature test for searching places 2015-06-26 09:17:08 +08:00
gabrielsandoval 0e2a5fd205 Added search form on the places index page. 2015-06-21 15:24:07 +08:00
Andrey e35ebab380 Reply to notification action 2015-05-27 11:56:24 +10:00
Skud add275e772 Merge pull request #710 from cesy/secrets 
Switching to new secrets format
 2015-05-20 10:05:46 +10:00
Jake Yesbeck 0f8d1e7db1 Change the render to render the file directly 
Also assert that the response is the actual file contents
instead of mocking the method call
 2015-05-04 23:37:40 -07:00
Jake Yesbeck 507e5a0ebc Robots controller and custom robots.txt files 
New route to /robots.txt and some specific logic to switch
on if the subdomain is staging or not.

Staging will not allow any crawlers at all, production does not
have any current limitations
 2015-05-04 23:11:41 -07:00
Shiho Takagi 0f52ea5aad one click unsubscription 2015-02-25 10:26:04 +11:00
Cesy Avon 2740b5e47b Correcting the environment variable name for secret token so Heroku is not impacted 2015-02-23 13:37:43 +00:00
Mackenzie ac6aa730c1 Merge pull request #711 from maco/cms 
move cms admin to /admin/cms at skud's request
 2015-02-17 00:30:38 -05:00
Mackenzie Morgan cd12412b46 move cms admin to /admin/cms at skud's request 2015-02-16 23:19:25 -05:00
Cesy Avon 9b195d1d2e Fixing line break 2015-02-16 13:42:57 +00:00