1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Commit Graph

2704 Commits

Author SHA1 Message Date
Hillel Coren
747f199ce8 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-03 21:39:27 +02:00
Hillel Coren
eb6cd45913 Minor fixes 2016-03-03 21:39:15 +02:00
David Bomba
9739957d87 Merge pull request #750 from turbo124/develop
Push Notifications - Bug fixes
2016-03-03 21:03:47 +11:00
David Bomba
fd4ec8cb6d bug fixes 2016-03-03 20:52:47 +11:00
Hillel Coren
9c5944e2c4 Fix for #747 2016-03-03 11:44:03 +02:00
David Bomba
5950d0e0be Bug Fixes 2016-03-03 19:48:33 +11:00
Hillel Coren
ee8a01ff3a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-03 10:44:55 +02:00
Hillel Coren
b2e89d79aa Updated readme 2016-03-03 10:44:46 +02:00
David Bomba
533f96725b Merge pull request #749 from turbo124/develop
Adding translations into push notifications.
2016-03-03 14:22:54 +11:00
David Bomba
a42202650e bug fixes 2016-03-03 14:21:00 +11:00
David Bomba
9744ad69b7 Localization API & PUSH 2016-03-03 13:28:16 +11:00
David Bomba
28cd3e01a7 Bug fixes push notifications 2016-03-03 11:24:13 +11:00
Hillel Coren
ab8f40517f Fix for tests 2016-03-02 22:51:13 +02:00
Hillel Coren
cc03b4456c Working on tests 2016-03-02 19:23:20 +02:00
Hillel Coren
8572e9252c Working on Laravel 5.2 2016-03-02 16:36:46 +02:00
Hillel Coren
88696c4eec Added auth check in subscription listeners 2016-03-02 16:29:26 +02:00
Hillel Coren
ea642ca089 Upgrade to Laravel 5.2 2016-03-02 15:43:09 +02:00
Hillel Coren
9efaada9f5 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-02 15:36:48 +02:00
Hillel Coren
aef4c6be98 Upgrade to Laravel 5.2 2016-03-02 15:36:42 +02:00
Akira Matsuda
0b9b3cb7bc fix garbled characters when cjk lang is selected. 2016-03-02 20:38:51 +09:00
David Bomba
01ca591026 Merge pull request #746 from turbo124/develop
Bug Fixes
2016-03-02 22:17:25 +11:00
David Bomba
6ff569a5a3 Bug Fixes 2016-03-02 22:16:06 +11:00
David Bomba
1d0c35ec76 Bug Fixes 2016-03-02 22:14:42 +11:00
David Bomba
8a33f6fec6 Bug Fixes 2016-03-02 22:00:08 +11:00
David Bomba
50c5d52e08 Bug Fixes 2016-03-02 21:52:59 +11:00
David Bomba
b14f8e2dfe Bug fixes 2016-03-02 21:08:12 +11:00
David Bomba
2d5a30490e Merge pull request #745 from turbo124/develop
Bug fixes
2016-03-02 12:19:00 +11:00
David Bomba
922849409c Bug Fix 2016-03-02 12:17:59 +11:00
David Bomba
3c813138fa Merge branch 'develop' of https://github.com/turbo124/invoiceninja into develop 2016-03-02 12:15:54 +11:00
David Bomba
c1b9d6febc Bug Fix 2016-03-02 12:13:57 +11:00
David Bomba
1e39a85066 merge 2016-03-02 06:46:47 +11:00
David Bomba
aa4aae4797 Working on API 2016-03-01 21:31:23 +11:00
Hillel Coren
e5fac72e01 Bug fix for migration down 2016-03-01 11:27:10 +02:00
David Bomba
f7da00ff27 Merge remote-tracking branch 'upstream/develop' into develop 2016-03-01 20:18:30 +11:00
Hillel Coren
c5fdb2ca7d Updated Travis PHP version 2016-03-01 11:17:14 +02:00
Hillel Coren
f4a14807b9 Update Travis PHP version 2016-03-01 11:09:15 +02:00
Hillel Coren
10dc9a3da1 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
Conflicts:
	composer.lock
2016-03-01 10:52:14 +02:00
Hillel Coren
b2d9ac0468 Removed Neteller driver 2016-03-01 10:23:58 +02:00
Hillel Coren
3b5311e960 Added setting to show/hide client portal dashboard 2016-03-01 09:36:37 +02:00
David Bomba
66fca98fa1 Update readme.md 2016-03-01 18:18:13 +11:00
David Bomba
bb6b32bcd9 Update readme.md 2016-03-01 18:15:43 +11:00
David Bomba
0155f08d0d Merge pull request #743 from turbo124/push_notifications
Push notifications
2016-03-01 15:27:03 +11:00
David Bomba
6e3b1ecb4b Push Notifications 2016-03-01 15:06:54 +11:00
David Bomba
1aef96f027 Push Notifications 2016-03-01 14:44:14 +11:00
David Bomba
2438195c08 Push Notifications 2016-03-01 14:00:11 +11:00
David Bomba
f1bc597034 Push Notifications 2016-03-01 13:57:59 +11:00
David Bomba
57a4a24294 Push Notifications 2016-03-01 11:31:16 +11:00
David Bomba
4244301b62 Merge remote-tracking branch 'upstream/develop' into develop 2016-03-01 08:48:47 +11:00
David Bomba
50510bfcb1 Merge branch 'develop' of https://github.com/turbo124/invoiceninja into develop
:Wcommit message to explain why this merge is necessary,
2016-03-01 08:48:31 +11:00
Joshua Dwire
6376302ed9 Add option for client portal password 2016-02-29 16:46:27 -05:00