Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 14:42:42 +01:00
Code Issues Releases Activity
513 Commits 8 Branches 921 Tags 2 GiB
205cedeaa9
Commit Graph

377 Commits

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