Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity
845 Commits 7 Branches 917 Tags 2 GiB
d5306ef1cd
Commit Graph

645 Commits

Author SHA1 Message Date
Hillel Coren
7d48d9d138 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-07-07 09:43:30 +03:00
Hillel Coren
b6092efb41 Show new client form on click 2014-07-07 09:43:16 +03:00
Troels Liebe Bentsen
ad5dc0f5c9 Revert fix as it does not work correctly 2014-07-07 00:42:21 +02:00
Troels Liebe Bentsen
5d05eec037 Wrap gateway logos in asset() so we can host under /appname/ without issue 2014-07-04 22:23:49 +02:00
Troels Liebe Bentsen
24d2357799 Make sure we default to the correct tax rate 2014-07-04 21:46:13 +02:00
Troels Liebe Bentsen
5ad67f55e1 Disable commercial website unless it has NINJA_PROD or NINJA_DEV env set 2014-07-04 20:07:31 +02:00
Troels Liebe Bentsen
6a4fae2e2b Extend the documentation to be more detailed and add section on Ubuntu 2014-07-04 17:59:00 +02:00
Hillel Coren
f1d2444cc9 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-06-30 14:42:46 +03:00
Hillel Coren
a787427688 Bug fixes 2014-06-30 14:42:25 +03:00
Hillel Coren
4d454d9a79 Merge pull request #139 from aggepagge/master 
Show previously selected credit cards
 2014-06-30 12:01:20 +03:00
aggepagge
a04127cd48 Show previously selected credit cards 2014-06-30 00:14:17 +02:00
aggepagge
df89ed41a8 Show previously selected credit cards 2014-06-30 00:11:31 +02:00
Hillel Coren
ada7246b2b Bug fixes 2014-06-29 20:23:10 +03:00
Hillel Coren
7d41fcd7ac Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-06-29 12:39:29 +03:00
Hillel Coren
306e51c09b Bug fixes 2014-06-29 12:39:08 +03:00
aggepagge
92fdf49c10 validate and save to account_gateways 2014-06-23 22:31:21 +02:00
aggepagge
0f6e374402 added functionallity to company/payments page 2014-06-23 04:15:24 +02:00
aggepagge
24a071c0f3 added functionallity to company/payments page 2014-06-22 21:08:52 +02:00
Hillel Coren
d2760c42f2 Merge pull request #134 from aggepagge/master 
Added functionality to display credit card types for user
 2014-06-18 12:28:31 +03:00
aggepagge
a9312d1092 Added functionality to display credit card types for user 2014-06-17 18:53:51 +02:00
Hillel Coren
b4bb01bc90 Text changes 2014-06-17 16:17:38 +03:00
Razi KAntorp
da1db89c75 Header updates 2014-06-16 17:56:06 +02:00
Hillel Coren
1456a62024 Updated FAQ 2014-06-16 17:05:39 +03:00
Hillel Coren
1892e3f413 Bug fixes 2014-06-16 01:13:31 +03:00
Hillel Coren
fc00c12f98 Bug fixes 2014-06-15 23:54:58 +03:00
Hillel Coren
6fab2cf962 Bug fixes 2014-06-15 21:52:14 +03:00
Hillel Coren
605a04a32f Bug fixes 2014-06-15 21:51:22 +03:00
Hillel Coren
457a8d8078 Merge pull request #131 from raziraz/master 
New menu and mobile menu
 2014-06-15 21:50:11 +03:00
seamofreality
17a5ca387c Update texts.php 
Could you tell me in which context you're using quote_total and total?
 2014-06-14 14:56:26 +02:00
Razi KAntorp
5a4f625d31 Responsive fixes for homepage 2014-06-14 14:29:37 +02:00
Razi KAntorp
080800d646 Testimonials page 2014-06-13 17:11:46 +02:00
Razi KAntorp
4441c9f283 New menu and mobile menu 2014-06-13 15:49:37 +02:00
Razi KAntorp
7af5a7bb35 FAQ page and some code cleaning 2014-06-12 18:58:19 +02:00
Zaldor
943ef1c1e0 Update texts.php 
Completed italian translation
 2014-06-12 12:19:08 +02:00
Hillel Coren
6246ff2933 Blank commit 2014-06-09 09:38:25 +03:00
Hillel Coren
0b23a2c203 Made features visisble 2014-06-09 09:36:07 +03:00
Hillel Coren
cdd4ffde68 Bug fixes 2014-06-04 23:41:34 +03:00
Hillel Coren
a5f991870c Bug fixes 2014-06-02 19:21:47 +03:00
Hillel Coren
04679b41ce Bug fixes 2014-06-01 17:38:23 +03:00
Hillel Coren
3688669963 Bug fixes 2014-06-01 16:35:19 +03:00
Hillel Coren
c9b7f79d7c Bug fixes 2014-05-26 12:43:46 +03:00
Hillel Coren
0097f0c192 Bug fixes 2014-05-26 09:24:37 +03:00
Hillel Coren
0f5adbf62a Bug fixes 2014-05-25 21:38:40 +03:00
Hillel Coren
d4c31e3bbe Bug fixes 2014-05-25 19:23:07 +03:00
Hillel Coren
36114d251f Bug fixes 2014-05-25 17:48:00 +03:00
Hillel Coren
3b4220cede Bug fixes 2014-05-25 17:25:58 +03:00
Hillel Coren
af5f659d24 Bug fixes 2014-05-25 16:55:47 +03:00
Hillel Coren
f515d57669 Bug fixes 2014-05-25 16:40:09 +03:00
Hillel Coren
18bd38f5b6 Bug fixes 2014-05-25 13:57:19 +03:00
Hillel Coren
380d7e0a4a Bug fixes 2014-05-22 21:29:29 +03:00
Hillel Coren
8049a27beb Working on quotes 2014-05-21 00:40:09 +03:00
Hillel Coren
ca4a3f24b7 Bug fixes 2014-05-20 09:59:33 +03:00
Hillel Coren
aa3a3f174f Working on quotes 2014-05-17 22:29:57 +03:00
Hillel Coren
a14e00d520 Text changes 2014-05-15 17:57:07 +03:00
Hillel Coren
c6f0d9e71e Secure payment design 2014-05-14 01:17:33 +03:00
Hillel Coren
c357f4a278 Redesign of the payment page 2014-05-14 00:53:41 +03:00
Hillel Coren
fd99dd122c Fixed date picker in chart builder 2014-05-14 00:04:42 +03:00
Hillel Coren
ebac75ee4f Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-05-13 23:24:46 +03:00
Hillel Coren
2431c3828b Working on API 2014-05-13 23:24:40 +03:00
Hillel Coren
89b638b620 Merge pull request #120 from raziraz/master 
About page, Secure payment page, footer
 2014-05-13 23:23:49 +03:00
Hillel Coren
d42712204c Working on API 2014-05-13 22:48:02 +03:00
Hillel Coren
561907ae60 Starting on the API 2014-05-13 22:20:54 +03:00
Razi KAntorp
4b45f5adc8 About page, Secure payment page, footer 2014-05-13 20:21:14 +02:00
Hillel Coren
38008fa5c2 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-05-13 17:05:41 +03:00
Hillel Coren
7d6587a5ff Redesign of the payment page 2014-05-13 17:05:26 +03:00
Razi KAntorp
cfdf41afbd Merge remote-tracking branch 'upstream/master' 2014-05-12 13:34:31 +02:00
Hillel Coren
71bc52f724 Working on secure payment page 2014-05-12 14:10:42 +03:00
Razi KAntorp
e233d4b347 Onging work 2014-05-12 12:19:25 +02:00
Razi KAntorp
f4c857d4b9 Ongoing work with the about us page 2014-05-12 12:14:29 +02:00
Hillel Coren
683dacdc37 Bug fixes 2014-05-11 22:40:46 +03:00
Hillel Coren
113665da1e Updating texts 2014-05-11 21:24:30 +03:00
Hillel Coren
4f732386eb Added email footer 2014-05-11 20:14:44 +03:00
Hillel Coren
4d2473dc9f Added goal tracking 2014-05-09 16:28:20 +03:00
Hillel Coren
aa7542c2fa Text changes 2014-05-08 22:24:34 +03:00
Hillel Coren
6bdc9e9eb9 Working on advanced settings 2014-05-08 22:19:33 +03:00
Hillel Coren
7b86aea0a7 Enabled setting the transaction reference field when creating a payment 2014-05-08 20:16:00 +03:00
Hillel Coren
cde2da6f6c Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-05-06 21:24:55 +03:00
Hillel Coren
31e1296c5e Text changes 2014-05-06 21:24:49 +03:00
Razi KAntorp
226c376dc0 Features page and updated heros 2014-05-06 19:54:28 +02:00
Hillel Coren
1fbf61cd55 Bug fixes 2014-05-06 11:50:17 +03:00
Razi KAntorp
dfd8546cf5 new header style 2014-05-05 20:44:21 +02:00
Razi KAntorp
fc15b438e0 Merge remote-tracking branch 'upstream/master' 2014-05-05 18:14:51 +02:00
Razi KAntorp
5bb370eda0 Merge remote-tracking branch 'upstream/master' 2014-05-05 15:09:11 +02:00
Razi KAntorp
76a0a013ef ongoing work 2014-05-05 15:08:57 +02:00
seamofreality
5735f3eb3e Update texts.php 2014-05-05 12:46:29 +02:00
Hillel Coren
c5f725fe17 Text changes 2014-05-05 01:00:33 +03:00
Hillel Coren
c9ee2bc247 Bug fixes 2014-05-04 23:01:02 +03:00
Hillel Coren
bbbcca2768 Bug fixes 2014-05-04 20:11:27 +03:00
Hillel Coren
9d858f4bfc Updating texts and added invoice_now link 2014-05-04 18:49:57 +03:00
Hillel Coren
a20ddd1f45 Text changes 2014-05-04 16:07:45 +03:00
Hillel Coren
9dbfe94e95 Bug fixes 2014-05-04 12:11:08 +03:00
Hillel Coren
0208ea1e75 Bug fixes 2014-05-01 22:54:02 +03:00
Hillel Coren
6912b04063 Bug fixes 2014-05-01 22:02:36 +03:00
Hillel Coren
a4a66cba63 Merge pull request #108 from whitebook/master 
fixed invoice payment calculations
 2014-05-01 21:14:30 +03:00
Hillel Coren
668fbd47fa Bug fixes 2014-05-01 20:20:52 +03:00
root
8bb90759fc fixed invoice payment calculations 2014-05-01 15:47:55 +00:00
Razi KAntorp
3e24a8e3b4 Updated splash page 2014-05-01 13:21:59 +02:00
Razi KAntorp
7c06b95e83 pricing page 2014-04-30 16:14:11 +02:00
Hillel Coren
eebcdf57c0 Adding custom invoice colors 2014-04-29 23:51:15 +03:00
Hillel Coren
3e26880561 Adding custom invoice colors 2014-04-29 23:46:40 +03:00
Hillel Coren
19a11a3cd8 Bug fixes 2014-04-29 16:45:00 +03:00
Hillel Coren
a60f37fa03 Adding version 2014-04-29 11:37:53 +03:00
Hillel Coren
263c6722c8 Bug fixes 2014-04-29 11:32:18 +03:00
Hillel Coren
f3e88a3923 Bug fixes 2014-04-29 10:25:58 +03:00
Hillel Coren
fca1078401 Working on Grunt support 2014-04-28 23:22:55 +03:00
Hillel Coren
67a494c537 Working on Grunt support 2014-04-28 23:15:09 +03:00
Hillel Coren
11f83ce5fa Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-28 23:05:51 +03:00
Hillel Coren
113cf9b482 Adding Grunt for file concat 2014-04-28 23:05:37 +03:00
rollbrettler
e9d711ec0c fixed a small typo 2014-04-28 21:23:32 +02:00
Hillel Coren
8595ba6113 Bug fixes 2014-04-28 01:07:45 +03:00
Hillel Coren
948af3b3bd Bug fixes 2014-04-27 16:40:22 +03:00
Hillel Coren
9658f557e8 Bug fixes 2014-04-27 16:28:23 +03:00
Hillel Coren
0ef559562e Bug fixes 2014-04-27 16:22:03 +03:00
Hillel Coren
f3e6bc14a5 Bug fixes 2014-04-27 08:58:39 +03:00
Hillel Coren
c5aee51ecc Bug fixes 2014-04-27 01:02:13 +03:00
Hillel Coren
ec7dd89936 Bug fixes 2014-04-26 22:35:14 +03:00
Hillel Coren
b0091bd27b Bug fixes 2014-04-26 22:00:31 +03:00
Hillel Coren
93740713c1 Bug fixes 2014-04-25 18:37:08 +03:00
Hillel Coren
5fcfa2e2ca Text changes 2014-04-25 16:15:13 +03:00
Hillel Coren
805f5cf189 Text changes 2014-04-25 16:04:57 +03:00
Hillel Coren
fc8c4610c7 Text changes 2014-04-25 12:11:20 +03:00
Hillel Coren
61ac8739eb Text changes 2014-04-25 12:09:58 +03:00
seamofreality
9dd5d75eb0 Update texts.php 2014-04-25 10:59:58 +02:00
Hillel Coren
4c52e91b58 Text changes 2014-04-24 13:24:51 +03:00
Hillel Coren
5ca44ca4e1 Adding plans page 2014-04-24 11:46:44 +03:00
Hillel Coren
0922b97567 Working on products 2014-04-24 01:04:21 +03:00
Hillel Coren
2c4d635432 Working on products 2014-04-24 00:48:09 +03:00
Hillel Coren
6e86f1904a Working on product management 2014-04-23 23:30:54 +03:00
Hillel Coren
9b149189fb Bug fixes 2014-04-23 16:46:52 +03:00
Hillel Coren
1d0f6bf27a Bug fixes 2014-04-23 16:04:40 +03:00
Hillel Coren
a4f7789e97 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-23 16:02:29 +03:00
Hillel Coren
ffcff14c26 Bug fixes 2014-04-23 16:02:24 +03:00
Hillel Coren
f28e536325 Bug fixes 2014-04-23 15:47:44 +03:00
Hillel Coren
55a8ef4951 Bug fixes 2014-04-23 10:20:01 +03:00
Hillel Coren
b11ab39a9f Bug fixes 2014-04-22 23:10:14 +03:00
Hillel Coren
4a7432cc41 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-22 18:10:55 +03:00
Hillel Coren
4c621758f1 Added bower depedancies to codebase 2014-04-22 18:10:41 +03:00
Hillel Coren
2a8b25b208 Merge pull request #90 from blkmutt/master 
Added validation to prevent saving of masked fields.
 2014-04-22 18:09:37 +03:00
Hillel Coren
9683f1d1b5 Custom fields 2014-04-22 00:39:42 +03:00
Hillel Coren
add9cb1569 Bug fixes 2014-04-22 00:25:40 +03:00
Hillel Coren
01ec2cb838 Working on custom fields for pro plan 2014-04-18 11:57:31 +03:00
Hillel Coren
0d912373e7 Bug fixes 2014-04-17 18:20:01 +03:00
Hillel Coren
a6bd9d30be Added warning when leaving page with unsaved work 2014-04-17 17:48:56 +03:00
Hillel Coren
016b21584e Bug fixes 2014-04-16 16:26:23 +03:00
pierrefaure
092add7f8f Update texts.php 
// client view page && // payment pages && // account/company pages && // application messages && // Emails && // Payment page && // Security alerts && // Pro Plan
 => OK
 2014-04-15 21:52:57 +02:00
pierrefaure
7a09d07ddd Update texts.php 
// list pages => OK
 2014-04-15 00:50:58 +02:00
Hillel Coren
4d1df9bdc3 Removing debug messages 2014-04-14 15:16:32 +03:00
Hillel Coren
45ed680c77 Bug fixes 2014-04-14 14:33:43 +03:00
blkmutt
55d1ec415c Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 
Merged from parent.
 2014-04-13 21:55:40 -04:00
blkmutt
33b90241a2 Updated validation to avoid saving masked fields. 2014-04-13 21:54:01 -04:00
pierrefaure
43a7e236f3 Update texts.php 
// recurring invoices && // dashboard => OK
 2014-04-13 17:48:56 +02:00
Hillel Coren
777c4a6240 Working on pro plan 2014-04-13 16:38:07 +03:00
Hillel Coren
3a50fd6aa2 Working on pro plan 2014-04-13 16:34:58 +03:00
blkmutt
a7e0ca0d60 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 
Received PHP-Payments directory from parent.
 2014-04-13 07:06:24 -04:00
blkmutt
bd73fa5b54 Updated validation to fail if values are all asterisks. 2014-04-13 07:05:29 -04:00
Hillel Coren
c557276a6e Working on pro plan 2014-04-13 11:19:10 +03:00
Hillel Coren
75a1fd3240 Working on pro plan 2014-04-13 08:29:29 +03:00
Hillel Coren
dfd4de33bd Working on pro plan 2014-04-13 08:28:16 +03:00
blkmutt
ebcbbf65ff Updated copy in 'other'option on payments page. 2014-04-12 19:01:38 -04:00
blkmutt
0143881732 Created 'other' option on payments page, showed and hid dropdown, accordingly. 2014-04-12 18:49:18 -04:00
Hillel Coren
40ee3c8b40 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-12 21:55:56 +03:00
Hillel Coren
944ef2ccd3 Working on pro plan 2014-04-12 21:55:40 +03:00
blkmutt
381d2604b0 Updated Account Controller to work when no present payment libraries are in use. 2014-04-10 20:09:57 -04:00
blkmutt
7c39574720 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 
Merged from parent.
 2014-04-10 19:34:27 -04:00
Hillel Coren
3cfa9a5ce5 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-10 22:29:13 +03:00
Hillel Coren
7bf470b9b1 Bug fixes 2014-04-10 22:29:01 +03:00
blkmutt
008eb31643 Removed extra payment libraries 2014-04-10 13:39:23 -04:00
Hillel Coren
b59b730c67 Merge pull request #83 from SergeyDruid/master 
Update texts.php
 2014-04-10 15:32:05 +03:00
blkmutt
ba13c105ed Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 
Merged from parent
 2014-04-09 22:33:41 -04:00
blkmutt
a952d90c24 Updated Payments and routes to support additional PHP-Payments gateways. Masked account info on payments page. 2014-04-09 22:33:32 -04:00
Joel Limberg
bd0e2ffe55 Fix "DEFAULT_LOCALE" constant spelling 
Was “DEFUALT_LOCALE”
 2014-04-10 00:53:09 +03:00
Hillel Coren
ecec87668a Working on issues when setting up the site 2014-04-09 19:49:18 +03:00
SergeyDruid
50f4df54b3 Update texts.php 2014-04-09 15:15:43 +02:00
Hillel Coren
c61a572314 Resolving issues settng up the site 2014-04-09 15:23:00 +03:00
Hillel Coren
b6353d30aa Merge pull request #82 from SergeyDruid/master 
Update texts.php
 2014-04-09 15:12:00 +03:00
Hillel Coren
e609b49b2c Fixing some issues getting the site set up 2014-04-09 14:47:25 +03:00
SergeyDruid
b38face3f3 Update texts.php 2014-04-09 09:52:52 +02:00
blkmutt
57c588c3bc Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 
Merged from parent.
 2014-04-08 16:32:25 -04:00
seamofreality
e9bee61cb8 Update texts.php 2014-04-08 18:46:30 +02:00
Hillel Coren
29e83ed0be Merge pull request #79 from pierrefaure/patch-2 
// navigation -> OK
 2014-04-08 09:38:10 +03:00
Thiago Coutinho
16a56c1664 Update texts.php 2014-04-07 22:47:11 -03:00
pierrefaure
c15db27c4c // navigation -> OK 2014-04-08 01:02:23 +02:00
blkmutt
f613caec07 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 
Merging files from parent.
 2014-04-07 09:53:26 -04:00
Hillel Coren
7a359d6db3 Merge pull request #75 from chrisderouck/master 
Updates for dutch text
 2014-04-06 21:29:10 +03:00
blkmutt
fabfb14470 Updated Payment Library checks to use global variables. 2014-04-06 14:24:56 -04:00
Razi KAntorp
7a368e9533 New about page 2014-04-06 19:48:34 +02:00
Chris De Rouck
f5a1af9522 Revision of some texts 2014-04-06 19:30:12 +02:00
Chris De Rouck
ba1d05e950 Dutch update for new text 2014-04-06 18:27:04 +02:00
blkmutt
3c99bebae9 merged from parent 2014-04-06 11:47:22 -04:00
Hillel Coren
cb0444f339 Bug fixes 2014-04-06 13:18:34 +03:00
Hillel Coren
c3b7902e6b Bug fixes 2014-04-06 12:45:39 +03:00
Hillel Coren
e36e5b4247 Bug fixes 2014-04-06 12:41:35 +03:00
Hillel Coren
7fd844de31 Bug fixes 2014-04-06 12:21:59 +03:00
Hillel Coren
6710eba329 Bug fixes 2014-04-06 12:02:04 +03:00
Hillel Coren
bd5472994b Bug fixes 2014-04-06 10:49:32 +03:00
blkmutt
638d26adb8 Updated code to fix issues with BeanStream payments. 2014-04-05 21:49:21 -04:00
Chris De Rouck
8886007edb Minor update 2014-04-05 22:56:02 +02:00
Chris De Rouck
b87daa4cb2 Dutch translation added + fix in english translation 2014-04-05 22:31:25 +02:00
Hillel Coren
5b323e04d7 Adding ability to remove ninja logo 2014-04-04 12:24:56 +03:00
Hillel Coren
8fdb122224 Working on pro plan 2014-04-04 00:13:11 +03:00