Will Marshall
|
22dc8cbfa0
|
Unbreaking karma karma lama
|
2014-04-25 12:04:15 +10:00 |
|
summerscope
|
c91e3aaa79
|
Removing useless hubs requirement in Hub service
|
2014-04-25 11:41:41 +10:00 |
|
summerscope
|
386908a947
|
Adding in copy for modals
|
2014-04-25 11:32:25 +10:00 |
|
Will Marshall
|
2212156f00
|
Adding handling of 'current hub'
|
2014-04-25 11:32:02 +10:00 |
|
Will Marshall
|
f57020d190
|
Fixing a bug with modals
|
2014-04-25 11:09:27 +10:00 |
|
summerscope
|
4b87e39fd7
|
Adding in content for modals
|
2014-04-24 17:13:53 +10:00 |
|
Will Marshall
|
9ef7023600
|
Adding template cache injection
|
2014-04-24 17:05:10 +10:00 |
|
Will Marshall
|
962a9cb5f7
|
Moving partials from darkswarm to hubs
|
2014-04-24 16:53:46 +10:00 |
|
Will Marshall
|
f9b7b602da
|
Moving from darkswarm to home
|
2014-04-24 16:53:00 +10:00 |
|
Will Marshall
|
f6bfc71c4b
|
Various small functional tweaks
|
2014-04-24 16:28:12 +10:00 |
|
summerscope
|
4b95b9979e
|
Homepage styling and pretties
|
2014-04-24 14:12:27 +10:00 |
|
summerscope
|
47468127c2
|
New pictures added
|
2014-04-24 13:56:30 +10:00 |
|
summerscope
|
7b794324d3
|
Adding pretty pictures
|
2014-04-24 13:53:08 +10:00 |
|
Will Marshall
|
5ea97b0919
|
Merge branch 'darkswarm_home' of github.com:openfoodfoundation/openfoodnetwork into darkswarm_home
|
2014-04-24 11:06:46 +10:00 |
|
Will Marshall
|
9bb0abbe48
|
Merge branch 'master' into darkswarm_home
|
2014-04-24 10:52:33 +10:00 |
|
summerscope
|
7c11a4082f
|
Styling tagline
|
2014-04-24 10:46:55 +10:00 |
|
Will Marshall
|
3ed569b24a
|
Patching a couple of borked specs
|
2014-04-24 09:52:29 +10:00 |
|
Will Marshall
|
b4da348e36
|
Patching a json test
|
2014-04-23 16:58:38 +10:00 |
|
Will Marshall
|
c060019873
|
Adding a learn more modal, restructuring partials
|
2014-04-23 16:48:53 +10:00 |
|
Will Marshall
|
0479a0a55d
|
Fixing bugs, improving dates
|
2014-04-23 15:46:14 +10:00 |
|
Will Marshall
|
16251fe5ea
|
Merging with master
|
2014-04-23 14:43:39 +10:00 |
|
Will Marshall
|
2981412540
|
Adding some specs, next order cycle, better CSS
|
2014-04-23 14:38:41 +10:00 |
|
Will Marshall
|
8027af2bb7
|
Adding active boolean and sorting
|
2014-04-23 13:22:30 +10:00 |
|
Will Marshall
|
f5b32ebd3f
|
Better handling of the home page hubs
|
2014-04-23 12:58:34 +10:00 |
|
Rob H
|
131b4ac073
|
Hack fix for our API controllers not being able to access Spree's Rabl Responder
|
2014-04-23 12:31:30 +10:00 |
|
Rob H
|
b37a701d39
|
Merge branch 'api_fixes' into bom
|
2014-04-23 12:03:01 +10:00 |
|
Rob H
|
669ec0eee7
|
Fix failing API specs
|
2014-04-23 12:02:27 +10:00 |
|
Rob H
|
353b26c3df
|
Hack fix for our API controllers not being able to access Spree's Rabl Responder
|
2014-04-23 12:02:11 +10:00 |
|
Will Marshall
|
c5f8e2e123
|
Better temp text
|
2014-04-23 11:49:27 +10:00 |
|
Will Marshall
|
8e67be6e4f
|
More minor presentation changes
|
2014-04-22 17:19:13 +10:00 |
|
Will Marshall
|
078a23a152
|
More prettification
|
2014-04-22 17:08:40 +10:00 |
|
Will Marshall
|
baa2065238
|
Tweaking filter to be case insensitive
|
2014-04-22 16:10:13 +10:00 |
|
Will Marshall
|
8b7d2641f9
|
Starting to prettify with Laura
|
2014-04-22 15:46:14 +10:00 |
|
Will Marshall
|
fb072ad1a5
|
Tweaking debounce, adding it to Shop
|
2014-04-18 16:56:14 +10:00 |
|
Will Marshall
|
35a792b3ca
|
Debouncing things
|
2014-04-18 16:53:43 +10:00 |
|
Will Marshall
|
99d743f7cf
|
Some very basic specs
|
2014-04-18 16:35:06 +10:00 |
|
Will Marshall
|
240b600bfa
|
Adding a No Results case
|
2014-04-18 16:15:21 +10:00 |
|
Will Marshall
|
f3e30d10ba
|
Starting some bones for Laura
|
2014-04-18 16:10:19 +10:00 |
|
Will Marshall
|
66d5f08b99
|
Adding custom filtering to home page
|
2014-04-18 15:17:12 +10:00 |
|
Will Marshall
|
5778a51bf6
|
Switching to placeholders and so on
|
2014-04-18 13:08:45 +10:00 |
|
Will Marshall
|
6753b96f29
|
Adding darkswarm variant of home page, getting Angular skeleton into place, taking shit off window
|
2014-04-18 13:01:36 +10:00 |
|
Will Marshall
|
c0228e0cc3
|
Patching the admin JS
|
2014-04-18 11:37:19 +10:00 |
|
Will Marshall
|
a5a3f9fe43
|
Fixing up some minor spec bugs
|
2014-04-17 17:22:30 +10:00 |
|
Will Marshall
|
e2d3207a51
|
Namespacing accordion state by ID
|
2014-04-17 15:34:57 +10:00 |
|
Rob H
|
2532248e6f
|
Fix failing javascript tests
|
2014-04-17 15:27:15 +10:00 |
|
Rob H
|
78fad1cc85
|
Make more orders load for BOM
|
2014-04-17 15:19:48 +10:00 |
|
Will Marshall
|
202b45fc5f
|
Aligning text left in Order Summary
|
2014-04-17 15:15:14 +10:00 |
|
Will Marshall
|
c6395a686a
|
Adding flash notifications
|
2014-04-17 15:08:01 +10:00 |
|
Rob H
|
1b5080ceb4
|
Remove render
|
2014-04-17 12:28:28 +10:00 |
|
Rob H
|
5345e8d339
|
Add accessible_by scope to enterprises model and accessible action to enterprises API
|
2014-04-17 12:23:09 +10:00 |
|