Brenda Wallace
0c3149205b
Put resources back into namespaces
2019-11-19 13:53:12 +13:00
Brenda Wallace
be4a250c63
renamed files to please rubocop
2019-11-18 11:08:23 +13:00
Brenda Wallace
4f8830676e
Swagger docs
2019-11-18 10:15:06 +13:00
Brenda Wallace
818a980f6d
Move jsonapi resources files
2019-11-18 10:11:53 +13:00
Brenda Wallace
47be6ad631
Merge branch 'dev' into role-admin
2019-10-21 14:24:31 +13:00
Brenda Wallace
c19d09bb37
Switch from unicorn to puma
2019-10-19 18:47:28 +13:00
Brenda Wallace
21848bf5b4
Merge branch 'dev' into role-admin
2019-10-19 09:42:49 +13:00
Brenda Wallace
b0c8b11246
📝 Inline editing and display tidy ups ( #2200 )
...
* Inline editing and display tidy ups
2019-10-08 11:06:53 +13:00
bestest-mensch
80fb4f5fe6
add ability to delete multiple conversations at once
2019-10-07 21:38:19 +00:00
Brenda Wallace
3422a0d899
Administer member's roles
2019-10-06 14:19:39 +13:00
Brenda Wallace
f297fdc677
Inline editing and display tidy ups
2019-10-05 20:58:00 +13:00
Brenda Wallace
7b5698f977
👩🌾 Import openfarm data ( #2177 )
...
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
2019-09-28 17:23:25 +12:00
Brenda Wallace
c4b33db495
Mark read notifications as read after migrating to conversations
2019-08-11 15:50:36 +12:00
Brenda Wallace
b3807100d1
fixes email sending
2019-08-10 11:47:45 +12:00
Brenda Wallace
1199df6d9d
Merge branch 'dev' into mailbox
2019-07-20 19:44:12 +12:00
Brenda Wallace
d91a5bf55f
Rewriting messages functionality to use mail boxer
2019-07-20 19:43:29 +12:00
Brenda Wallace
26839acf01
Turn off message sending until errors are fixed
2019-07-20 13:21:26 +12:00
Brenda Wallace
629352ef4f
Merge remote-tracking branch 'upstream/dev' into mailbox
...
Conflicts:
Gemfile.lock
app/assets/stylesheets/application.scss
db/schema.rb
2019-07-20 13:20:10 +12:00
Brenda Wallace
91897273be
Merge branch 'dev' into ban-hammer
2019-07-16 20:56:59 +12:00
Brenda Wallace
fb77beeb7d
rubocop lint
2019-07-16 20:56:33 +12:00
Brenda Wallace
c8e47e800e
Moved admin ban code to admin controler
2019-07-16 20:54:32 +12:00
Brenda Wallace
e0e10c29dc
Renaming photographings to photo associations
...
now it matches the name of its controller, and it is clearer to understand
2019-07-13 16:13:37 +12:00
Brenda Wallace
7b6dc1943a
Fixes staging linking to production
2019-07-11 15:12:16 +00:00
Brenda Wallace
c50556221c
TRying to get mailboxxer working
2019-07-11 22:28:51 +12:00
Brenda Wallace
93e7703a6a
Add missing translation
2019-07-11 10:18:54 +00:00
Brenda Wallace
5c69dc0528
use badges for unread message count
2019-07-11 10:18:54 +00:00
Brenda Wallace
063c745aca
Add missing translation
2019-07-11 20:13:10 +12:00
Brenda Wallace
29e606a870
use badges for unread message count
2019-07-11 13:17:31 +12:00
Brenda Wallace
87558982b1
Merge branch 'map-fix' into dev
2019-07-09 14:15:04 +12:00
Brenda Wallace
def17e020e
New line at end of file
2019-07-08 21:28:39 +12:00
Brenda Wallace
05ed9de8b6
Add leaflet initializer
2019-07-08 20:51:14 +12:00
Brenda Wallace
050dfda77e
Timeline
2019-07-07 22:03:15 +12:00
Brenda Wallace
fda4d88e5a
Fix up locale spec
2019-07-02 04:52:39 +00:00
Brenda Wallace
ce60d6bb0c
Remove stray \n in translation
2019-07-01 10:28:39 +00:00
Brenda Wallace
dc0607c42a
Remove duplicated translations
2019-06-14 16:28:13 +12:00
Brenda Wallace
d98cb87d95
Wrapped long line
2019-06-14 16:27:28 +12:00
Brenda Wallace
19350e7aa0
Removing phantom
2019-06-14 16:15:49 +12:00
Brenda Wallace
d7b973e684
Add harvest predictions to homepage blurb
2019-06-14 15:58:27 +12:00
Brenda Wallace
040c414827
find translation of some_of_our_crops
2019-06-12 09:27:40 +12:00
Brenda Wallace
7e3d43c47c
add missing translations for buttons
2019-06-12 09:10:37 +12:00
Brenda Wallace
c7ae520d66
add missing translation for "Record Harvest"
2019-06-09 09:54:28 +12:00
Brenda Wallace
73c834adf3
added missing translation
2019-05-25 19:15:35 +12:00
Brenda Wallace
0d3bdc09ab
Tool tips on actions
2019-05-25 17:17:25 +12:00
Brenda Wallace
e4a375de79
Add missing translations
2019-05-24 20:37:32 +12:00
Brenda Wallace
f5d48d1b56
Removing bootstrap 3 - only bootstrap 4
...
because both isn't particularly clever
2019-05-13 07:52:38 +12:00
Brenda Wallace
f5f5ecdea7
Merge remote-tracking branch 'upstream/dev' into material-merge
...
Conflicts:
Gemfile.lock
app/assets/javascripts/application.js
app/assets/stylesheets/application.sass
app/assets/stylesheets/plantings.sass
app/views/crops/_thumbnail.html.haml
app/views/crops/show.html.haml
app/views/home/_members.html.haml
app/views/layouts/application.html.haml
app/views/photos/show.html.haml
app/views/plantings/_descendants.html.haml
app/views/plantings/show.html.haml
app/views/seeds/_thumbnail.html.haml
app/views/shared/_global_actions.html.haml
spec/models/crop_spec.rb
2019-04-21 11:27:27 +12:00
Brenda Wallace
10a7689b05
Lint
2019-04-20 19:30:09 +12:00
Brenda Wallace
f60174a8b9
Merge remote-tracking branch 'upstream/dev' into feature/memcachier
2019-04-19 09:30:48 +12:00
Brenda Wallace
ad90dd6dfa
Fixes wrong host name in emails
2019-04-08 14:23:34 +12:00
Brenda Wallace
629ffa1982
Update translations
2019-03-26 21:10:40 +13:00
