149 Commits

Author SHA1 Message Date
Daniel Camargo
677f6ed2f7 partial #13 2013-02-06 16:58:15 -02:00
Daniel Camargo
15521c0071 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	www/assets/js/app.js
2013-02-06 16:55:33 -02:00
Daniel Camargo
0704be0911 partial #13 2013-02-06 16:29:40 -02:00
Daniel Camargo
1e4adcb494 partial #13 2013-02-05 17:02:36 -02:00
Daniel Camargo
80c720fe38 partial #13 2013-02-04 18:04:01 -02:00
Daniel Camargo
fe18dc7aef partial #13 2013-02-02 19:18:25 -02:00
arzynik
0c142dda14 added env specific github config 2013-01-30 11:45:46 -08:00
arzynik
9ff78d76f0 added github issues 2013-01-30 11:38:30 -08:00
Stuardo Rodríguez
97018268ee fixed #685
* the admin controller loads the testing community as the default for new restaurants
* the Community model encapsulates the testing community fetching
* the view accepts not setting a default community
2013-01-30 14:12:37 -05:00
Stuardo Rodríguez
9932add0a3 partial for issue #492
* centralize the way the restaurant's fax is fetched
* adding Notification types as class constants to reduce possible bugs
* centralize the way to get the restanurant's email address
* improve code readability in the CSV exporter
* adding restaurant fax and email to the CSV
2013-01-30 12:39:25 -05:00
Stuardo Rodríguez
ae8e716309 partial for #22, set communities
* preselect current community for the restaurant
2013-01-29 15:09:52 -05:00
Stuardo Rodríguez
91b0a7bb82 partial for #22
- action in the api/restaurant controller to set the dishes categories
- method in the Restaurant model to store the categories associated to the restaurant
- improved the way the add category looks in the admin/restaurant view and CSS file
- refactorize the methods in the admin JS app, so the methods were outside every object to be able to use the IDE outliner to show the methods outside the onload function, helps sorting the work folding the methods
- added the _saveCategories() method in the JS admin app to send the categories to the api/restaurant controller
- added the _saveCategories() to the saveRestaurant method
- made the getValues() method a global function to reuse it
- added a App.createCategory() to add a new category in the DOM to be stored later
- the admin app, onLoad method does not define any functions inside it anymore
2013-01-28 14:21:26 -05:00
arzynik
3a028c9674 some updates to the login shit. #16 2013-01-24 17:12:31 -08:00
arzynik
05d912f18d Merge branch 'master' of github.com:crunchbutton/crunchbutton 2013-01-24 15:59:56 -08:00
arzynik
e678dd22e3 #13 added some facebook tests and some of the user code in some places 2013-01-24 15:58:48 -08:00
Stuardo Rodríguez
63f0e4338a issue #22 | enable to add / edit notifications
* the API for restaurant stores now the notifications
* The restaurant model stores now the notifications
* detect the notification to know what type of notification it is  to store it in as the right type
2013-01-24 18:25:35 -05:00
arzynik
2c2d6c710b added grubhub scraper test 2013-01-23 11:19:48 -08:00
Daniel Camargo
89d676f7d0 Issue #635
Added the suggestion's form at the order page.
Defined some CSS classes.
Developed the javascript functions that will control the suggestion's form.
2013-01-22 18:10:48 -02:00
Daniel Camargo
5c7dd2824e Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-22 14:44:47 -02:00
Daniel Camargo
29fea3583a Suggestion - Admin - Issue 635
Issue 635: Suggestion.
Added the Suggestion's model.
Added the Suggestion's controller.
Added some Suggestion's viewers.
Added the Suggestion's options at the admin menu.
Added some CSS classes at the admin.css.
Added the object App.suggestions at the admin.js file.
2013-01-22 14:44:37 -02:00
Stuardo Rodríguez
e83dbd88d8 partial for #22
* item descriptions are now being stored
* improved the CSS for the admin at 1024x768
* adding helper to identify Restaurant model in the controller
* fixed the JS that was wrongly displaying the stored description
2013-01-21 16:53:13 -05:00
arzynik
3961cdc60c added ordrin api and admin test page 2013-01-18 13:07:25 -08:00
arzynik
93b5808af7 added permalink option to restaurant api 2013-01-05 23:44:43 -08:00
arzynik
5218db6163 added restaurant map 2013-01-03 18:19:02 -05:00
Stuardo -StR- Rodríguez
fc487e7cd0 fixed ##609
* addded IDE helper for the order controller
* replaced Help page <title>
* replacing content in the Help page
2013-01-03 14:39:16 -05:00
arzynik
ab88d500bc fixed some css bundle issues 2012-12-28 15:44:36 -05:00
arzynik
84518aaf4b fixed location query for restaurants 2012-12-20 18:55:42 -08:00
arzynik
1923d53b55 added method to request restaurants by loc 2012-12-19 19:25:30 -05:00
arzynik
6aa9304d4f added location based queries for restaurants 2012-12-15 18:49:49 -05:00
arzynik
484219d154 added notify 2012-12-14 00:05:47 -05:00
arzynik
c1837b8edb fixed issue with bundle 2012-12-10 20:29:16 -05:00
arzynik
76d53931a3 Merge branch 'master' of github.com:crunchbutton/crunchbutton 2012-12-04 14:25:04 -05:00
arzynik
a55f1f0d55 fixes #357 2012-12-04 14:12:01 -05:00
arzynik
08eda1d783 Merge branch 'master' of github.com:crunchbutton/crunchbutton 2012-12-03 18:39:57 -05:00
arzynik
544b3d2ea2 unbundle images 2012-12-03 18:35:07 -05:00
arzynik
9487bf66df removed pauses 2012-11-28 21:42:54 -05:00
arzynik
87fad4189f added uploader. #287 2012-11-27 20:45:11 -05:00
arzynik
c70e129759 moved image cache to be global 2012-11-27 19:24:00 -05:00
arzynik
070996b7f8 lots of twilio changes. fixes #419. fixes #397. 2012-11-27 17:42:26 -05:00
arzynik
8caad9cc5b no idea what this is 2012-11-15 14:59:26 -05:00
arzynik
47c3134a17 fixes #533 2012-11-07 15:57:26 -05:00
arzynik
8c895ee27f added community poipulator 2012-11-05 15:57:59 -05:00
arzynik
2004bba952 made major changes to core classes for multiple dbs 2012-10-29 14:23:33 -04:00
arzynik
7039079df9 added sitemap 2012-10-17 13:58:08 -04:00
arzynik
1da3f60203 added static legal 2012-10-17 13:47:34 -04:00
arzynik
46c1d5ef25 seo progress 2012-10-16 17:05:13 -07:00
arzynik
bf57011b31 added like 2012-10-11 19:34:46 -04:00
arzynik
e924fe0392 fixes #416 2012-10-10 20:11:55 -04:00
arzynik
71c9591650 fixes #32 fixes #34 fixes #364 fixes #137 fixes #356 2012-10-05 21:18:16 -04:00
arzynik
428051ec5b a shitload of location detection and hello page changes. #359 #233 2012-10-02 23:48:04 -07:00