Kristina Lim
|
f5c44ef0e6
|
Rename "entreprise" in i18n keys to "enterprise"
|
2018-08-31 15:26:30 +08:00 |
|
Maikel Linke
|
2a3b3b6dd2
|
Merge remote-tracking branch 'origin/master' into i18n-hackathon
Conflicts:
app/assets/javascripts/admin/enterprise_fees.js
app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
app/views/admin/shared/_columns_dropdown.html.haml
app/views/admin/variant_overrides/_header.html.haml
app/views/admin/variant_overrides/_products.html.haml
spec/features/admin/bulk_order_management_spec.rb
spec/features/admin/variant_overrides_spec.rb
|
2016-03-11 15:38:28 +11:00 |
|
Maikel Linke
|
02cbad2697
|
Remove duplicate lines from merging
|
2016-03-09 18:49:35 +11:00 |
|
Rob Harrington
|
3f466e86b6
|
Renaming 'Override Variant Details' permission to 'Add Products To Inventory'
Style changes to make enterprise relationships page more useable
|
2016-03-02 12:10:49 +11:00 |
|
Edem
|
d2ec4fcf88
|
Everything string translated in admin/entreprise_relationships
|
2015-12-21 10:11:06 +01:00 |
|
Edem
|
2a2f8f3531
|
admin entreprise_group are translated!
|
2015-12-21 09:47:18 +01:00 |
|
Maikel Linke
|
c6d01055d6
|
updating relationship spec
|
2015-06-12 19:32:56 +10:00 |
|
Maikel Linke
|
d717c38f6d
|
Filter relationships by permission
|
2015-06-12 17:03:17 +10:00 |
|
Maikel Linke
|
f2bc98e812
|
E2E: select all permissions
|
2015-06-12 17:03:17 +10:00 |
|
Rob H
|
20bfcd6e48
|
Switching enterprise relationships form around
|
2014-09-05 17:11:57 +10:00 |
|
Rohan Mitchell
|
0b61872d96
|
Revert 5ede8d1, reinstating a4be0ff..7b89e6a
|
2014-08-29 16:38:10 +10:00 |
|
Rob H
|
5ede8d169f
|
Revert a4be0ff..7b89e6a for deployment
|
2014-08-28 14:32:57 +10:00 |
|
Rohan Mitchell
|
7b89e6aa80
|
Revert "Comment out ERPs which have confusing names, use old 'permits'"
This reverts commit a4be0ff55a.
|
2014-08-28 10:12:06 +10:00 |
|
Rohan Mitchell
|
1871d42e68
|
Switch to correct grammatical ordering of child/parent enterprise on enterprise relationships page
|
2014-08-28 10:09:50 +10:00 |
|
Rob H
|
a4be0ff55a
|
Comment out ERPs which have confusing names, use old 'permits'
|
2014-08-27 17:07:30 +10:00 |
|
Rohan Mitchell
|
3932884dba
|
Admin can create enterprise relationships with permissions
|
2014-08-25 14:59:10 +10:00 |
|
Rohan Mitchell
|
50c559964c
|
Display enterprise relationship permissions
|
2014-08-25 13:28:02 +10:00 |
|
Rohan Mitchell
|
cb615ba994
|
Render enterprise relationships JSON with AMS instead of rabl
|
2014-08-25 13:07:31 +10:00 |
|
Rohan Mitchell
|
06955a024f
|
Enterprise user can only create relationships with their own enterprises as parent
|
2014-05-22 11:02:03 +10:00 |
|
Rohan Mitchell
|
a049266732
|
Replace enterprise relationship parent/child concepts with 'X permits Y'
|
2014-05-21 16:28:27 +10:00 |
|
Rohan Mitchell
|
0c647841a6
|
Add dynamic filter to enterprise relationships
|
2014-05-21 16:18:07 +10:00 |
|
Rohan Mitchell
|
92292c853d
|
Extract partials from enterprise relationships admin page
|
2014-05-21 15:03:29 +10:00 |
|
Rohan Mitchell
|
18886c931f
|
Extract create EnterpriseRelationship to service
|
2014-05-21 11:29:11 +10:00 |
|
Rohan Mitchell
|
5d0680234d
|
Admin can delete enterprise relationships
|
2014-05-21 11:29:11 +10:00 |
|
Rohan Mitchell
|
b9a9937541
|
Attempting to create a relationship with invalid data shows an error message
|
2014-05-21 11:29:11 +10:00 |
|
Rohan Mitchell
|
9b2a80c6b5
|
Admin can create enterprise relationships
|
2014-05-21 11:29:11 +10:00 |
|
Rohan Mitchell
|
5f4e4ebeb0
|
Admin can list enterprise relationships
|
2014-05-21 11:29:11 +10:00 |
|
Rohan Mitchell
|
f7de504d89
|
Add stub angular controller for managing enterprise relationships
|
2014-05-21 11:29:11 +10:00 |
|
Rohan Mitchell
|
aa53d82386
|
Add stub page for managing enterprise relationships
|
2014-05-21 11:29:11 +10:00 |
|