Paul Mackay
|
ca665dc6bc
|
Merge master into producer-emails.
|
2015-03-04 19:09:43 +00:00 |
|
Maikel Linke
|
69fd3f0b60
|
Fix link to group pages if someone enters "/groups/" instead of "/group"
|
2015-02-26 16:41:51 +11:00 |
|
Maikel Linke
|
1f7aec0c1d
|
group owner select box in own tab
|
2015-02-26 13:09:46 +11:00 |
|
summerscope
|
122cf6c065
|
Groups index page styling for responsive use cases.
|
2015-02-25 10:22:33 +11:00 |
|
summerscope
|
9daf7e3955
|
Removing spans on follow icons as these show up as blank spaces when no data to fill.
|
2015-02-25 09:38:07 +11:00 |
|
Maikel Linke
|
f8153c07b1
|
moving email from "web" to "contact" on group edit page
|
2015-02-22 16:20:11 +11:00 |
|
Maikel Linke
|
eade689070
|
linkToService directive to generate external links
|
2015-02-22 16:15:04 +11:00 |
|
summerscope
|
e05d64a0b4
|
WIP on groups index page. Needs work from Maikel or Rohan.
|
2015-02-20 16:43:36 +11:00 |
|
summerscope
|
985887334f
|
Tweak the padding between header and tabs.
|
2015-02-20 16:43:03 +11:00 |
|
summerscope
|
3aa06ee1e4
|
Tabs styling for groups page - making it pretty.
|
2015-02-20 16:14:50 +11:00 |
|
summerscope
|
60b7a571c5
|
Tweak styling and markup for contact info in right column.
|
2015-02-20 15:35:07 +11:00 |
|
Rohan Mitchell
|
f58219eb3d
|
Split inputs into separate partials for each fieldset
|
2015-02-20 11:36:30 +11:00 |
|
Rohan Mitchell
|
176db78e64
|
Extract data fetching from views
|
2015-02-20 11:17:01 +11:00 |
|
Maikel Linke
|
d5c2abdd7e
|
stripping "undefined" in after_find and after_save callbacks instead of overriding getters
|
2015-02-19 16:33:43 +11:00 |
|
Maikel Linke
|
a0f0b3c93b
|
display only activated enterprises to add to groups
|
2015-02-19 11:14:25 +11:00 |
|
Maikel Linke
|
718a5911a3
|
code style and cleanup
|
2015-02-19 10:48:39 +11:00 |
|
Maikel Linke
|
bbac5aa803
|
Using pure css for styling odd and even menu items
|
2015-02-19 10:22:37 +11:00 |
|
Maikel Linke
|
346a4e71d0
|
side menu partial does not require showItem defined
|
2015-02-19 10:17:58 +11:00 |
|
Maikel Linke
|
08afcac1e5
|
exposing more group attributes to angular
|
2015-02-18 14:55:42 +11:00 |
|
Maikel Linke
|
903bd21577
|
Merge remote-tracking branch 'origin/master' into group-pages-merge
Conflicts:
README.markdown
db/schema.rb
|
2015-02-13 15:42:36 +11:00 |
|
Maikel Linke
|
6b5a1255f8
|
fixing a bunch of tests
|
2015-02-12 16:36:18 +11:00 |
|
Rob Harrington
|
5c09ebf138
|
Adding manager managment to enterprise edit form
|
2015-02-12 11:34:58 +11:00 |
|
Rob Harrington
|
ee5ab22501
|
Moving interface for changing owner to new 'Users' tab
|
2015-02-12 11:34:58 +11:00 |
|
Maikel Linke
|
773a5480e9
|
Activate search input for groups again
|
2015-02-12 10:44:20 +11:00 |
|
Maikel Linke
|
0fdf313424
|
Fixing img display of producers if no logo present
|
2015-02-12 10:31:13 +11:00 |
|
Maikel Linke
|
211e9c33a7
|
Fixing link to group website
|
2015-02-07 19:31:16 +11:00 |
|
Maikel Linke
|
2293623d2c
|
Display default group logo if no logo was uploaded
|
2015-02-07 19:24:36 +11:00 |
|
summerscope
|
90ba1d2198
|
Updating the groups header to behave better with a square thumbnail logo image.
Intention is for a square image constrained by PaperClip as per enterprise logos (later down the track)
|
2015-02-06 17:15:40 +11:00 |
|
summerscope
|
78877f591b
|
Fix template so website links work to push to external pages
|
2015-02-06 13:58:04 +11:00 |
|
summerscope
|
755adf4287
|
Index page stop-gap improvements until we get more variables to display in this list. Commented out search field not working
|
2015-02-06 13:41:58 +11:00 |
|
summerscope
|
9547f91f46
|
Groups page rejig the layout to make contact column skinnier in most use cases. Obscure email and website with CTA words for fixed width on content. Styling for anchor fix global issue
|
2015-02-06 13:31:33 +11:00 |
|
Maikel Linke
|
30601b9203
|
tidy up group contact with helpers
|
2015-02-05 20:20:28 +11:00 |
|
Maikel Linke
|
504a053693
|
link_to_ext helper for group pages
|
2015-02-05 17:21:41 +11:00 |
|
summerscope
|
148333467f
|
Groups styling and markup - finishing up contact info partial etc
|
2015-02-05 17:14:56 +11:00 |
|
Maikel Linke
|
242fb49276
|
checking for undefined phone number in model
|
2015-02-05 16:17:29 +11:00 |
|
Maikel Linke
|
37dbd376e9
|
fixing indent
|
2015-02-05 15:54:53 +11:00 |
|
Maikel Linke
|
b641de6ec9
|
Merge branch 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages
Conflicts:
app/views/groups/show.html.haml
|
2015-02-05 15:52:00 +11:00 |
|
Maikel Linke
|
313843d798
|
moving contact partial and giving example code
|
2015-02-05 15:50:33 +11:00 |
|
summerscope
|
f2e3d298fa
|
More styling for responsive sizes groups header
|
2015-02-05 15:17:50 +11:00 |
|
summerscope
|
e19aaf6be8
|
Styling tabs for responsive design, improving groups page layout
|
2015-02-05 14:53:09 +11:00 |
|
summerscope
|
28b2dd40dd
|
Kill the pad top for Producers tab content too
|
2015-02-05 12:31:38 +11:00 |
|
summerscope
|
c9bbe80738
|
Remove padding class to producers tab content
|
2015-02-05 12:28:24 +11:00 |
|
Maikel Linke
|
0f7b880409
|
restoring groups hubs tab
|
2015-02-05 12:23:08 +11:00 |
|
Maikel Linke
|
78a8f8c1bb
|
Merge remote-tracking branch 'origin/group-pages' into group-pages
|
2015-02-05 12:07:52 +11:00 |
|
summerscope
|
b1b1aa5b1e
|
Groups page WIP with mikael and rob
|
2015-02-05 12:07:11 +11:00 |
|
Maikel Linke
|
a7c2a73fa8
|
make groups editable by group owners
|
2015-02-05 12:05:39 +11:00 |
|
Maikel Linke
|
91b35d068c
|
Adding owner to groups
Groups have owners and users own groups. The owners are displayed and
changable on the group's page by admin users.
|
2015-02-02 15:58:34 +11:00 |
|
summerscope
|
5ea3733c8a
|
Groups page styling WIP
|
2015-01-30 14:07:38 +11:00 |
|
summerscope
|
d99a54accf
|
WIP groups individual page template markup - still needs alot of love.
|
2015-01-29 17:43:36 +11:00 |
|
summerscope
|
fcd9653a79
|
Add padding to groups homepage
|
2015-01-29 15:52:40 +11:00 |
|