Commit Graph

1125 Commits

Author SHA1 Message Date
Roman Volosovskyi 0c69a27d95 unused aliases 2017-01-16 08:23:02 +02:00
Jarrad 42b14e71df Merge pull request #721 from johnmn3/feature/slash-command-char-regex-#687
chat.suggestions: updated regex for switch from ! to / command char
2017-01-14 09:39:05 +07:00
Jarrad 3bba4d7d08 developer introduction 2017-01-13 18:47:26 +07:00
Jarrad 3c6b138b20 free (libre) 2017-01-13 18:17:22 +07:00
john ce2a31b233 chat.suggestions: updated regex for switch from ! to / command char 2017-01-12 13:50:53 -05:00
Jarrad 00d7a6a0f4 Merge pull request #705 from GustavoNunes/feature/slash-command-char-#687
chat: change command char from ! to /  #687
2017-01-12 15:57:52 +07:00
Jarrad 395d3de927 Merge pull request #704 from GustavoNunes/bug/request-null-eth-#668
Prevent non-positive-number amounts for send / request commands (#668)
2017-01-12 15:36:55 +07:00
Jarrad Hope 8c37c2faa9 Merge remote-tracking branch 'origin/master' into develop 2017-01-12 15:33:22 +07:00
Gustavo Nunes c948b9b88e chat: change command char from ! to / #687 2017-01-11 14:07:47 -02:00
Gustavo Nunes 66c9e97eef Prevent non-positive-number amounts for send / request commands 2017-01-11 13:57:18 -02:00
Jarrad 77826d328c Merge pull request #711 from GustavoNunes/bug/recover-empty-status-#637
accounts: add a random status to a recovered account #637
2017-01-11 17:24:49 +07:00
Gustavo Nunes 206464180b accounts: add a random status to a recovered account #637 2017-01-10 23:27:41 -02:00
Jarrad fd773c41ca Merge pull request #624 from d10r/auto-capitalize
chat: auto capitalize first letter of each sentence
2017-01-10 16:28:55 +07:00
Jarrad 5f0977e899 Merge pull request #689 from tpatja/feature/fi-translation
translations: add fi translation
2017-01-10 16:26:52 +07:00
Jarrad 254ad92b5d Merge pull request #625 from d10r/translations
minor fixes in English and German translations
2017-01-10 16:25:57 +07:00
Jarrad db3c3111d0 Merge pull request #617 from rolandkofler/patch-3
some german fixes
2017-01-10 16:24:57 +07:00
Jarrad 854adc087f Merge branch 'develop' into patch-3 2017-01-10 16:24:51 +07:00
Jarrad 95bec76245 Merge pull request #619 from rolandkofler/patch-5
Reviewed the file for more errors
2017-01-10 16:24:15 +07:00
Jarrad ed6f3de5c5 Merge branch 'develop' into patch-5 2017-01-10 16:24:09 +07:00
Jarrad b5e5f1b72a Merge pull request #618 from rolandkofler/patch-4
Better using a verb here
2017-01-10 16:23:20 +07:00
Jarrad 8481b31f7c Merge branch 'develop' into patch-4 2017-01-10 16:23:03 +07:00
Jarrad a1c12926cf Merge pull request #616 from rolandkofler/patch-1
Some German fixes
2017-01-10 16:18:36 +07:00
Jarrad 246e788919 Merge pull request #623 from TheHealthyCat/patch-1
Update it.cljs
2017-01-10 16:17:54 +07:00
Jarrad 36f2d1a57c Merge pull request #708 from MCRy/patch-1
Update zh_hans.cljs
2017-01-10 16:16:52 +07:00
Jarrad 61c4ea5bbc Merge pull request #671 from vicodin1123/patch-1
Update zh_hant.cljs
2017-01-10 16:15:56 +07:00
RayX 8bf14dc500 Update zh_hans.cljs
corrected some errors
2017-01-10 15:46:57 +08:00
Jarrad a9fd3ac07b Merge pull request #626 from harshjv/fix/missing-comma
add missing comma in commands.js
2017-01-10 14:16:03 +07:00
Teemu Patja e943b4f581
translations: add fi translation 2017-01-08 14:41:33 +02:00
vicodin1123 5fd4003fea Update zh_hant.cljs 2017-01-07 01:41:22 +08:00
Harsh Vakharia 302a1c7214 Add missing comma 2017-01-05 23:07:04 +05:30
didi 865e84584f minor fix in English and German translations 2017-01-05 17:23:04 +01:00
didi effcc97f8c chat: auto capitalize first letter of each sentence 2017-01-05 16:56:49 +01:00
TheHealthyCat 0c1be1cf1f Update it.cljs 2017-01-05 12:50:12 +01:00
Roland Kofler 3b325691dd Reviewed the file for more errors 2017-01-05 11:13:17 +01:00
Roland Kofler 878b4dc90d Better using a verb here 2017-01-05 10:58:36 +01:00
Roland Kofler faa122b5b7 some german fixes 2017-01-05 10:38:30 +01:00
Roland Kofler abe9a89cac Subject "nachricht" is uppercase 2017-01-05 10:20:48 +01:00
Jarrad Hope bfa522bf60 Merge branch 'develop' 2017-01-05 10:11:14 +07:00
Jarrad Hope ad3aed7d01 missing microphone plist entry 2017-01-05 01:28:49 +07:00
Jarrad 630c6bd4ee add youtube video 2017-01-04 20:09:30 +07:00
Roman Volosovskyi a95b307810 fix navigation after qr scanning 2017-01-04 14:03:28 +02:00
Roman Volosovskyi a0d8c22f84 another attempt to fix issue #607 2017-01-04 10:58:46 +02:00
Jarrad 13e9283477 Merge pull request #614 from status-im/feature/default-contacts
add default DApp contacts
2017-01-04 13:04:42 +07:00
Jarrad Hope 0eefb02e25 add default dapps
new file:   images/contacts/flight-delays-suck.png
	new file:   images/contacts/jarrad.png
	new file:   images/contacts/mkr-market.png
	new file:   images/contacts/oaken-water-meter.png
	modified:   resources/default_contacts.json
	modified:   src/status_im/resources.cljs
2017-01-04 13:02:39 +07:00
Jarrad 6ee32a96c1 Merge pull request #613 from status-im/bug/#608
Non-DApp Default Contact cannot receive messages or friend requests (#608)
2017-01-04 11:46:41 +07:00
alwx 3825f19f06 Non-DApp Default Contact cannot receive messages or friend requests (#608) 2017-01-03 16:30:37 +03:00
Roman Volosovskyi 8af289c543 Merge pull request #612 from status-im/bug/#610
Bigger area for cross on QR display screen (#610)
2017-01-03 13:07:43 +02:00
Roman Volosovskyi 82f88b3a36 fix #611 2017-01-03 12:59:00 +02:00
alwx c4e4400ccb Bigger area for cross on QR display screen (#610) 2017-01-03 13:51:54 +03:00
Roman Volosovskyi afaef1db9c restart rpc on "Failed to connect to localhost/127.0.0.1:8545" (related to #607) 2017-01-03 10:18:29 +02:00