Paul Mackay
|
ca665dc6bc
|
Merge master into producer-emails.
|
2015-03-04 19:09:43 +00:00 |
|
Maikel Linke
|
3beff77164
|
Merge remote-tracking branch 'origin/master' into group-pages
|
2015-02-26 17:22:13 +11:00 |
|
Maikel Linke
|
69fd3f0b60
|
Fix link to group pages if someone enters "/groups/" instead of "/group"
|
2015-02-26 16:41:51 +11:00 |
|
Rohan Mitchell
|
fa4741eb65
|
Update auto-creation of E2E links: more specific and restricted link creation
|
2015-02-26 13:49:15 +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 |
|
Rohan Mitchell
|
fdde55f631
|
Add spec for ext_url filter, refactor
|
2015-02-23 10:06:42 +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
|
3ab961a7e2
|
New mixin for gradients
|
2015-02-20 16:14:40 +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
|
98063dae60
|
setting default country by id in groups controller
|
2015-02-19 16:57:19 +11:00 |
|
Maikel Linke
|
c01d45e3af
|
Serialize move_up and move_down methods of groups
There have been race conditions in other projects using the acts_as_list
gem which could be solved by serializing.
|
2015-02-19 16:51:58 +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
|
ecd7b16ef5
|
revert setting default country by name in enterprise controller
|
2015-02-19 11:09:43 +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 |
|
Rohan Mitchell
|
f83ceae5d1
|
Fix feature: Enterprises list is shortened when error in bulk update
|
2015-02-18 15:32:56 +11:00 |
|
Maikel Linke
|
08afcac1e5
|
exposing more group attributes to angular
|
2015-02-18 14:55:42 +11:00 |
|
Maikel Linke
|
9496987da6
|
Fix display of admin group side menu
|
2015-02-18 12:04:17 +11:00 |
|
Liv Galendez
|
b9248d3e2c
|
Fixed typo in empty cart error message
|
2015-02-18 10:47:09 +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 |
|
Rohan Mitchell
|
636ed2ad0d
|
Make bi-directional relationships
|
2015-02-13 09:24:48 +11:00 |
|
Rohan Mitchell
|
1d61e91afd
|
When enterprise created, grant permission to all co-owned enterprises, not just hubs
|
2015-02-13 09:24:48 +11:00 |
|
Maikel Linke
|
6b5a1255f8
|
fixing a bunch of tests
|
2015-02-12 16:36:18 +11:00 |
|
Rob Harrington
|
12dc0b93aa
|
Scoping users correctly for realz this time
|
2015-02-12 16:20:46 +11:00 |
|
Rob Harrington
|
5503760ce3
|
Scoping users correctly
|
2015-02-12 13:45:25 +11:00 |
|
Rob Harrington
|
9fa5a9e766
|
Fix before_filter load order for enterprises#shop
|
2015-02-12 11:34:58 +11:00 |
|
Rob Harrington
|
a62f48441d
|
Restrict ability to change managers of enterprises using update action
|
2015-02-12 11:34:58 +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 |
|
Rob Harrington
|
ad1f837c44
|
Admin users can access all users through known_users
|
2015-02-12 11:34:58 +11:00 |
|
Rob Harrington
|
dcb24cf06c
|
Controller method to allow enterprise users to search for other users which share management of their enterprises
|
2015-02-12 11:34:58 +11:00 |
|
Rob Harrington
|
b73619d168
|
Adding known_users method to Spree::User
|
2015-02-12 11:34:58 +11:00 |
|
Rob Harrington
|
dde1a27d3a
|
Adding ability to search for known users
|
2015-02-12 11:34:57 +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 |
|
Rohan Mitchell
|
ca558a4ecc
|
Fix admin tab to check correct permission
|
2015-02-11 11:55:48 +11:00 |
|
Maikel Linke
|
edcef02017
|
link_to_service helper deals with nil
|
2015-02-07 19:40:59 +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 |
|