1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Commit Graph

3405 Commits

Author SHA1 Message Date
Hillel Coren
19b443d641 Fix for #917 2016-07-03 15:56:01 +03:00
Hillel Coren
698ec1e9d4 Fix for markdown when text is a single line 2016-07-03 13:20:46 +03:00
Hillel Coren
3025fb3f0b Merge pull request #938 from codedge/#426-Translate-hardcoded-string
Fix hardcoded translations for industry, country and payment types
2016-07-03 13:16:20 +03:00
vagrant
3e912db1cb Resolve conflicts 2016-07-03 09:34:34 +00:00
Hillel Coren
32a2f6cdc7 Fix for #920 2016-07-03 12:33:35 +03:00
Holger Lösken
1aa0110580 Return $LANG array for Transifex 2016-07-03 09:27:49 +00:00
Holger Lösken
337ed1c719 - Fix #426, closes #426
- Moved translations for industries, countries into texts.php
- Removed nested arrays in texts.php
2016-07-03 09:26:08 +00:00
Holger Lösken
b13b9a2d7d Fix hardcoded translations for industry, country and payment types
- Fixes #426, resolves #426
2016-07-03 09:24:55 +00:00
Hillel Coren
6dc0f93534 Fix for #922 2016-07-03 12:18:46 +03:00
Holger Lösken
da87f9342d Return $LANG array for Transifex 2016-07-03 11:06:34 +02:00
Hillel Coren
f9aee23de8 Merge pull request #923 from vincentdh/develop
Add Mailgun API in mail drivers
2016-07-03 11:58:24 +03:00
Holger Lösken
96d15ccb2d - Fix #426, closes #426
- Moved translations for industries, countries into texts.php
- Removed nested arrays in texts.php
2016-07-02 23:18:13 +02:00
Hillel Coren
7e3a0ba91d Fix for tests 2016-07-02 23:20:52 +03:00
Hillel Coren
d3ffb652cb Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-02 23:18:15 +03:00
Hillel Coren
3c9059940c Merge pull request #945 from codedge/#898-Support-AES-Cipher
Use cipher AES-256-CBC
2016-07-02 23:17:17 +03:00
Hillel Coren
7a754eed18 Merge pull request #944 from codedge/#941-Remove-unused-packages
Remove unused packages from composer.json
2016-07-02 23:16:21 +03:00
Holger Lösken
70db153196 Use cipher AES-256-CBC
- Fix #898, resolve #898
- Change cipher from Rinjdael-128 to AES-256-CBC
2016-07-02 22:08:07 +02:00
Holger Lösken
f255bb5444 Remove unused packages from composer.json
- Fix #941, resolve #941
- Remove unused packages from composer.json
- Update composer.lock
2016-07-02 22:01:12 +02:00
Hillel Coren
81f7d93fbf Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-02 22:35:17 +03:00
Hillel Coren
5f433f2ed9 Merge pull request #943 from codedge/#940-Move-Faker-to-dev-section
Move Faker to require-dev section
2016-07-02 22:34:29 +03:00
Holger Lösken
9e18ecec8e Move Faker to require-dev section
- Fixes #940 and resolves #940
- Move Faker to dev section of composer.json
2016-07-02 21:31:51 +02:00
Holger Lösken
fdb8c707e1 Fix hardcoded translations for industry, country and payment types
- Fixes #426, resolves #426
2016-07-01 23:19:09 +02:00
Hillel Coren
3f974d0344 Optimized send recurring invoices command 2016-07-01 10:29:24 +03:00
Hillel Coren
ff911888ec Merging tranlations from Transifex 2016-06-30 21:26:14 +03:00
Hillel Coren
fbdabdee64 Minor formatting change 2016-06-30 21:05:02 +03:00
Hillel Coren
f71f4fe2fc Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-30 20:53:31 +03:00
Hillel Coren
fec1161434 Fix for invoice footer 2016-06-30 20:53:18 +03:00
Hillel Coren
6dfd50bddd Fix for enabling autobilling 2016-06-30 20:53:06 +03:00
Hillel Coren
b494a0fce5 Merge pull request #935 from codedge/#933-Laravel-idehelper-debugbar
Fix #933
2016-06-30 20:47:27 +03:00
vagrant
fb5ddd7839 Merge branch '#933-Laravel-idehelper-debugbar' of github.com:codedge/invoiceninja into #933-Laravel-idehelper-debugbar 2016-06-30 17:34:11 +00:00
Holger Lösken
65daa6a5a7 Fix #933 2016-06-30 17:33:31 +00:00
Hillel Coren
0cc0bcbdcf Remove uses_local_payment_methods 2016-06-30 20:30:47 +03:00
Hillel Coren
7ff977d68d Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-30 20:29:23 +03:00
Holger Lösken
bf736747cf Fix #932 2016-06-30 19:29:09 +02:00
Hillel Coren
9445bdb009 Merge pull request #934 from codedge/#932-Remove-komodoproject
Fix #932
2016-06-30 20:28:14 +03:00
Holger Lösken
05b0194a2b Fix #932
Remove komodoproject from source
2016-06-30 19:11:12 +02:00
Hillel Coren
e61892127d Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-30 17:45:19 +03:00
Hillel Coren
2438fa4fda Merge pull request #931 from codedge/#203-Use-database-prefix-dashboard
Fix #203
2016-06-30 17:44:40 +03:00
Hillel Coren
274a89a96e Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-30 16:47:42 +03:00
Hillel Coren
d63a8cd7e8 Merge pull request #930 from codedge/#562-Manual-entry-untranslatable
Fix #562
2016-06-30 16:46:56 +03:00
Holger Lösken
3d3aab41e0 Fixed wrong translation name, need to include the file "texts." 2016-06-30 15:23:45 +02:00
Holger Lösken
1717028d36 Fixed wrong translation name, need to include the file "texts." 2016-06-30 15:21:03 +02:00
Holger Lösken
8b486ddfcc Fix #203 2016-06-30 15:14:54 +02:00
Holger Lösken
ae78a177b0 Fix #562
Make „Manual entry“ translatable
2016-06-30 14:38:55 +02:00
Hillel Coren
50b71b07cc Updated reseller sign up fee 2016-06-29 23:08:55 +03:00
Hillel Coren
cbe39f9aaf Fix for elegant design 2016-06-29 22:59:54 +03:00
Hillel Coren
9603439a33 Added additional designs 2016-06-29 22:48:56 +03:00
Hillel Coren
0250fcec23 Updated app links in readme 2016-06-29 13:40:07 +03:00
Hillel Coren
0449fe2515 Minor text/styling fixes 2016-06-28 21:22:16 +03:00
Hillel Coren
c1713c190c Fix for go pro process 2016-06-28 21:21:54 +03:00