1278 Commits

Author SHA1 Message Date
Daniel Camargo
63e7ef73de partial #874 2013-03-29 10:10:17 -03:00
Daniel Camargo
6ceb9f91d9 partial #874 2013-03-28 21:22:50 -03:00
Daniel Camargo
9a7c2b2dd1 partial #874 - test at beta 2013-03-28 21:12:10 -03:00
Daniel Camargo
6af4487f1f partial #874 2013-03-28 16:26:05 -03:00
Daniel Camargo
ca90c69249 partial #874 2013-03-28 10:42:34 -03:00
Daniel Camargo
bc30c496d3 partial #874 2013-03-27 11:48:50 -03:00
Daniel Camargo
c62742fe52 Issue #874 - added chosen 2013-03-26 21:45:30 -03:00
Daniel Camargo
8d665033a3 issue #899 - testing 2013-03-25 12:45:44 -03:00
Daniel Camargo
aa0c3e5c9f issue #899 - debugging 2013-03-25 12:13:56 -03:00
Daniel Camargo
62f5cedcd5 Issue #899 - debugging 2013-03-25 11:20:32 -03:00
Daniel Camargo
eca758fb7b Issue #899 - debugging 2013-03-25 10:28:01 -03:00
Daniel Camargo
f2ca2e47d2 Fixed #529 2013-03-19 14:03:18 -03:00
Daniel Camargo
63c10e21f1 partial #529 2013-03-19 09:03:53 -03:00
Daniel Camargo
d079702bc9 Fixed #838 2013-03-14 10:32:03 -03:00
Daniel Camargo
4787809d7d partial #613 2013-03-13 16:19:28 -03:00
Daniel Camargo
297aeb15ea Issue #862 2013-03-13 09:20:43 -03:00
Daniel Camargo
bc229e861b Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-03-13 08:00:55 -03:00
Daniel Camargo
b953b786b8 partial #613 2013-03-13 08:00:36 -03:00
arzynik
b22d797192 Merge branch 'master' of github.com:crunchbutton/crunchbutton
Conflicts:
	include/views/default/crunchbutton/bundle/js.phtml
2013-03-12 16:31:34 -07:00
arzynik
992b3efa50 redid alot of location detection shit 2013-03-12 16:21:24 -07:00
Daniel Camargo
30c5608013 Issue #758 2013-03-12 13:37:59 -03:00
Daniel Camargo
9850e01082 Issue #794
Fixed
2013-03-11 11:20:19 -03:00
Daniel Camargo
031a590d98 Issue #794
Removing the debugs
2013-03-08 14:03:20 -03:00
arzynik
944320b86f added some range logic 2013-03-07 20:05:39 -05:00
Daniel Camargo
85a5111ea8 Added a phpinfo controller. 2013-03-07 16:26:20 -03:00
Daniel Camargo
d94a687a93 Issue #811
- Developed the feature that will relate the new user to his suggestions.
- Made "Create an account" a clearer CTA (call to action).
2013-03-07 10:07:20 -03:00
Daniel Camargo
fdaffb5381 partial #811
the recommendation is now saved at the suggestion table.
2013-03-06 14:20:57 -03:00
Daniel Camargo
3bf0a5cd50 Issue #838 2013-03-05 13:40:53 -03:00
Daniel Camargo
02a5f2f922 Issue #838 2013-03-05 13:38:22 -03:00
Daniel Camargo
85eb6eccfe Issue #831 2013-03-05 10:29:41 -03:00
Daniel Camargo
93d09c708d fixed #810 2013-03-04 16:16:15 -03:00
Daniel Camargo
6896ed0684 fixed #810 2013-03-04 16:12:43 -03:00
arzynik
4268d64d74 fixes #754. fixes #772. added session based AB testing storage and generation. 2013-02-28 18:24:43 -05:00
Daniel Camargo
911a8cbef8 Issue #775 2013-02-28 13:37:30 -03:00
Daniel Camargo
fcd269954c issue #536
Testing at beta
2013-02-27 16:36:30 -03:00
Daniel Camargo
1ad77d92c2 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-27 14:15:01 -03:00
Daniel Camargo
14184be6c6 partial #536 2013-02-27 14:14:49 -03:00
Stuardo Rodríguez
0e92a56b47 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-27 09:00:00 -05:00
Stuardo Rodríguez
75ffad5c00 Fixed #776, restaurant "1 fish 2 fish" displays "Alpha Delta Pizza"
The problem is that restaurants starting with a number in their permalink, are
used as the number, ignoring the rest of the  text. So "1 fish" was changed to
a simple "1".
2013-02-27 08:58:02 -05:00
Daniel Camargo
3d8c7a5450 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-27 08:27:28 -03:00
arzynik
11ff5c8f5b added mini test suite 2013-02-26 11:57:41 -08:00
Daniel Camargo
b5c1848622 partial #536
Facebook class and facebook api.
2013-02-26 16:34:23 -03:00
Daniel Camargo
265063e301 testing issue #8 2013-02-26 09:50:32 -03:00
Daniel Camargo
dcff317463 issue 8 - testing 2013-02-25 15:18:32 -03:00
Daniel Camargo
b5ae265f1e Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-25 14:46:43 -03:00
Daniel Camargo
9a85cfeda8 debug - issue 8 2013-02-25 14:45:29 -03:00
Stuardo Rodríguez
1a67f4ed51 Merge branch 'issue_736' 2013-02-25 12:30:43 -05:00
Stuardo Rodríguez
bb852de0c4 fixed #736, "inactive" items are randomly activated, at least when logged into admin
* fixing the problem of the admin loading the community and all it's dependencies twice because a naming collition
* replacing $this->community for $this->restaurantCommunity in the admin/restaurant form because of the naming collition
* detecting if the call has been from the admin or from the front end because API calls do not send params
* unifying the return exit in the API _returnRestaurant() action
* sending the $where filters from the API controller instead of detecint it in the models
* sending the $where param in cascade from the API  to the Restaurant model to the Category model for the Category->dishes($where) filter
* improving the readability in the bundle where the community is sent, adding documentation about the $view->category variable in the view file
2013-02-25 12:27:45 -05:00
Daniel Camargo
e3daaac8d6 testing issue 8 2013-02-25 14:24:29 -03:00
Daniel Camargo
571f548b5a issue 8
testing
2013-02-25 14:11:42 -03:00