Commit Graph

4319 Commits

Author SHA1 Message Date
Hillel Coren ae28c3c5c3 Working on bulk list changes 2016-11-27 11:46:32 +02:00
Hillel Coren 12fd825de5 Working on datatables on vendor page 2016-11-25 16:02:39 +02:00
Hillel Coren a518e9fba4 Working on datatables on client page 2016-11-25 14:45:37 +02:00
Hillel Coren b83647facc Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-25 12:53:44 +02:00
Hillel Coren 1323f21867 Working on datatables on client page 2016-11-25 12:53:35 +02:00
David Bomba c771b12494 enable stateless social login (#1170) 2016-11-25 20:56:48 +11:00
Hillel Coren eb710348bf Refactor datatable sort columns 2016-11-24 11:46:57 +02:00
Hillel Coren 5c6c9e399b Working on datatables 2016-11-24 11:41:11 +02:00
Hillel Coren ad29ecf6df Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-24 11:22:52 +02:00
Hillel Coren 8bac6b6c27 Working on adding bulk actions to client page 2016-11-24 11:22:37 +02:00
Hillel Coren f9f7217b86 Merge pull request #1168 from FR6/develop
Report settings: Date Range: Added "This Year" to the list of shortcuts
2016-11-23 19:55:32 +02:00
Francis Houle 63f525c5e3 report settings: date range: add This Year shortcut 2016-11-23 16:32:11 +00:00
Hillel Coren 1cc5795aa8 Show archived payments in client portal 2016-11-22 21:17:32 +02:00
Hillel Coren a8321e2ac3 Fix for #1157: error on templates page 2016-11-22 20:47:47 +02:00
Hillel Coren c0679cf197 Fix to show real IP when using CloudFlare 2016-11-22 20:46:40 +02:00
Hillel Coren d891aaedef Fix logo path in HTML email 2016-11-20 20:10:14 +02:00
Hillel Coren 856944104e Fix modern alignment 2016-11-20 20:02:41 +02:00
Hillel Coren ccecb65f58 Working on status selector 2016-11-20 16:08:36 +02:00
Hillel Coren 23c098014a Improved status selection 2016-11-18 15:31:43 +02:00
Hillel Coren fce46114bc Working on list status select 2016-11-17 16:29:02 +02:00
Hillel Coren de2825750d Add eager loading to API tasks 2016-11-16 13:12:10 +02:00
Hillel Coren 04bbf1b2ae Fix for migration 2016-11-16 12:52:39 +02:00
Hillel Coren 2cd574d349 Fix for PayFast 2016-11-16 12:41:47 +02:00
Hillel Coren e1a84a29e1 Tweaks to BlueVine 2016-11-16 12:41:32 +02:00
Hillel Coren 3680985a20 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-15 21:28:34 +02:00
Hillel Coren abc082aba4 Merge pull request #1146 from joshuadwire/2016-11-bluevine-integration
BlueVine Integration
2016-11-15 21:28:17 +02:00
Hillel Coren 7e80f4de2e Fix subscription JSON response 2016-11-15 10:39:35 +02:00
Joshua Dwire d157093215 Put BlueVine promo code into a partial template file 2016-11-14 13:42:59 -05:00
Joshua Dwire c04a92b836 Exclude deleted payments from 12-month revenue 2016-11-14 13:42:27 -05:00
Joshua Dwire 3d84e408bb Only do annual income calculations if we're going to show the BlueVinePromo. 2016-11-14 13:42:09 -05:00
Joshua Dwire 632bff872e Build assets 2016-11-14 13:34:40 -05:00
Joshua Dwire 179713711f Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration 2016-11-14 13:34:27 -05:00
Hillel Coren 3ec1b90649 Fix initial sidebar display 2016-11-14 20:21:30 +02:00
Hillel Coren a70380dd88 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-14 15:13:58 +02:00
David Bomba b7a5ae6059 Handle null invoice object in task (#1153) 2016-11-14 21:25:16 +11:00
David Bomba fa39434ac9 Tasks via API (#1152)
* revert error reporting

* Add Task attributes
2016-11-14 20:43:10 +11:00
Hillel Coren df20a294c1 Improved nav sidebar height 2016-11-14 10:27:47 +02:00
Hillel Coren 94890af980 Updated readme 2016-11-13 23:47:51 +02:00
Hillel Coren 712fe3f03a Hide delete product #1149 2016-11-13 09:20:30 +02:00
Hillel Coren d53d7739b4 Fix for expense documents 2016-11-13 09:14:25 +02:00
Hillel Coren 8c2e5ebdbf Simplify logo URL code 2016-11-11 12:57:12 +02:00
Joshua Dwire 20d994a71f Update built files 2016-11-10 18:29:57 -05:00
Joshua Dwire 82167de1d2 Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration 2016-11-10 18:29:13 -05:00
Joshua Dwire 5bee41789f Show BlueVine quote and redirect to BlueVine 2016-11-10 18:24:54 -05:00
Hillel Coren e10d8d9c19 Flush cache after running UpdateSeeder 2016-11-09 16:18:35 +02:00
Hillel Coren 41b24edeb3 Update check balance test 2016-11-09 16:13:13 +02:00
Hillel Coren b19a1d73de Minor text update 2016-11-09 16:08:33 +02:00
Hillel Coren bc8c24a67c Update checkdata script 2016-11-09 16:08:22 +02:00
Hillel Coren 790cf67c46 Added Zapier to the readme 2016-11-07 17:42:54 +02:00
Hillel Coren ed7e8baaef Updated language files 2016-11-06 19:35:28 +02:00