arzynik
|
e5e9236f4b
|
Merge branch 'master' of github.com:crunchbutton/crunchbutton
|
2013-08-12 20:04:32 -07:00 |
|
arzynik
|
673742d6ff
|
add transfer of auth tokens via request rather than cookie for native app
|
2013-08-12 20:00:31 -07:00 |
|
Daniel Camargo
|
411101ca68
|
partial #1540
|
2013-08-12 19:02:08 -03:00 |
|
Daniel Camargo
|
1abd760885
|
partial #1537
|
2013-08-12 15:37:43 -03:00 |
|
arzynik
|
580691b049
|
added fonts. added some new styles for mobile
|
2013-08-09 19:26:31 -07:00 |
|
arzynik
|
318418963b
|
added fonts and some sample icons
|
2013-08-08 16:02:17 -07:00 |
|
Daniel Camargo
|
77ee1b573f
|
Merge branch 'refs/heads/master' into Issue_1503_AngularJS
|
2013-08-07 20:14:59 -03:00 |
|
Daniel Camargo
|
5358ca92e7
|
Merge branch 'refs/heads/master' into Issue_1503_AngularJS
Conflicts:
www/assets/js/app.js
www/assets/js/services.cart.js
|
2013-08-07 20:14:30 -03:00 |
|
arzynik
|
292f404249
|
fixed rendering issue with templates. disabled autofocus for phonegap. updated some styles ofr phonegap.
|
2013-08-07 16:02:28 -07:00 |
|
Daniel Camargo
|
943c21bd6a
|
partial #1503 - login / orders
|
2013-08-07 16:48:44 -03:00 |
|
arzynik
|
548680cf83
|
updates for phonegap
|
2013-08-07 11:13:53 -07:00 |
|
arzynik
|
a4ff5ee834
|
updated some stuff for phonegap
|
2013-08-06 21:14:36 -07:00 |
|
arzynik
|
650b24c69c
|
changed how app config loads
|
2013-08-06 12:00:16 -07:00 |
|
arzynik
|
4a3c0f3042
|
added body view
|
2013-08-06 10:49:52 -07:00 |
|
arzynik
|
0ca08deffd
|
added views api
|
2013-08-06 10:05:31 -07:00 |
|
Daniel Camargo
|
5a11a7bc0a
|
partial #1512
|
2013-07-30 16:07:12 -03:00 |
|
Daniel Camargo
|
16008f511b
|
partial #1514
|
2013-07-30 14:15:35 -03:00 |
|
Daniel Camargo
|
a052180696
|
partial #1515
|
2013-07-30 14:10:09 -03:00 |
|
Daniel Camargo
|
e1fe90c189
|
fix the flyer order
|
2013-07-29 12:46:15 -03:00 |
|
Daniel Camargo
|
08c311a95b
|
gift card - flyer
|
2013-07-26 18:29:08 -03:00 |
|
Daniel Camargo
|
a088a742b2
|
partial #1503: Work on AngularJS Stuff - Gift card modal
|
2013-07-25 13:39:44 -03:00 |
|
Daniel Camargo
|
8806c7115b
|
partial #1482
|
2013-07-23 14:59:45 -03:00 |
|
Daniel Camargo
|
133d2286a5
|
partial #1507
|
2013-07-23 14:30:51 -03:00 |
|
Daniel Camargo
|
c85b988515
|
partial #1503 - fixed the css
|
2013-07-19 16:48:52 -03:00 |
|
Daniel Camargo
|
fd4123b8ae
|
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
|
2013-07-19 16:45:48 -03:00 |
|
arzynik
|
81db2cbd36
|
fixed #1310
|
2013-07-19 10:59:38 -07:00 |
|
Daniel Camargo
|
c3fedcc471
|
partial #1503
|
2013-07-19 13:17:44 -03:00 |
|
Daniel Camargo
|
82069d1b5a
|
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
|
2013-07-18 17:13:57 -03:00 |
|
Daniel Camargo
|
44b3521927
|
partial #1503
|
2013-07-18 17:13:47 -03:00 |
|
arzynik
|
ac154b5a2e
|
updated admin buttons
|
2013-07-18 10:55:03 -07:00 |
|
arzynik
|
caa08980ce
|
ads dynamic config independant of microsite. fixes #1487
|
2013-07-17 18:38:31 -07:00 |
|
arzynik
|
7153ba8be2
|
added change sets to restaurant table. added admin auth at global auth library.
|
2013-07-15 09:43:29 -07:00 |
|
arzynik
|
86b4653026
|
fixes #1493
|
2013-07-12 18:58:48 -04:00 |
|
arzynik
|
3f1ab29310
|
fixes #1188
|
2013-07-12 15:16:32 -07:00 |
|
arzynik
|
fffa62010b
|
added db based admin records
|
2013-07-12 11:36:30 -07:00 |
|
arzynik
|
07628d36b6
|
fixes #791
|
2013-07-12 11:12:27 -07:00 |
|
arzynik
|
697334f3c5
|
added group tester for processors
|
2013-07-12 11:04:30 -07:00 |
|
arzynik
|
360bcd81eb
|
added stripe and balanced tests
|
2013-07-12 11:00:26 -07:00 |
|
Daniel Camargo
|
c659d555b7
|
partial #1494
|
2013-07-12 14:12:27 -03:00 |
|
Daniel Camargo
|
a4283ae28c
|
partial #1466
|
2013-07-10 17:41:27 -03:00 |
|
Daniel Camargo
|
d0c3bffba9
|
partial #1473
|
2013-07-10 13:27:45 -03:00 |
|
Daniel Camargo
|
59efa7378c
|
Curation page - show/hide inactive items
|
2013-07-10 09:58:37 -03:00 |
|
Daniel Camargo
|
c7cdc073e3
|
Curation page
|
2013-07-09 19:41:32 -03:00 |
|
Daniel Camargo
|
2112e948f3
|
partial #1473
|
2013-07-09 12:06:00 -03:00 |
|
Daniel Camargo
|
d609506f38
|
partial #1316
|
2013-07-08 19:04:24 -03:00 |
|
Daniel Camargo
|
920558b8d6
|
partial #1476
|
2013-07-08 18:10:39 -03:00 |
|
Daniel Camargo
|
ed616e4b3f
|
partial #1476
|
2013-07-08 16:26:58 -03:00 |
|
pererinha
|
9be2325809
|
partial
|
2013-07-08 13:12:30 -03:00 |
|
arzynik
|
747925203d
|
Merge branch 'master' of github.com:crunchbutton/crunchbutton
|
2013-07-06 16:13:40 -04:00 |
|
pererinha
|
374f6c6c00
|
partial #1472
|
2013-07-06 16:35:53 -03:00 |
|