Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 23:22:52 +01:00
Code Issues Releases Activity
3,074 Commits 7 Branches 924 Tags 2 GiB
40f18ed19f
Commit Graph

1902 Commits

Author SHA1 Message Date
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
Hillel Coren
8e3f602e3a Working on pro plan 2014-04-04 00:12:38 +03:00
Hillel Coren
c49da09f8a Adding language file 2014-04-03 23:05:24 +03:00
Hillel Coren
424f292c66 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-03 23:01:34 +03:00
Hillel Coren
7c92ed8530 Bug fixes 2014-04-03 23:01:03 +03:00
seamofreality
d04739c7a4 Update texts.php 
Well, I didn't translate everything, but most of it, and I guess a few could be better.

I was wondering what polite form of address invoice ninja is aiming at?
And also if you'd rather like to use "Kredit" than "Gutschrift" for credit.
 2014-04-03 21:11:06 +02:00
Hillel Coren
3d6530e83f Bug fixes 2014-04-03 20:54:06 +03:00
Hillel Coren
4c1b33f601 Working on multi-language support 2014-04-02 22:03:01 +03:00
Hillel Coren
1b7c885367 Working on multi-language support 2014-04-02 21:20:01 +03:00
Hillel Coren
06edfdd8e5 Working on multi-language support 2014-04-02 16:10:00 +03:00
Hillel Coren
f1f6d67af1 Working on multi-language support 2014-04-02 15:28:23 +03:00
Razi KAntorp
e88712e42f Removed about link and added features and faq to header and footer. 2014-04-02 11:54:25 +02:00
Razi KAntorp
43198e47f7 Merge remote-tracking branch 'upstream/master' 2014-04-02 11:45:52 +02:00
Hillel Coren
673c30456b Working on multi-language support 2014-04-01 13:30:43 +03:00
Razi KAntorp
7747943136 Updated hero for contact page 2014-03-31 17:54:21 +02:00
Razi KAntorp
80f0a17eea Features page added 2014-03-31 17:43:43 +02:00
Razi KAntorp
008cca025f Faq page added 2014-03-31 17:06:44 +02:00
Razi KAntorp
bdd4fa18b4 Updated login page. 2014-03-31 15:40:19 +02:00
Razi KAntorp
7a2c17fe50 Merge remote-tracking branch 'upstream/master' 2014-03-31 13:52:58 +02:00
Hillel Coren
6377d2a91b Bug fixes 2014-03-31 13:52:03 +03:00
blkmutt
227282a8cf Made changes to include PHP-Payments. Added Recommended Gateways to the Company/Payments UI. 2014-03-29 20:21:57 -04:00
blkmutt
33d54abb1e Made some styling updates. 2014-03-29 20:21:37 -04:00
blkmutt
5bd1aff573 Updated payment logic with config settings. 2014-03-29 19:42:37 -04:00
Razi KAntorp
7acb1a92c1 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/views/clients/edit.blade.php
 2014-03-28 13:53:19 +01:00
Razi KAntorp
6f58d1c63f test 2014-03-28 13:46:19 +01:00
Hillel Coren
2e299aa83f Working on multi-language support 2014-03-27 14:25:31 +02:00
seamofreality
f0dcd5d17c Update fields.php 2014-03-26 20:07:22 +01:00
Fernando Martínez
0e39488fd4 using https://github.com/caouecs/Laravel4-lang/tree/master/es 'official' translations 2014-03-26 09:33:29 -03:00
blkmutt
d20f6d3055 Added extra payment gateways that had not been previously considered. 2014-03-25 21:58:42 -04:00
blkmutt
3ca03eb2b4 Merge branch 'master' into Dev_PHP-Payments 
Merged changes from master.
 2014-03-25 21:21:23 -04:00
blkmutt
7485c01de6 Removed some of the data attributes that I was not using. 2014-03-25 21:07:43 -04:00
blkmutt
33ff8e1d60 Updated account controller, data objects, and logos for recommended gateways. 2014-03-25 20:59:33 -04:00
Fernando Martínez
938dc5d4c0 first draft of spanish translations 2014-03-26 00:16:16 +01:00
Hillel Coren
53f9eef3ca Bug fixes 2014-03-23 22:56:19 +02:00
Hillel Coren
684d856278 Bug fixes 2014-03-23 21:39:18 +02:00
Hillel Coren
b99427b05c Bug fixes 2014-03-23 21:38:03 +02:00
Hillel Coren
db3a6abad3 Bug fixes 2014-03-23 21:17:45 +02:00
Hillel Coren
a09b898cb1 Bug fixes 2014-03-23 20:19:03 +02:00
Hillel Coren
bb6815ba13 Bug fixes 2014-03-23 20:01:00 +02:00
Hillel Coren
2efde97a4e Bug fixes 2014-03-23 19:59:15 +02:00
Hillel Coren
94f5047d46 Bug fixes 2014-03-23 19:55:29 +02:00
Hillel Coren
271f6262fb Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-03-23 19:54:34 +02:00
Hillel Coren
9a592753b2 Bug fixes 2014-03-23 19:54:02 +02:00
pierrefaure
e748ea7cc2 Update fields.php 
Hi,

I'm not sure for line 42 :)
 2014-03-23 18:48:00 +01:00
Hillel Coren
f9bec51b30 Bug fixes 2014-03-23 18:02:33 +02:00
Hillel Coren
c08a46a7da Bug fixes 2014-03-23 17:59:30 +02:00
Hillel Coren
cae88df6d4 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-03-23 17:49:29 +02:00
Hillel Coren
3bbb156124 Bug fixes 2014-03-23 17:49:14 +02:00
blkmutt
af7ba0b7b1 Merge branch 'master' into Dev_PHP-Payments 
Merged changes from master.
 2014-03-23 11:41:21 -04:00
S3NS4Ti0N
951cc78c76 Update fields.php 
added german translation
 2014-03-23 15:28:14 +01:00
blkmutt
6c286b9648 Merge branch 'master' into Dev_PHP-Payments 
Merged changes from master.
 2014-03-23 10:23:55 -04:00
Hillel Coren
c4665f84f0 Bug fixes 2014-03-23 16:23:53 +02:00
blkmutt
b1a525a7f4 Added code for PHP-Payments to payment controller and to JSON for Composer. 2014-03-23 10:22:56 -04:00
Hillel Coren
631cdef345 Bug fixes 2014-03-23 15:36:18 +02:00
Hillel Coren
6e532063fd Working on multi-language support 2014-03-23 14:53:16 +02:00
Hillel Coren
58f6c0ff97 Working on multi-language support 2014-03-23 14:21:40 +02:00
Hillel Coren
6d6084728d Working on multi-language support 2014-03-23 14:19:54 +02:00
Hillel Coren
b7061222e8 Bug fixes 2014-03-23 13:11:04 +02:00
Hillel Coren
308a75099a Bug fixes 2014-03-23 11:30:48 +02:00
blkmutt
11c6cff7ca Merge branch 'master' into Dev_PHP-Payments 
Merging master into PHP-Payments branch.
 2014-03-21 08:17:51 -04:00
blkmutt
433c51886e Updated migration, seeder, and model files. 2014-03-21 08:16:37 -04:00
blkmutt
c4e629c84f Created database migratioin, updated models, updated .gitignore to ignore a .project file. 2014-03-21 08:15:53 -04:00
Hillel Coren
45a8689bf0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-03-21 00:12:23 +02:00
Hillel Coren
bb06e31403 Reworking public pages and bug fixes 2014-03-21 00:12:07 +02:00
Thiago Coutinho
33e69f132a Update validation.php 2014-03-20 13:12:53 -03:00
Thiago Coutinho
2ca7259840 Create validation.php 2014-03-20 11:03:06 -03:00
Thiago Coutinho
8bd629e939 Create reminders.php 2014-03-20 10:51:12 -03:00
Thiago Coutinho
3e645b4766 Create pagination.php 2014-03-20 10:46:58 -03:00
Thiago Coutinho
03a0a07347 Update texts.php 2014-03-20 10:45:59 -03:00
Thiago Coutinho
1f00b20b98 Create texts.php 2014-03-20 10:43:22 -03:00
Hillel Coren
ee95cca182 Working on multi-language support 2014-03-20 00:00:56 +02:00
Hillel Coren
6876edc510 Bug fixes 2014-03-19 20:54:27 +02:00
Hillel Coren
a43de0eb6b Bug fixes 2014-03-19 19:53:21 +02:00
Hillel Coren
545412369b Bug fixes 2014-03-19 19:50:00 +02:00
Hillel Coren
7fe26d54e7 Bug fixes 2014-03-19 19:08:02 +02:00
Hillel Coren
e51e85740f Bug fixes 2014-03-19 18:23:50 +02:00
Hillel Coren
68ff18fca2 Bug fixes 2014-03-19 18:20:12 +02:00
Hillel Coren
36cf1810e8 Added sign up popover message 2014-03-19 18:17:26 +02:00
Hillel Coren
dcc68a6c38 Bug fixes 2014-03-19 10:49:33 +02:00
Hillel Coren
0daa3161e3 Enabled off-site payment with PayPal Express 2014-03-19 01:33:13 +02:00
Hillel Coren
b523d6f44d Enabled off-site payment with PayPal Express 2014-03-19 01:28:43 +02:00
Hillel Coren
e80422d030 Merge pull request #40 from ascariandrea/master 
Add stripslashes on invoice terms.
 2014-03-18 23:27:44 +02:00
Hillel Coren
f9a8642909 Bug fixes 2014-03-18 23:25:54 +02:00
Andrea Ascari
b57bb90ccb Merge branch 'master' of github.com:ascariandrea/invoice-ninja 2014-03-18 22:13:44 +01:00
Andrea Ascari
9b6d86a630 Add stripslashes on invoice term 2014-03-18 22:12:36 +01:00
Hillel Coren
0f9f32dd49 Improved logo in PDF 2014-03-18 22:43:12 +02:00
Hillel Coren
48130290ce Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-03-18 20:56:03 +02:00
Hillel Coren
1757dd706d Added ability to remove account logo 2014-03-18 20:55:50 +02:00
Hillel Coren
d47b468e5c Merge pull request #33 from topsitemakers/master 
Fixing the breadcrumbs and minor typo
 2014-03-18 20:54:45 +02:00
Hillel Coren
88b8d97603 Styling changes 2014-03-18 19:03:39 +02:00
Hillel Coren
c3d7a98b4f Fix contact form styling 2014-03-18 19:00:02 +02:00
Topsitemakers
dde02a4fb6 removing the dashboard link from breadcrumbs 2014-03-18 17:35:55 +01:00
Razi KAntorp
723b45f3a7 Fixed field jumping issue in Manage Rate Modal, changed to red color of the remove icon in Manage Rate Modal and Create invoice 2014-03-18 17:08:30 +01:00
Razi KAntorp
0f6c87e39e modal styling updates 2014-03-18 16:17:49 +01:00
Hillel Coren
cf6e199bbe Merging conflicts 2014-03-18 15:20:38 +02:00
Razi KAntorp
a5e9d52958 merging conflicts 2014-03-18 14:05:42 +01:00
Razi KAntorp
d117683c37 alert border-radius + border: none 2014-03-18 11:01:02 +01:00
Hillel Coren
c25e821748 Bug fixes 2014-03-17 20:11:39 +02:00
Hillel Coren
833da15d45 Bug fixes 2014-03-17 20:09:56 +02:00
Hillel Coren
ccbbf6c6fa Bug fixes 2014-03-17 20:05:01 +02:00
Topsitemakers
af2289206f Fixing the issue with breadcrumbs and subfolders; including the link to dashboard by default on all non-dashboard pages. 2014-03-17 19:03:43 +01:00
Topsitemakers
8d06758734 fixing typo: Recommnded to Recommended 2014-03-17 18:38:19 +01:00
contact@invoiceninja.com
73ac123c36 Text changes 2014-03-17 12:34:06 +02:00
contact@invoiceninja.com
1a3fa14b8b Text changes 2014-03-17 12:04:44 +02:00
contact@invoiceninja.com
7d20c583c7 Merge remote-tracking branch 'upstream/master' 2014-03-17 11:32:38 +02:00
Razi KAntorp
d6e7f19f2f .. 2014-03-14 11:24:40 +01:00
Hillel Coren
cfbfba0ae6 Text changes 2014-03-11 19:42:49 +02:00
Hillel Coren
1d084999fa Text changes 2014-03-11 19:37:54 +02:00
Hillel Coren
013a2103dd bug fixes 2014-03-10 23:55:56 +02:00
Hillel Coren
70c5645088 Fixed issue with datatable sorting [trigger:composer] 2014-03-10 22:56:58 +02:00
Hillel Coren
915e0636c0 Bug fixes 2014-03-10 20:22:40 +02:00
Hillel Coren
dd1178ee16 merging changes 2014-03-10 19:19:47 +02:00
Hillel Coren
7fa754c067 merging changes 2014-03-10 19:05:00 +02:00
Razi KAntorp
d63d7d3b40 Images to about page 2014-03-10 17:58:02 +01:00
Hillel Coren
78be769c8d bug fixes 2014-03-10 13:04:15 +02:00
Hillel Coren
388ca323c8 bug fixes 2014-03-10 08:10:08 +02:00
Hillel Coren
1f5ba56f0f Bug fixes 2014-03-10 00:31:46 +02:00
Hillel Coren
76080fcc69 Working on the invoice designs 2014-03-09 23:19:56 +02:00
Hillel Coren
a035387d86 Updated contact page 2014-03-06 11:51:01 +02:00
Hillel Coren
334428a0e1 bug fixes 2014-03-05 22:56:34 +02:00
Hillel Coren
63a6b88e20 bug fixes 2014-03-05 22:19:12 +02:00
Hillel Coren
a1c7efb919 Merge pull request #23 from raziraz/master 
About page update, image update.
 2014-03-05 17:34:02 +02:00
Razi KAntorp
eb980f2ecc Merge remote-tracking branch 'upstream/master' 2014-03-05 16:06:21 +01:00
Razi KAntorp
71c9ca9961 Addded text to the About page. Hided the blur section on the landing page that coused a blur line over the second large image 2014-03-05 16:05:36 +01:00
Hillel Coren
70b9256ddb bug fixes 2014-03-05 17:03:31 +02:00
Razi KAntorp
cc360e3d57 Contact page 2014-03-05 14:59:13 +01:00
contact@invoiceninja.com
700d9f25f8 Merge remote-tracking branch 'upstream/master' 2014-03-04 12:29:55 +02:00
Hillel Coren
25c42ca044 Merge pull request #19 from raziraz/master 
button update
 2014-03-04 12:29:44 +02:00
Razi KAntorp
64f9951941 Merge remote-tracking branch 'upstream/master' 2014-03-04 11:26:25 +01:00
Razi KAntorp
d898667440 button update 2014-03-04 11:25:29 +01:00
contact@invoiceninja.com
d5b00ff717 Merge remote-tracking branch 'upstream/master' 2014-03-04 09:04:40 +02:00
Hillel Coren
6f87769077 bug fixes 2014-03-03 20:26:45 +02:00
Razi KAntorp
fe9249beb7 Dasboard table headers, golobal button change. 2014-02-27 12:42:23 +01:00
alltheworld
7fc457883c report 3-3 2014-02-27 08:57:59 +02:00
contact@invoiceninja.com
dd69b788cf Text changes 2014-02-26 20:47:11 +02:00
contact@invoiceninja.com
bdbe643eb4 Text changes 2014-02-26 19:00:41 +02:00
shalom
3d9fdbf495 Text changes 2014-02-26 18:57:38 +02:00
Hillel Coren
d6bb0befa0 Added blank contact us page 2014-02-26 18:50:27 +02:00
Razi KAntorp
9d39f6cdaa Added HTML and CSS for About page. 2014-02-26 17:41:08 +01:00
Hillel Coren
1c9c69e611 added about us page 2014-02-26 18:08:40 +02:00
Hillel Coren
162f34e265 added about us page 2014-02-26 16:23:54 +02:00
Hillel Coren
7a896bd307 Merge pull request #12 from raziraz/master 
table color fix, search field fix, account pages update.
 2014-02-26 06:44:50 +02:00
Razi KAntorp
3ac855be6b table color fix, search field fix, account pages update. 2014-02-25 19:10:16 +01:00
alltheworld
4006404f61 report 2 add 2014-02-25 14:54:50 +02:00
Hillel Coren
a21aa75837 bug fixes 2014-02-25 13:52:40 +02:00
Razi KAntorp
4810ddf93e dashboard tweaks, account pages buttons etc 2014-02-23 17:10:56 +01:00
Razi KAntorp
32ae1b23f7 dashboard updates 2014-02-23 15:51:52 +01:00
Razi KAntorp
b406ed79bb modals on create invoice page, changed blue icons on dashboard 2014-02-23 14:53:22 +01:00
Razi KAntorp
676e277cdf Merge remote-tracking branch 'upstream/master' 2014-02-21 14:03:47 +01:00
Razi KAntorp
b131b71534 global buttons, global tables, create invoice 2014-02-21 14:02:59 +01:00
Hillel Coren
295aaa60cf Merge pull request #9 from alltheworld/report2 
Report2
 2014-02-21 13:57:34 +02:00
Hillel Coren
3572b6d128 bug fixes 2014-02-21 13:54:53 +02:00
alltheworld
91612eb48d Report 1 2014-02-21 07:26:40 +02:00
Hillel Coren
99e4e40223 bug fixes 2014-02-20 16:42:09 +02:00
Hillel Coren
da29bd8900 bug fixes 2014-02-20 16:31:46 +02:00
Hillel Coren
b67beba7b2 bug fixes 2014-02-19 22:36:09 +02:00
Razi KAntorp
e4e440c9be Merge remote-tracking branch 'upstream/master' 2014-02-19 21:12:31 +01:00
Razi KAntorp
c04b552683 Header updates, forms, tables, buttons. 2014-02-19 21:11:08 +01:00
Hillel Coren
848a6c7e39 bug fixes 2014-02-19 21:59:46 +02:00
Hillel Coren
9886487b64 Added support for selecting invoice design 2014-02-19 21:42:57 +02:00
Razi KAntorp
e247fc53e2 Merge remote-tracking branch 'upstream/master' 2014-02-19 16:36:43 +01:00
Razi KAntorp
25cec3e143 Updates - Header, create user page, global buttons and fields 2014-02-19 16:34:32 +01:00
Hillel Coren
af37de4feb bug fixes 2014-02-19 15:28:29 +02:00
Hillel Coren
ad17952031 bug fixes 2014-02-18 23:56:18 +02:00
Hillel Coren
284a90dd25 bug fixes 2014-02-18 17:07:22 +02:00
Hillel Coren
6c33946344 bug fixes 2014-02-18 15:20:39 +02:00
Hillel Coren
f9e7959218 bug fixes 2014-02-18 15:20:12 +02:00
Hillel Coren
b89b1eb45e bug fixes 2014-02-17 20:38:48 +02:00
Hillel Coren
165d0ad444 bug fixes 2014-02-17 20:37:04 +02:00
Hillel Coren
ccfef71f86 bug fixes 2014-02-17 20:27:22 +02:00
Hillel Coren
c7e4e082ae bug fixes 2014-02-17 20:26:24 +02:00
Hillel Coren
cb898dd9b2 bug fixes 2014-02-17 18:25:38 +02:00
Hillel Coren
a3f988fa8d bug fixes 2014-02-17 10:56:19 +02:00
Hillel Coren
4f07625445 bug fixes 2014-02-17 10:50:12 +02:00
Hillel Coren
a25fee552b bug fixes 2014-02-17 10:48:40 +02:00
Hillel Coren
494286ba78 bug fixes 2014-02-17 01:09:34 +02:00
Hillel Coren
ed0e1d3521 bug fixes 2014-02-17 00:03:19 +02:00
Hillel Coren
642765b09b Implemented dashboard 2014-02-16 22:32:25 +02:00
Hillel Coren
266b66eb14 Used to strtolower for email addresses 2014-02-09 17:38:50 +02:00
Hillel Coren
aea7113a24 Added unqiue ids to contact email fields 2014-02-06 23:55:54 +02:00
Hillel Coren
b34dce5170 bug fixes 2014-02-04 16:15:03 +02:00
Hillel Coren
08a022641c bug fixes 2014-02-04 15:16:22 +02:00
Hillel Coren
cbb38477b2 bug fixes 2014-02-04 10:58:30 +02:00
Hillel Coren
2d23bb1e3e bug fixes 2014-02-04 09:07:16 +02:00
Hillel Coren
466a026adb Added codeception 2014-02-04 00:56:23 +02:00
Hillel Coren
fd09c67164 bug fixes 2014-02-03 15:42:36 +02:00
Hillel Coren
8cb066b95d bug fixes 2014-02-03 14:43:15 +02:00
Hillel Coren
3f2a7fcc4d bug fixes 2014-02-03 13:15:28 +02:00
Hillel Coren
3f3a14966f bug fixes 2014-02-03 12:56:55 +02:00
Hillel Coren
de747a4a33 bug fixes 2014-02-03 12:50:10 +02:00
Hillel Coren
efb25973e5 bug fixes 2014-02-03 12:47:33 +02:00
Hillel Coren
cd2c8147c1 bug fixes 2014-02-03 12:34:58 +02:00
Hillel Coren
ea92b116d2 bug fixes 2014-02-02 22:37:37 +02:00
Hillel Coren
84ae30e60a bug fixes 2014-02-02 22:16:31 +02:00
Hillel Coren
3ea3b6462a bug fixes 2014-02-02 22:13:28 +02:00
Hillel Coren
968df9409e bug fixes 2014-02-02 21:24:54 +02:00
Hillel Coren
ff0d8c1696 bug fixes 2014-02-02 20:52:31 +02:00
Hillel Coren
8d6b86b6ce bug fixes 2014-02-02 20:50:20 +02:00
Hillel Coren
2d0646ebe2 bug fixes 2014-02-02 20:14:56 +02:00
Hillel Coren
08213f61c3 bug fixes 2014-02-02 16:33:08 +02:00
Hillel Coren
56bf3c8799 bug fixes 2014-02-01 22:26:45 +02:00
Hillel Coren
1b398476a2 bug fixes 2014-02-01 22:19:43 +02:00
Hillel Coren
21d5f2f338 bug fixes 2014-02-01 22:15:29 +02:00
Hillel Coren
71993f850a bug fixes 2014-02-01 22:01:32 +02:00
Hillel Coren
841627dc52 text changes 2014-01-31 08:33:07 +02:00
Hillel Coren
0c16a2ccb1 implemented new site design 2014-01-31 00:29:09 +02:00
Hillel Coren
b4f092745c bug fixes 2014-01-29 14:53:05 +02:00
Hillel Coren
8cd493e38c bug fixes 2014-01-29 12:41:38 +02:00
Hillel Coren
9729f4712e bug fixes 2014-01-28 00:40:40 +02:00
Hillel Coren
6f9a04ca64 bug fixes 2014-01-22 09:11:33 +00:00
Hillel Coren
5b13f2d8ef bug fixes 2014-01-16 21:12:46 +00:00
Hillel Coren
472d2c9249 added empty directories 2014-01-15 14:04:45 +00:00
Hillel Coren
1c782b6f2c bug fixes 2014-01-15 14:01:24 +00:00
Hillel Coren
d1d3d75915 bug fixes 2014-01-14 11:52:56 +00:00
vagrant
6375f3ae7a bug fixes 2014-01-13 19:22:43 +00:00
Hillel Coren
4731536311 bug fixes 2014-01-12 18:55:33 +00:00
Hillel Coren
a57a4fcfc1 bug fixes 2014-01-09 21:38:18 +00:00
Hillel Coren
1e5634c305 bug fixes 2014-01-09 19:00:08 +00:00
Hillel Coren
703d61a22b bug fixes 2014-01-09 15:26:27 +00:00
Hillel Coren
9cec0dc33d bug fixes 2014-01-09 13:44:55 +00:00
Hillel Coren
57544a771c bug fixes 2014-01-09 12:37:38 +00:00
Hillel Coren
d3d4f8a64d bug fixes 2014-01-09 11:24:03 +00:00
Hillel Coren
bb3a7b9d1c bug fixes 2014-01-09 11:15:19 +00:00
Hillel Coren
ac917c2b51 bug fixes [trigger:composer] 2014-01-09 10:39:20 +00:00
Hillel Coren
9f79628579 bug fixes 2014-01-09 10:05:35 +00:00
Hillel Coren
ba9b95f50f bug fixes 2014-01-08 23:22:56 +00:00
Hillel Coren
75b1350808 bug fixes 2014-01-08 20:09:47 +00:00
Hillel Coren
4f8d5d7890 bug fixes 2014-01-08 08:35:35 +00:00
Hillel Coren
2b56c8a299 bug fixes 2014-01-07 23:59:06 +00:00
vagrant
21babe88a4 bug fixes 2014-01-07 15:52:47 +00:00
vagrant
92fc701f04 bug fixes 2014-01-07 15:50:41 +00:00
Hillel Coren
6999a6501d bug fixes 2014-01-06 20:03:00 +02:00
Hillel Coren
94a9c42369 bug fixes 2014-01-06 08:48:11 +02:00
vagrant
c517dc07fc bug fixes 2014-01-05 16:44:49 +00:00
Hillel Coren
10cd9a4329 Implemented bower 2014-01-05 16:03:29 +02:00
Hillel Coren
412578ad4f Bug fixes 2014-01-05 09:25:15 +02:00
Hillel Coren
247650c02c Bug fixes 2014-01-05 09:24:28 +02:00
Hillel Coren
ce987cc553 Bug fixes 2014-01-05 00:51:40 +02:00
Hillel Coren
f97bfb2788 Bug fixes 2014-01-05 00:51:16 +02:00
Hillel Coren
f3cf19bb2b Bug fixes 2014-01-05 00:50:36 +02:00
Hillel Coren
ac50e86eef Upgraded to laravel 4.1 and working on app engine support 2014-01-04 23:31:37 +02:00
Hillel Coren
df95dc213d bug fixes 2014-01-02 20:13:21 +02:00
Hillel Coren
7ef27d5a96 bug fixes 2014-01-02 19:16:00 +02:00
Hillel Coren
0144f5b0f2 bug fixes 2014-01-02 15:21:15 +02:00
Hillel Coren
fa808f9484 bug fixes 2014-01-02 10:27:48 +02:00
Hillel Coren
0b8ad35d66 bug fixes 2014-01-02 01:12:33 +02:00
Hillel Coren
100fe5f88c bug fixes 2014-01-01 19:34:37 +02:00
Hillel Coren
f0bf0a52ec bug fixes 2014-01-01 17:23:32 +02:00
Hillel Coren
fff1aa69d3 bug fixes 2014-01-01 01:50:13 +02:00
Hillel Coren
309442cab3 Working on taxes 2013-12-31 21:49:54 +02:00
Hillel Coren
7a90856025 bug fixes 2013-12-31 18:38:49 +02:00
Hillel Coren
9dd1b54d4a bug fixes 2013-12-31 11:43:39 +02:00
Hillel Coren
b271a71586 bug fixes 2013-12-31 01:19:17 +02:00
Hillel Coren
2b5f42e5ac bug fixes 2013-12-30 22:17:45 +02:00
Hillel Coren
ef24ac2c36 working on currency support 2013-12-29 19:40:11 +02:00
Hillel Coren
4ff55936d7 bug fixes 2013-12-29 13:28:44 +02:00
Hillel Coren
f323d0ed95 working in taxes 2013-12-29 01:33:48 +02:00
Hillel Coren
130a176888 Bug fixes 2013-12-27 11:10:32 +02:00
Hillel Coren
aa8151edaf Working on search 2013-12-25 19:36:34 -05:00
Hillel Coren
c6c837f4df Implemented notifications 2013-12-25 16:34:42 -05:00
Hillel Coren
8691d0ec26 bug fixes 2013-12-24 16:27:36 -05:00
Hillel Coren
19e95c854c bug fixes 2013-12-24 01:22:16 -05:00
Hillel Coren
2b4245a64f bug fixes 2013-12-17 15:14:47 +02:00
vagrant
6660a7540b Working on reports 2013-12-16 21:27:32 +00:00
Hillel Coren
374e34e733 Starting to work on reports 2013-12-15 14:55:50 +02:00
Hillel Coren
19abec6f09 Enabled contact selection when sending email 2013-12-13 11:13:57 +02:00
Hillel Coren
cf7106e8ac Clean up 2013-12-11 22:37:49 +02:00
Hillel Coren
730b5695ea Clean up 2013-12-11 22:34:25 +02:00
Hillel Coren
f946791780 Bug fixes 2013-12-11 22:33:44 +02:00
Hillel Coren
d97c805d46 Refactoring recurring invoices 2013-12-11 13:11:59 +02:00
Hillel Coren
f97fa8991f Working on recurring invoices 2013-12-11 00:10:43 +02:00
Hillel Coren
0611004e77 Working on recurring invoices 2013-12-10 19:18:35 +02:00
Hillel Coren
78d2d749fb Bug fixes 2013-12-09 11:38:49 +02:00
Hillel Coren
352cf9182a bug fixes 2013-12-08 21:08:17 +02:00
Hillel Coren
ccd7a9f3a7 Floats Handling and PDF.js support 2013-12-08 15:32:49 +02:00
Hillel Coren
b7f09685d0 Cleaning up the routes.php file 2013-12-07 22:33:07 +02:00
Hillel Coren
616df18b06 Cleaning up the templates 2013-12-07 20:45:00 +02:00
Hillel Coren
9053be4976 Working on invoice creation 2013-12-05 22:25:20 +02:00
Hillel Coren
ebdfa54489 Added support for themes 2013-12-05 17:23:24 +02:00
Hillel Coren
4f099c1fa5 Partitioned account data 2013-12-04 18:20:14 +02:00
Hillel Coren
99800f38dd Bug fixes 2013-12-04 00:00:01 +02:00
Hillel Coren
2142538e15 Improving data model 2013-12-03 19:32:33 +02:00
Hillel Coren
06eb6ad240 Working on sign up form 2013-12-02 21:54:24 +02:00
Hillel Coren
dd088d8668 Added timezone support 2013-12-02 14:22:29 +02:00
Hillel Coren
49800b394c Working on PDF 2013-12-01 22:58:25 +02:00
Hillel Coren
aff89cd073 Implemented word wrapping 2013-12-01 14:22:08 +02:00
Hillel Coren
329a47e761 Added ability to archive & delete 2013-12-01 09:33:17 +02:00
Hillel Coren
470e0bf06e Implemented the view client screen 2013-11-29 14:09:21 +02:00
Hillel Coren
b6da02a6b9 Add support for countries 2013-11-28 23:10:01 +02:00
Hillel Coren
f99dde1790 Added support for multiple contacts 2013-11-28 21:06:38 +02:00
Hillel Coren
b79d5210fa Prevent duplicate form submissions 2013-11-28 18:40:13 +02:00
Hillel Coren
746d5ec773 Added support for all Omnipay providers 2013-11-28 14:15:34 +02:00
vagrant
426e7838c9 Creating re-usable products from invoice line items 2013-11-27 07:38:37 +00:00
Hillel Coren
7b41fbc779 Working on activity tracking 2013-11-26 23:45:10 +02:00
Hillel Coren
3c0c908e88 Working on activity log 2013-11-26 23:26:08 +02:00
Hillel Coren
f38ed06193 Initial commit 2013-11-26 14:45:07 +02:00