Commit Graph

Select branches

Hide Pull Requests

develop

edos_stuff

master

migration_to_another_computer

Mono Color

• d97516e24e thrown out ringeraja banner master Senad Uka 2016-06-09 12:42:22 +02:00
• 9820f6a363 another trello card formatting fix Senad Uka 2016-05-07 09:26:02 +02:00
• 6b4bc6aa20 fixed trello formating again Senad Uka 2016-05-07 09:21:34 +02:00
• 98e64830e1 fixed trello formating Senad Uka 2016-05-07 09:17:30 +02:00
• 5c899ca6ed added paypal notice Senad Uka 2016-05-07 09:14:06 +02:00
• 138c5de68e added coupon code to label on remark Senad Uka 2016-05-07 08:49:11 +02:00
• edb1325c07 fixed search on enter Senad Uka 2016-05-07 06:41:12 +02:00
• 6b97c2342c fixed trello Senad Uka 2016-05-07 06:10:04 +02:00
• 70ee58e989 slugify fixed Senad Uka 2016-03-16 12:13:47 +01:00
• 7e62881d16 SOlved conflict Senad Uka 2016-03-16 12:12:26 +01:00
• fdc3362719 Remove cart from state develop adam.harbas@a-net.ba 2016-02-16 14:37:18 +01:00
• 2534ee71e1 Fix for cartLoad adam.harbas@a-net.ba 2016-02-16 14:34:29 +01:00
• a2bc1e192c Fix for cartLoad adam.harbas@a-net.ba 2016-02-16 14:31:51 +01:00
• d111406f03 fixed bugs with trello Senad Uka 2016-02-16 12:34:21 +01:00
• 006829bc77 Create trello card before purchasing adam.harbas@a-net.ba 2016-02-16 12:28:49 +01:00
• 1368a71f26 Merge branch 'develop' paypal, pikpay and gift support Senad Uka 2016-02-07 19:54:08 +01:00
• 92f45c378e disable pikpay for now Senad Uka 2016-02-07 19:53:48 +01:00
• 44f5b22c82 Fix for validate logger Adam 2016-02-02 17:09:06 +01:00
• 97f6b34518 Fix for reindex console output too large Adam 2016-02-02 17:06:22 +01:00
• 1b9f38a9c0 Fix for reindex logger error Adam 2016-01-26 11:09:18 +01:00
• e0fda3e9ee add robots.txt - because of the SEO Senad Uka 2016-01-26 06:09:08 +01:00
• 30e48cd1b6 put menu items into links - because of the SEO Senad Uka 2016-01-26 05:43:05 +01:00
• 0e2e5b8fb9 put items into links - because of the SEO Senad Uka 2016-01-26 05:01:18 +01:00
• 338d4e7966 Paypal notify url fix Adam 2016-01-24 23:40:26 +01:00
• 770138ba68 Removing migration Adam 2016-01-22 16:27:19 +01:00
• 10b3109771 for pikpay send only integer num Adam 2016-01-22 16:23:58 +01:00
• 63b2506872 Remove column - fixing error Adam 2016-01-22 16:02:29 +01:00
• 13757d5a7f Schema updated Adam 2016-01-22 15:55:40 +01:00
• c6c04a1405 Root path for import log files added Adam 2016-01-22 15:37:29 +01:00
• 185cdb2a14 Rails root poject path added to command Adam 2016-01-22 15:30:13 +01:00
• 5fc1279c2a Reverting Gemfile state Adam 2016-01-21 11:30:28 +01:00
• 973f39eec3 Fixing bundler error Adam 2016-01-21 10:17:03 +01:00
• 418eb028ae changed text of newsleetter sweepstake Senad Uka 2016-01-18 11:06:49 +01:00
• 1c0c4fa78a changed date of newsleetter sweepstake Senad Uka 2016-01-18 10:28:28 +01:00
• 8675dc724f Mobile design fixed adam.harbas@a-net.ba 2016-01-13 09:51:36 +01:00
• 9e200ca910 Adding Cart id for order number adam.harbas@a-net.ba 2016-01-13 09:26:28 +01:00
• 2f673c9877 Fix hardcoded host adam.harbas@a-net.ba 2016-01-13 08:51:05 +01:00
• 90d5e855db Sha1 added to package.json Adam 2016-01-12 21:03:06 +01:00
• 828aac9a49 Gift info added to trello adam.harbas@a-net.ba 2016-01-12 15:43:11 +01:00
• 54d7cdb04e Delivery cost depend on gift option adam.harbas@a-net.ba 2016-01-12 15:18:27 +01:00
• 68c7a620ef Gift button added adam.harbas@a-net.ba 2016-01-12 14:23:40 +01:00
• 7a053a60ba Delete unnecessary files adam.harbas@a-net.ba 2016-01-12 13:27:40 +01:00
• 9142e0c4db Gift support changes adam.harbas@a-net.ba 2016-01-12 13:26:43 +01:00
• aca81d97ec Add Recipient destination model and functionality on front end Adam 2016-01-12 09:05:32 +01:00
• 5ee38f6d9a Add Recipient destination model and functionality on front end Adam 2016-01-12 09:01:46 +01:00
• 794cc2ec69 Gift interface added adam.harbas@a-net.ba 2016-01-11 16:03:53 +01:00
• 391b912eb2 Text button changed adam.harbas@a-net.ba 2016-01-11 10:54:49 +01:00
• c345e9f016 Last used btn adam.harbas@a-net.ba 2016-01-11 10:52:18 +01:00
• 76ad0606b4 Removing duplicate migration adam.harbas@a-net.ba 2016-01-11 10:23:26 +01:00
• fbcde51ef0 Button order adam.harbas@a-net.ba 2016-01-11 10:21:11 +01:00
• f4884c4985 Fixing errors adam.harbas@a-net.ba 2016-01-11 10:07:51 +01:00
• 3faa487ecd Fixing adam.harbas@a-net.ba 2016-01-11 09:51:59 +01:00
• 7b2552c31c Pikpay button Adam 2016-01-11 08:53:03 +01:00
• 7624a438b6 Last used button added adam.harbas@a-net.ba 2016-01-08 10:21:33 +01:00
• 05c8f6ce88 Adding payment method adam.harbas@a-net.ba 2016-01-08 09:36:28 +01:00
• 2a0e326862 Last used payment added adam.harbas@a-net.ba 2016-01-07 15:00:59 +01:00
• 080255f229 Merge branch 'develop' of https://github.com/senaduka/ribica into develop adam.harbas@a-net.ba 2016-01-07 13:58:45 +01:00
• 4cd1470674 Fix misspelled Adam 2016-01-07 13:28:57 +01:00
• 8dd163da91 Exclude method from json parse in before Adam 2016-01-07 13:14:49 +01:00
• 41fc327874 Payment confirmation changing from get to post adam.harbas@a-net.ba 2016-01-07 10:51:43 +01:00
• ea1c760e85 Oayment confirmation added to cart contoroller adam.harbas@a-net.ba 2016-01-07 10:49:50 +01:00
• 0efb73e385 Use PaypalId and ApiUrl from globals adam.harbas@a-net.ba 2016-01-07 09:19:25 +01:00
• d0f02df738 Price and shipping to euro adam.harbas@a-net.ba 2016-01-07 09:08:20 +01:00
• 81140de4d7 Price and shipping to euro adam.harbas@a-net.ba 2016-01-07 09:06:54 +01:00
• 3a3ba87066 Conversion rate and CoonvertToEuro added to globals adam.harbas@a-net.ba 2016-01-07 09:05:18 +01:00
• e49b6b93d6 Custom field with deliveryDestination object added to paypal button adam.harbas@a-net.ba 2016-01-07 08:58:37 +01:00
• f092719ac7 Cart configuration action removed adam.harbas@a-net.ba 2016-01-07 08:39:11 +01:00
• 1b3478707b CartConfiguration removed adam.harbas@a-net.ba 2016-01-07 08:38:05 +01:00
• ecd4d79ff2 Get configuration from server adam.harbas@a-net.ba 2016-01-06 08:40:27 +01:00
• 2b51dfcdec Fix for helper adam.harbas@a-net.ba 2016-01-06 08:27:18 +01:00
• f92d54b142 Paypal button added to page adam.harbas@a-net.ba 2016-01-06 08:26:19 +01:00
• abb44757a5 Fix for paypalButton component adam.harbas@a-net.ba 2016-01-05 09:31:51 +01:00
• c2cd011ffb Add price conversion adam.harbas@a-net.ba 2016-01-04 11:14:16 +01:00
• 6b61afebc0 Check if task succeeded and execute reindex task adam.harbas@a-net.ba 2016-01-04 09:56:40 +01:00
• 3fc4a9edea Handle CSV::MalformedCSVError adam.harbas@a-net.ba 2015-12-31 15:12:37 +01:00
• 83022beb5b don't do anything if csv_content is empty adam.harbas@a-net.ba 2015-12-31 15:01:15 +01:00
• a1fbc18856 Handle undefined method for nil object adam.harbas@a-net.ba 2015-12-31 14:55:47 +01:00
• a6a3d5937c Requiring gems Adam 2015-12-31 14:53:20 +01:00
• a41e997931 Execute task and getting output from rake Adam 2015-12-31 14:17:38 +01:00
• ca91c3d16f Create csv from csv content Adam 2015-12-31 00:07:43 +01:00
• d73b8ca8d8 Post action for export/import added Adam 2015-12-30 22:58:14 +01:00
• 1dcd8d404e Export/import elements added to the page Adam 2015-12-30 22:52:51 +01:00
• 93a315bbe1 Export/import link, route, action and page added Adam 2015-12-30 22:48:42 +01:00
• 4ccfdb002e Option delete items added to check_availability page adam.harbas@a-net.ba 2015-12-29 13:36:02 +01:00
• 53ef339f5f added ringeraja ba advertisement Senad Uka 2015-12-16 08:49:42 +01:00
• 1fa1c1c18e in the middle of the work Senad Uka 2015-12-16 08:39:54 +01:00
• 924a675fa1 main css conflict Senad Uka 2015-11-29 10:02:57 +01:00
• 8d4146acee letters are smaller now Senad Uka 2015-11-28 09:01:04 +01:00
• f93b127c2f big header is here Senad Uka 2015-11-28 08:46:09 +01:00
• bbd492467f size of the iframe is now bigger Senad Uka 2015-11-28 08:40:14 +01:00
• 7d01bfb393 changed slugs to be nicer Senad Uka 2015-11-28 08:35:42 +01:00
• e993904d78 added newsletter signup form Senad Uka 2015-11-28 08:28:17 +01:00
• 8d5067a567 fixed limit for number of items in group Senad Uka 2015-11-26 10:57:25 +01:00
• 247d1c72c7 fixed limit for number of items in group Senad Uka 2015-11-26 10:49:25 +01:00
• b93660b264 added decoration support Senad Uka 2015-11-24 10:29:46 +01:00
• 31876c0c1a deleted duplicate places Senad Uka 2015-11-23 12:59:13 +01:00
• 3d0eff1c15 paypal button Senad Uka 2015-11-23 12:58:14 +01:00
• 34bce252c5 Merge branch 'master' into develop Senad Uka 2015-11-15 06:31:48 +01:00
• d283204e88 fixed url on form Senad Uka 2015-11-14 07:26:47 +01:00
• a50d8339dd fixed url on form Senad Uka 2015-11-14 07:24:35 +01:00