Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-15 15:42:51 +01:00
Code Issues Releases Activity
736 Commits 7 Branches 925 Tags 2 GiB
1a0090c810
Commit Graph

554 Commits

Author SHA1 Message Date
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