mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-05 07:01:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,972 Commits 65 Branches 76 Tags
release41
Commit Graph

4972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
8c51d7bdd5 Merge branch 'master' into dev release41 2018-02-18 13:09:56 +13:00
Cesy
64e3b3b4d4 Merge pull request #1565 from Growstuff/awesomecode-style/andor-8234 
Auto corrected by following Style/AndOr
 2018-02-16 08:47:02 +00:00
Brenda Wallace
978523fd94 Merge branch 'dev' into awesomecode-style/andor-8234 2018-02-11 08:50:50 +13:00
Brenda Wallace
97f63d1147 Merge pull request #1583 from Growstuff/dev 
Production hotfix
 2018-02-11 08:42:49 +13:00
Brenda Wallace
1a9ff5eb4c Merge branch 'master' into dev 2018-02-11 08:14:44 +13:00
Brenda Wallace
72b1494db9 Merge pull request #1582 from Br3nda/hotfix-migration 
Don't update flickr photos in migration
 2018-02-11 08:14:00 +13:00
Brenda Wallace
83bba916a4 Don't update flickr photos in migration 2018-02-10 18:41:11 +13:00
Brenda Wallace
64179850ff Merge pull request #1563 from Growstuff/dev 
Release 40
 2018-02-10 09:04:55 +13:00
Brenda Wallace
9cdf2e899f Merge pull request #1569 from Br3nda/remove/paid-accounts 
Removing shop, products, accounts, orders
release40 		2018-02-09 11:09:36 +13:00
Brenda Wallace
2eacf346a8 Merge remote-tracking branch 'origin/remove/paid-accounts' into remove/paid-accounts 2018-02-09 10:53:47 +13:00
Brenda Wallace
aab91e2fa9 Removed active merchant 2018-02-09 10:53:05 +13:00
Brenda Wallace
2217d87b5a Added back the member's last login 2018-02-09 10:53:05 +13:00
Brenda Wallace
44b2251896 Re-instated the member-since text on profiles 2018-02-09 10:53:05 +13:00
Brenda Wallace
f5e20cd2d2 Re-gen rubocop todo 2018-02-09 10:53:05 +13:00
Brenda Wallace
42de726405 Removing shop, products, accounts, orders 2018-02-09 10:53:05 +13:00
Brenda Wallace
65b4c7dbc1 Revert "Auto corrected by following Style/StringLiterals" 
This reverts commit ab56a3c6b3.
 2018-02-09 07:58:47 +13:00
Brenda Wallace
6b6ed7e31c Merge remote-tracking branch 'origin/remove/paid-accounts' into remove/paid-accounts 2018-02-09 07:47:53 +13:00
Brenda Wallace
564901f93f Merge branch 'dev' into remove/paid-accounts 2018-02-09 07:46:51 +13:00
Brenda Wallace
f8127eeec3 Revert "Auto corrected by following Style/StringLiterals" 
This reverts commit ab56a3c6b3.
 2018-02-09 07:44:48 +13:00
Brenda Wallace
33fb2408d6 Merge branch 'dev' into awesomecode-style/andor-8234 2018-02-07 14:25:41 +13:00
Awesome Code
ab56a3c6b3 Auto corrected by following Style/StringLiterals 2018-02-07 10:20:26 +13:00
Brenda Wallace
ef4b4d0c46 Merge branch 'dev' into awesomecode-style/andor-8234 2018-02-07 08:41:30 +13:00
Brenda Wallace
44ba29137d Merge branch 'dev' into remove/paid-accounts 2018-02-07 08:41:17 +13:00
deppbot
ed2fcc2ada Bundle Update on 2018-02-07 2018-02-07 08:40:54 +13:00
Brenda Wallace
0b5c45d08f Merge branch 'dev' into awesomecode-style/andor-8234 2018-02-05 16:13:15 +13:00
Brenda Wallace
54c880a66c Removed active merchant 2018-02-05 15:40:37 +13:00
Brenda Wallace
0699677d05 Added back the member's last login 2018-02-05 14:42:41 +13:00
Brenda Wallace
3c411f15b8 Re-instated the member-since text on profiles 2018-02-05 14:42:05 +13:00
Brenda Wallace
dcf5286275 Re-gen rubocop todo 2018-02-05 14:38:08 +13:00
Brenda Wallace
7e1e2bef91 Removing shop, products, accounts, orders 2018-02-05 14:32:59 +13:00
Brenda Wallace
5cda14f87a Don't update flickr meta data on db rollback 2018-02-05 12:52:59 +13:00
Brenda Wallace
88da0da616 Re-fetches from flickr 2018-02-05 12:52:59 +13:00
Meir Taffel
a69afd87e7 Add date_taken to photos 2018-02-05 12:52:59 +13:00
Brenda Wallace
57bfafccc7 Merge branch 'dev' into awesomecode-style/andor-8234 2018-02-05 12:28:08 +13:00
deppbot
24931381af Bundle Update on 2018-02-03 2018-02-04 08:25:59 +13:00
deppbot
742c7e30a9 Bundle Update on 2018-01-31 2018-01-31 13:12:08 +13:00
Daniel O'Connor
2f3e368ede Merge branch 'dev' into awesomecode-style/andor-8234 2018-01-29 11:45:51 +10:30
Daniel O'Connor
502a20cf10 Merge pull request #1564 from Growstuff/awesomecode-rspec/leadingsubject-8234 
Auto corrected by following RSpec/LeadingSubject
 2018-01-29 11:45:07 +10:30
Brenda Wallace
b2cf022522 Removed extra blank lines 2018-01-29 13:01:49 +13:00
Shiny
3d4598e4e1 style clean up 2018-01-29 12:56:41 +13:00
Awesome Code
94db28b3a9 Auto corrected by following Style/AndOr 2018-01-28 23:47:38 +00:00
Awesome Code
767477df66 Auto corrected by following RSpec/LeadingSubject 2018-01-28 23:47:27 +00:00
Brenda Wallace
7f87ee1018 Fixed default_photo for seeds - uses own photos, not the crop 2018-01-29 09:55:06 +13:00
deppbot
093a948922 Bundle Update on 2018-01-28 2018-01-29 09:54:30 +13:00
deppbot
be1553410f Bundle Update on 2018-01-24 2018-01-29 09:54:20 +13:00
Shiny
caf41e80c9 Patching paperclip gem 2018-01-24 15:07:06 +13:00
deppbot
2eff7d6716 Bundle Update on 2018-01-21 2018-01-23 09:00:34 +13:00
Shiny
df5006c61c Disable jshint 
this is on by default
 2018-01-23 09:00:34 +13:00
Brenda Wallace
1e0565dd9b Tell hound to ignore the bootstrap plugin file 2018-01-23 09:00:34 +13:00
Brenda Wallace
3453a648fa Latest versions of bootstrap accessibility plugin 2018-01-23 09:00:34 +13:00