{"shas":[["f34e9f265988694a177c75b9d086273e285535e9","816cfbef0fefe4bf197d49e793a051735e7f3337@aetherquest.com","Merge remote branch 'blasto333/master' into mailchimp\n\nConflicts:\n\tapplication/config/autoload.php\n\tapplication/controllers/config.php\n\tapplication/controllers/customers.php\n\tapplication/controllers/employees.php\n\tapplication/controllers/reports.php\n\tapplication/controllers/suppliers.php\n\tapplication/helpers/table_helper.php\n\tapplication/language/english/common_lang.php\n\tapplication/language/english/config_lang.php\n\tapplication/language/english/module_lang.php\n\tapplication/language/indonesia/config_lang.php\n\tapplication/language/spanish/common_lang.php\n\tapplication/language/spanish/config_lang.php\n\tapplication/language/spanish/employees_lang.php\n\tapplication/language/spanish/module_lang.php\n\tapplication/language/spanish/reports_lang.php\n\tapplication/views/config.php\n\tdatabase/database_10.9-11.0.sql\n\tjs/common.js\n\tjs/date.js","Robert Elwell"],["3a72dd808d176165888a1212ac0c4004b9140a6a","816cfbef0fefe4bf197d49e793a051735e7f3337@aetherquest.com","Continue sorting out differences between new specific item report and specific item by customer","Robert Elwell"],["bd1e107611f2633aeac045fa2355123f3e8695fe","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrismuench.com","Revert \"PCI Complaint warning message\"\n\nThis reverts commit dc8275e826275e8bb231f2e061fca2b82af4f65d.","Chris Muench"],["f493d2e4a9c01f824e81402b424c3ca51c24feed","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrismuench.com","Revert \"Using live url for authorize.net\"\n\nThis reverts commit 6425e8d9786856dd4ef7aed31eca8751572f1d19.","Chris Muench"],["c808ab7f7ba3118eee05f0ad10cb0d92f374f9b8","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrismuench.com","Revert \"Added link to my affiliate id for credit card processing\"\n\nThis reverts commit 5ff0edf025412310d194002f0eb52a9a115981f2.","Chris Muench"],["1c8e933136bc981c193b1cff9c38781b88e266be","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrismuench.com","Revert \"Language key updating\"\n\nThis reverts commit 1833f658bf0142ffefe463fc34a63176bf85c03e.\n\nConflicts:\n\n\tapplication/language/english/common_lang.php","Chris Muench"],["a42a6dfd90ed67f61f1dbd1db6544d7fedc7bb76","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrismuench.com","Revert \"Better integration with authroize.net, still not perfect\"\n\nThis reverts commit 179cb4972385485a044b7c205f03f7b3407dc4b6.","Chris Muench"],["0228ee7b28190078e4a79468d3cda44cf83e08f1","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrismuench.com","Revert \"Initial (non working) credit card integration\"\n\nThis reverts commit c4acb24f41012ade29111331540a436a7c674c75.","Chris Muench"],["24bfe026718a345a15512279ec02748826f10d3e","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrismuench.com","Revert \"Revert \"Revert \"First step towards integrated CC processing\"\"\"\n\nThis reverts commit 64341e91b2c90fd65d81c4506da213213b397408.","Chris Muench"],["7642ca84b7e221615a54e789b2a8bd0f7fdb1aa7","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrismuench.com","Removed credit card processing for whats new","Chris Muench"],["28c179e87a36a3ce1f0c91ec3a7f8c616382fc36","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrismuench.com","removed ini_set","Chris Muench"],["dd14de21446544020031d58b9f6e7779e7d723f0","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrismuench.com","Revert \"removed ini_set\"\n\nThis reverts commit 28c179e87a36a3ce1f0c91ec3a7f8c616382fc36.","Chris Muench"],["e045f38195970d37e287017f67893c845f7507a7","816cfbef0fefe4bf197d49e793a051735e7f3337@aetherquest.com","Fix conflict issue in reports","Robert Elwell"],["a9ae3cd69c22b59af2da260fefed7e4fedfe4185","816cfbef0fefe4bf197d49e793a051735e7f3337@aetherquest.com","add missing comma","Robert Elwell"],["d0c73a2c65872ed2d29b343d8a227d74c6f4019d","816cfbef0fefe4bf197d49e793a051735e7f3337@aetherquest.com","Fix some missing components of the merge","Robert Elwell"],["13b7067f05bed47871a12a7079e051307d20bddf","816cfbef0fefe4bf197d49e793a051735e7f3337@aetherquest.com","Merge branch 'mailchimp'","Robert Elwell"],["8ab8af42183665dae66faaf94201f67074b6d78b","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@chrismuench.com","Initial mailchimp merge, still some bugs","Chris Muench"]],"repo":"blasto333/PHP-Point-Of-Sale","actor":"blasto333","ref":"refs/heads/mailchimp","size":17,"head":"8ab8af42183665dae66faaf94201f67074b6d78b","actor_gravatar":"3b39a1b0893869eaa4751f77f5999d5a","push_id":29196670}