summerscope
|
60b7a571c5
|
Tweak styling and markup for contact info in right column.
|
2015-02-20 15:35:07 +11:00 |
|
Rohan Mitchell
|
f8ca24c5cd
|
Index enterprise_groups address_id
|
2015-02-20 14:56:16 +11:00 |
|
Rohan Mitchell
|
f58219eb3d
|
Split inputs into separate partials for each fieldset
|
2015-02-20 11:36:30 +11:00 |
|
Rohan Mitchell
|
4554c0555d
|
Change locking to use postgres syntax, fixes 'must be first statement in transaction' error
|
2015-02-20 11:31:39 +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
|
a7b723af93
|
owner index for enterprise groups
|
2015-02-19 13:23:50 +11:00 |
|
Maikel Linke
|
6a29b830c2
|
commenting changes in overridden adaptivemenu.js
|
2015-02-19 11:35:06 +11:00 |
|
Maikel Linke
|
8e83c6679a
|
extended test of owned groups
|
2015-02-19 11:25:31 +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 |
|
Rohan Mitchell
|
224864a8d8
|
Merge pull request #385 from openfoodfoundation/empty-cart-typo
Fixed typo in empty cart error message
|
2015-02-18 10:59: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 |
|
Maikel Linke
|
87686848bc
|
make group contact fields not null
|
2015-02-13 15:39:44 +11:00 |
|
Rohan Mitchell
|
32a898b6a2
|
Remove unnecessary db:schema:load db:seed, these are performed by db:setup
|
2015-02-13 09:26:34 +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
|
57e838898f
|
Update documentation of database setup
db:setup is doing db:schema and db:seed already
|
2015-02-12 11:05:21 +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
|
46aee6f77c
|
Upgrade Rails to 3.2.21
|
2015-02-11 14:30:49 +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 |
|
Maikel Linke
|
9e51b19f98
|
right mapping of contributer's names in git
|
2015-02-07 18:12:34 +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
|
f292be8c92
|
Making styling of underlines for contact same color as HRs, bit lighter and brigher
|
2015-02-06 13:50:34 +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 |
|