526 Commits

Author SHA1 Message Date
Daniel Camargo
dd60059b89 viral invite feature 2013-08-27 16:19:12 -03:00
Daniel Camargo
db4a5ad0af partial #1482 2013-08-27 10:42:13 -03:00
Daniel Camargo
599fda5393 CSS Optimization 2013-08-23 15:02:07 -03:00
Daniel Camargo
4b227f9e8b partial #1484 2013-08-21 11:36:21 -03:00
Daniel Camargo
d79bd1ae40 test plan - password reset 2013-08-19 12:32:46 -03:00
Daniel Camargo
ed3a723520 new gift card 2013-08-19 12:32:31 -03:00
arzynik
4975f923b1 updated how all of the facebook authentication works 2013-08-16 00:03:11 -07:00
arzynik
f039764da8 updated app facebook auth 2013-08-15 22:13:02 -07:00
Daniel Camargo
4bedd229e5 some metrics changes 2013-08-15 11:44:15 -03:00
arzynik
ffe7f261e5 make an admin hash 2013-08-14 15:59:15 -07:00
arzynik
2a550933a6 Merge branch 'master' of github.com:crunchbutton/crunchbutton 2013-08-14 11:02:03 -07:00
arzynik
87c53e3453 added check theme. changed how top bar works. 2013-08-14 11:01:56 -07:00
Daniel Camargo
6ce38da82d added the info if the gift card was already viewed 2013-08-14 13:32:06 -03:00
arzynik
ae5dc7fa7e Merge branch 'master' of github.com:crunchbutton/crunchbutton 2013-08-13 13:19:51 -07:00
arzynik
b52e3a3746 added spinner and preload code from restaurants page to restaurant page. 2013-08-13 13:19:44 -07:00
arzynik
b61cdbd0c2 rearanged build items so slowest items are at the end 2013-08-13 13:18:52 -07:00
Daniel Camargo
166b6d3fa8 partial #1381 2013-08-13 14:19:28 -03:00
Daniel Camargo
2c8c058d04 partial #1381 2013-08-13 11:52:31 -03:00
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