Commit Graph

798 Commits

Author SHA1 Message Date
lepipele
5f940df1b4 Migrating Invoice styling 2018-04-18 23:44:01 -05:00
lepipele
3f85918a0c Merge remote-tracking branch 'source/master' into dev-bootstrap
# Conflicts:
#	BTCPayServer/Controllers/ServerController.cs
#	BTCPayServer/Views/Invoice/Invoice.cshtml
2018-04-18 23:38:10 -05:00
nicolas.dorier
e4299c09ea bump 2018-04-18 22:28:31 +09:00
nicolas.dorier
e864cf35f7 bump NBitcoin 2018-04-18 22:28:04 +09:00
nicolas.dorier
3652866660 View offchain payments in Invoice screen 2018-04-18 22:27:01 +09:00
nicolas.dorier
0421004616 fix point of sale view on mobile 2018-04-18 21:52:13 +09:00
nicolas.dorier
6936b034cb Add Bitcoin average quota 2018-04-18 18:23:39 +09:00
nicolas.dorier
73ed4003a3 Use a drop down for preferred exchange list 2018-04-18 16:38:56 +09:00
nicolas.dorier
5cb8cdd511 Refactoring: Do not query database when asking for Coinaverage rates, periodically get exchange list 2018-04-18 16:38:56 +09:00
lepipele
195b5fdd1a Adding overriding of CreativeStartUri, refactoring PoliciesSettings 2018-04-17 17:24:00 -05:00
lepipele
d19b78b6cc Moving Creative Start files to dedicated folder 2018-04-17 17:23:33 -05:00
lepipele
9bbc05c3a7 Cleaning Invoice table, removing style attrs
Ref: https://github.com/btcpayserver/btcpayserver/issues/82

Co-authored-by: Esky33 <support@btcpayjungle.com>
2018-04-17 16:48:50 -05:00
lepipele
7df3c86649 Tweaking primary color now that creative.css no longer overrides 2018-04-17 16:29:05 -05:00
lepipele
c6e0a923bb Unifying bg-dark style, cleaning up references to extra colors 2018-04-17 16:22:20 -05:00
lepipele
637fe1727b Adding missing font styles back in
These are referenced by Creative - Start Bootstrap theme
2018-04-17 16:12:17 -05:00
lepipele
fd087bbeb8 Streamlining style for footer 2018-04-17 15:33:29 -05:00
lepipele
2f515e1cc0 Removing unused classes 2018-04-17 15:20:27 -05:00
Nicolas Dorier
84cd9e570f
Merge pull request #128 from pajasevi/cs-trancaction-count
Transaction count CS translation
2018-04-17 11:31:29 +09:00
nicolas.dorier
ead97a24bd Update NBitcoin 2018-04-16 19:15:44 +09:00
pajasevi
415cde1629 Transaction count CS translation 2018-04-16 09:11:46 +02:00
nicolas.dorier
b438312fde fix js 2018-04-16 11:38:10 +09:00
Nicolas Dorier
79ff2cb271
Merge pull request #127 from bitmario/master
Add Portuguese (Portugal) translation
2018-04-16 11:28:54 +09:00
Nicolas Dorier
ed1464c405
Merge pull request #125 from LinoxBE/dutch-translation
Dutch update txCount
2018-04-16 11:28:10 +09:00
Nicolas Dorier
f85631429b
Merge pull request #126 from mutedstorm/patch-2
fix german translation
2018-04-16 11:27:41 +09:00
nicolas.dorier
5ed56d1137 Update JA translations 2018-04-16 11:26:29 +09:00
Mário
d7719d25b4 Add Portuguese (Portugal) translation 2018-04-16 01:29:42 +01:00
mutedstorm
6267cccc3f
fix german translation
minor changes, thanks to (@raindogdance)
2018-04-15 22:47:08 +02:00
LinoxBE
fd5c4021f7 Dutch update txCount 2018-04-15 20:00:11 +02:00
nicolas.dorier
b8bf4d99ac Bump 2018-04-15 21:29:44 +09:00
nicolas.dorier
0723eec508 Fix rate handling 2018-04-15 21:21:57 +09:00
Nicolas Dorier
7f01a12245
Merge pull request #124 from mutedstorm/patch-1
fix german translation
2018-04-15 21:20:06 +09:00
mutedstorm
e1e3e5d953
fix german translation
fixed small errors and changed "Geldbörse / Brieftasche" back to Wallet because its never translated on German sites so its unnecessary.
2018-04-15 12:32:24 +02:00
lepipele
18986faca8 Merge remote-tracking branch 'source/master' into dev-bootstrap
# Conflicts:
#	BTCPayServer/Controllers/ServerController.cs
2018-04-14 11:11:38 -05:00
Rockstar Developer
2a68f8a90f
Merge pull request #121 from lepipele/master
Adding German translations
2018-04-14 10:54:04 -05:00
lepipele
659936577b Adding German translations
Again using Google Translate, we need native speaker to review them
2018-04-14 10:53:02 -05:00
nicolas.dorier
85efc3b00c fix tests 2018-04-14 23:32:39 +09:00
nicolas.dorier
5efac45d46 bump 2018-04-14 22:55:35 +09:00
nicolas.dorier
c7dce280d7 fix js 2018-04-14 22:53:31 +09:00
nicolas.dorier
04c6107196 Can configure rate caching and bitcoinaverage API keys 2018-04-14 22:52:57 +09:00
Nicolas Dorier
54ce9b5dab
Merge pull request #120 from rsandrade/patch-2
Update pt_BR.js
2018-04-14 21:40:38 +09:00
Ricardo Andrade
cee955fb9d
Update pt_BR.js 2018-04-14 07:48:31 -03:00
nicolas.dorier
2e4b0daa48 add french translation, bump NBitcoin 2018-04-14 13:18:56 +09:00
Nicolas Dorier
e85ccfb47e
Merge pull request #117 from lepipele/master
Improvements to i18n, invoice expiry bugfix
2018-04-14 13:06:45 +09:00
lepipele
b099f93c78 Adjusting Policies form to look better on different screen sizes 2018-04-13 16:15:21 -05:00
lepipele
81afe397be CssThemeManager that injects Bootstrap css uri from settings 2018-04-13 16:15:03 -05:00
lepipele
f869c06aee Adding Bootstrap theme uri field to settings 2018-04-13 15:42:34 -05:00
lepipele
75099b99d4 TxCount strings in Spanish 2018-04-13 14:44:42 -05:00
lepipele
7b1b2a0f68 Bugfixing redirect link when invoice expires
Refactoring logic so that it's same for paid and expired
2018-04-13 14:39:45 -05:00
lepipele
203c28df3d Extracting transaction string and supporting plural form 2018-04-13 14:10:06 -05:00
nicolas.dorier
2e2c3cdec4 bump 2018-04-14 00:06:00 +09:00