Commit Graph

  • 2f809cfbcf registration page design added, some other minor changes Edin Dazdarevic 2015-04-19 15:00:06 +02:00
  • 79752fca47 small ui changes, fixed issue with items floating Edin Dazdarevic 2015-04-18 21:57:24 +02:00
  • 195bee516b added bootstrap.js file from the design Edin Dazdarevic 2015-04-18 16:20:53 +02:00
  • aafda1d187 bug fix: menu not visible on small screens Edin Dazdarevic 2015-04-18 16:13:55 +02:00
  • 269ad19e4f it's not fluid anymore - and shadows are not that strong Senad Uka 2015-04-16 21:19:33 +02:00
  • fc9f7496d2 number of items in cart is now properly aligned Senad Uka 2015-04-16 06:45:38 +02:00
  • 19cdca76b1 added menu sub sub items (horrible name i know) Edin Dazdarevic 2015-04-15 00:10:37 +02:00
  • f71ab5ea47 hide menu when something (section, category, subcategory) is clicked Edin Dazdarevic 2015-04-14 23:34:46 +02:00
  • 452a2cd5f4 basic version of the menu Edin Dazdarevic 2015-04-13 23:16:33 +02:00
  • 96420fc547 Merge branch 'master' of https://github.com/senaduka/ribica Edin Dazdarevic 2015-04-13 01:05:40 +02:00
  • 9865cb5f0a trimming whitespace on import, fixed issue with units_in_pack column being too small Edin Dazdarevic 2015-04-13 01:05:22 +02:00
  • ea2837bd00 items are now done and pictures resize on serverside automagically Senad Uka 2015-04-12 11:11:26 +02:00
  • 8197104040 design in progress - very ugly now Senad Uka 2015-04-12 09:21:00 +02:00
  • 82f40de96b when importing first do a lookup by code before creating a new item Edin Dazdarevic 2015-04-11 13:51:11 +02:00
  • 6da4e6c9fd created a very ugly report Senad Uka 2015-04-08 07:35:00 +02:00
  • 670f58fcff increased max number of pages on itemlist component Edin Dazdarevic 2015-04-08 00:11:44 +02:00
  • 5464ec5770 added ribica rake task (item import, copying sections to menu etc.) Edin Dazdarevic 2015-04-07 00:29:14 +02:00
  • 76d5fd7599 fixed paging on subcategory browsing page Edin Dazdarevic 2015-03-30 00:05:57 +02:00
  • 7c1eb2f4fd - browsing by subcategory Edin Dazdarevic 2015-03-29 23:23:21 +02:00
  • 8e3557cf2e minor refactoring of filters Edin Dazdarevic 2015-03-29 16:34:42 +02:00
  • b3fc46633c Merge branch 'master' of github.com:senaduka/ribica Senad Uka 2015-03-29 12:47:08 +02:00
  • 7acf1a8d6c banners are show now ! Senad Uka 2015-03-29 12:46:51 +02:00
  • 71fbde93de added brands Edin Dazdarevic 2015-03-28 14:38:15 +01:00
  • 6c7a1b962f login & register form are now being submitted when pressing the 'enter' key Edin Dazdarevic 2015-03-28 14:10:56 +01:00
  • 1e256f728d finished menu items Edin Dazdarevic 2015-03-28 13:59:04 +01:00
  • b90b4035aa fixed bug with address from a logged in user staying after logout Senad Uka 2015-03-28 06:05:16 +01:00
  • d8668115ed fixed bugs with address in incognito and NaN in delivery costs and total Senad Uka 2015-03-25 06:12:38 +01:00
  • 5bc77597a4 menu -> submenu backend Edin Dazdarevic 2015-03-24 06:18:27 +01:00
  • b534d15866 groups of articles now shown on ribica.ba/group/1/, background is in cloudinary Senad Uka 2015-03-23 07:21:53 +01:00
  • 0ff47313df minor search page fixes Edin Dazdarevic 2015-03-23 00:19:48 +01:00
  • e23bfe0a7f Merge branch 'master' of https://github.com/senaduka/ribica Edin Dazdarevic 2015-03-22 16:17:05 +01:00
  • 9154d216a2 basic version of search implemented Edin Dazdarevic 2015-03-22 16:16:52 +01:00
  • bbedb4a877 created item groups and link banners and their associations and fixed bugs with join tables Senad Uka 2015-03-22 06:17:05 +01:00
  • 38548e3e33 removed special offer id from items Senad Uka 2015-03-21 06:30:18 +01:00
  • 88c53a8512 added elasticsearch gem and index method Edin Dazdarevic 2015-03-21 00:00:36 +01:00
  • fb080ed487 registration bug fix and login button style fix Edin Dazdarevic 2015-03-20 00:40:03 +01:00
  • 76379c4ae5 fixed 'registruj me' button a bit Edin Dazdarevic 2015-03-19 22:36:32 +01:00
  • a7e40e579f bunch of fixes, need to refactoring to move state to the store in order to make it more fluxy Edin Dazdarevic 2015-03-19 22:29:16 +01:00
  • bc10740780 Merge branch 'master' of https://github.com/senaduka/ribica Edin Dazdarevic 2015-03-19 14:27:27 +01:00
  • 69f5faffe4 added children to users Edin Dazdarevic 2015-03-19 14:27:04 +01:00
  • 4b019d6b9e logout and login cart state is working now - except a little bug with icon on login Senad Uka 2015-03-19 06:47:41 +01:00
  • 1d16951fcf reapplying the fix that was lost by conflict resolution Edin Dazdarevic 2015-03-19 01:13:11 +01:00
  • 70635ebd1e added 'order' fields to sections, categories and sub_categories. - moved backoffice migrations to front-api Edin Dazdarevic 2015-03-19 00:10:24 +01:00
  • a1b9250865 subcategories should not show in the menu Edin Dazdarevic 2015-03-18 18:22:21 +01:00
  • 658fe4931d special offers backoffice is ready now Senad Uka 2015-03-18 06:25:40 +01:00
  • 3b95500635 cart logic now ties cart with user when cart is created with logged in user Senad Uka 2015-03-15 04:53:04 +01:00
  • 8815267a79 fixed problem with multiple carts and a whole load of problems with crazy delivery destination logic / if I didn't write it i would have thought it was written by a drug abuser during high Senad Uka 2015-03-14 08:17:06 +01:00
  • e7793f0884 added suppliers, weight to item Senad Uka 2015-03-14 06:33:49 +01:00
  • 0bafbb4b2f fixed bug with not clearing cart notification number when confirming Senad Uka 2015-03-13 08:28:53 +01:00
  • b2d4122940 item price is now saved when added to cart Senad Uka 2015-03-13 07:56:11 +01:00
  • 648dee4636 added delivery costs to total / added ribica logo just for fun / added validation check when confirming delivery Senad Uka 2015-03-13 07:04:44 +01:00
  • e3abc09891 added validation for delivery destination Senad Uka 2015-03-11 07:32:05 +01:00
  • 549424b903 reshuffled towns in address selection - so bigger ones are at the top Senad Uka 2015-03-09 07:39:10 +01:00
  • f4e258cb82 redesigned + and - to be clear Senad Uka 2015-03-09 07:38:34 +01:00
  • e12c2b01d0 application no longer thanks people for ordering nothing Senad Uka 2015-03-09 07:09:34 +01:00
  • cb37ff0391 stuff not ready to be pushed to master edos_stuff Edin Dazdarevic 2015-03-08 22:29:37 +01:00
  • fce49c9f5b Merge branch 'master' of https://github.com/senaduka/ribica Edin Dazdarevic 2015-03-05 22:34:53 +01:00
  • 6661e50991 bug fix, for validation Edin Dazdarevic 2015-03-05 22:34:43 +01:00
  • c682063d4f thank you page is now accessed Senad Uka 2015-03-05 05:24:56 +01:00
  • 41b3f0e555 moved cart to top right Senad Uka 2015-03-04 06:47:07 +01:00
  • b47a90b476 no need to have blank 'errors' property in the states. validation plugin now handles that Edin Dazdarevic 2015-03-04 22:55:16 +01:00
  • 38de717da9 after successful registration user should be logged in Edin Dazdarevic 2015-03-03 22:19:41 +01:00
  • 9ebb4769af Merge branch 'master' of https://github.com/senaduka/ribica Edin Dazdarevic 2015-03-03 19:11:54 +01:00
  • 028bf79617 login & registration now functional Edin Dazdarevic 2015-03-03 19:11:38 +01:00
  • 0f47367cd0 confirming works, last address is now persisted, thank you page is up but not yet accessible Senad Uka 2015-03-03 07:26:18 +01:00
  • 4befef5bf4 login progress Edin Dazdarevic 2015-03-02 07:49:36 +01:00
  • 7c28876fed login page layout Edin Dazdarevic 2015-03-01 16:43:28 +01:00
  • db4d256337 registration progress Edin Dazdarevic 2015-03-01 16:06:11 +01:00
  • 2b1d0fbbc1 address saving now works - masallah, la hawle we la kuwette ila billah :) Senad Uka 2015-02-27 07:33:17 +01:00
  • 1ca7d4509a address saving almost works Senad Uka 2015-02-26 06:48:34 +01:00
  • 6e327c758f validation mixin small fixes Edin Dazdarevic 2015-02-26 07:28:27 +01:00
  • 42f2343cec fixed problem when visiting urls with dynamic segments Edin Dazdarevic 2015-02-23 21:53:53 +01:00
  • e1d1804be9 Merge branch 'master' of https://github.com/senaduka/ribica Edin Dazdarevic 2015-02-23 21:30:25 +01:00
  • e1bba9d8db basic version of ValidationMixin, register page getting more functional Edin Dazdarevic 2015-02-23 21:30:06 +01:00
  • ee2a0401d0 had a problem / used a list of postal codes from internet / now I have two problems Senad Uka 2015-02-23 07:08:23 +01:00
  • 035d07d540 changed all images to https to check if everything works Senad Uka 2015-02-22 13:40:22 +01:00
  • 3af52737d4 fixed grunt dev so pushstate routes now work ( 404 -> index.html) Senad Uka 2015-02-22 13:28:21 +01:00
  • 2b6d93a437 added some models, started creating delivery destination state Senad Uka 2015-02-22 07:19:13 +01:00
  • 9c152e8adb Merge branch 'master' of https://github.com/senaduka/ribica Edin Dazdarevic 2015-02-21 14:00:50 +01:00
  • 9860c50ffc ui for register page Edin Dazdarevic 2015-02-21 14:00:43 +01:00
  • 53fc9f0b99 created delivery destination model Senad Uka 2015-02-20 07:33:26 +01:00
  • 47017b6830 Merge branch 'master' of https://github.com/senaduka/ribica Edin Dazdarevic 2015-02-20 06:55:28 +01:00
  • 8f904099cf added user model Edin Dazdarevic 2015-02-20 06:55:18 +01:00
  • 0eb6bd9f57 quick fix react uses htmlFor instead of for attribute Senad Uka 2015-02-19 07:31:09 +01:00
  • a9a9320479 created nonfunctional checkout page Senad Uka 2015-02-19 07:17:31 +01:00
  • 7c27d9415a fixed bug with + and - on cart page Senad Uka 2015-02-18 07:23:02 +01:00
  • e28f9a6a53 router with location, fixed bug with + and - on cart page Senad Uka 2015-02-18 07:21:37 +01:00
  • fe9d0f30d0 Merge branch 'master' of https://github.com/senaduka/ribica Edin Dazdarevic 2015-02-17 21:59:01 +01:00
  • b635246e83 added links to registration and login page, added utf8 charset meta tag, added viewport metatag to prevent zoom on mobile devices Edin Dazdarevic 2015-02-17 21:58:39 +01:00
  • d3d5db97fd reshuffled things, order button now exists and does nothing Senad Uka 2015-02-17 07:23:09 +01:00
  • a9249c7ad8 fix for grunt dev & grunt watch Edin Dazdarevic 2015-02-17 06:46:13 +01:00
  • 08822fe405 we'll use assets pipeline in prod as well (for now) Edin Dazdarevic 2015-02-16 23:16:42 +01:00
  • 40f7f8512a prepared stuff for easier deployment Edin Dazdarevic 2015-02-16 21:36:14 +01:00
  • d82274d1e1 fixed wierd behavior of the main menu Edin Dazdarevic 2015-02-15 20:21:45 +01:00
  • f5254cd316 byCategory component small refactoring Edin Dazdarevic 2015-02-15 14:50:31 +01:00
  • e902b27986 Merge branch 'master' of https://github.com/senaduka/ribica Edin Dazdarevic 2015-02-15 14:21:59 +01:00
  • f675f8b024 paging done, needs some additional refactoring Edin Dazdarevic 2015-02-15 14:21:50 +01:00
  • f74bee360e cart total is now shown without handling and shipping Senad Uka 2015-02-15 06:43:37 +01:00
  • ba22ea8bd7 cart display now shows price and amount per item Senad Uka 2015-02-14 07:53:57 +01:00
  • 9ca7b33b91 bunch of minor fixes Edin Dazdarevic 2015-02-13 23:44:53 +01:00