Commit Graph

183 Commits

Author SHA1 Message Date
Bruno Skvorc 54e8e65bc7 Fixed some git lfs info 2019-08-27 16:15:57 +02:00
Bruno Skvorc 7d9879fcce Updated custom testnet guide 2019-08-27 16:08:35 +02:00
Bruno Skvorc b6ca634a00 Updated docs 2019-08-27 14:52:23 +02:00
dependabot[bot] d83bdb9721 Bump lodash.merge from 4.6.1 to 4.6.2
Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2019-07-15 08:28:29 -04:00
dependabot[bot] b4be740603 Bump lodash from 4.17.11 to 4.17.13
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot[bot] <support@github.com>
2019-07-15 08:28:19 -04:00
Bruno Škvorc f896c92df3
Merge pull request #37 from status-im/develop
Develop
2019-07-12 10:42:08 +02:00
Bruno Skvorc 5c24438a54 Language update 2019-07-12 10:25:20 +02:00
Bruno Skvorc 1fb01e670e Added Eth1 subsection to guides 2019-07-12 10:23:05 +02:00
Bruno Skvorc 8d6e416068 Minor updated in regards to testnet 2019-07-12 10:18:42 +02:00
Jakub Sokołowski f0c7772964
fix missing div in community-popup.swig, add yarn.lock
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-07-01 12:49:32 -04:00
Jakub Sokołowski 0aca6c36d4
select hexo config based on branch, disallow indexing for develop
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-07-01 10:11:15 -04:00
Bruno Skvorc a0be63357f Update instructions with Windows 2019-04-27 22:28:52 +02:00
Bruno Škvorc 87d9a1ac59
Merge pull request #35 from status-im/develop
Develop
2019-04-11 11:49:08 +02:00
Bruno Skvorc d1a851f234 Fixed make 2019-04-11 11:48:29 +02:00
Bruno Skvorc 24e353f5d1 Fixed make 2019-04-11 11:46:53 +02:00
Bruno Škvorc 1d57b15848
Merge pull request #34 from status-im/develop
Develop
2019-04-10 15:26:24 +02:00
Bruno Skvorc 15bef51a5c Added t0 update process 2019-04-10 14:51:35 +02:00
Bruno Skvorc 5274457fc6 Added donation info 2019-04-10 14:50:23 +02:00
Bruno Škvorc 62aa329dbb
Merge pull request #33 from status-im/develop
Develop
2019-04-03 14:38:48 +02:00
Bruno Skvorc 4c537fd365 Added images for tersec and kdeme 2019-04-03 14:34:59 +02:00
Bruno Skvorc 653f6e7db4 Updated some content 2019-04-03 13:59:25 +02:00
Bruno Skvorc 34d1379a2d Updated some content 2019-04-03 13:59:08 +02:00
Bruno Skvorc 917cb7be45 Updated some content 2019-04-03 13:58:21 +02:00
Andy Tudhope 0837e9143a
Merge branch 'develop'
Remove submodules and set Bruno free
2019-03-31 11:45:24 +02:00
Andy Tudhope 15154e3bab
Changes to rsync 2019-03-31 11:39:58 +02:00
Andy Tudhope 993c82dac0
Remove submodules entirely 2019-03-31 11:34:55 +02:00
Andy Tudhope b3065d45d2
Nasty hacks away from submodules: my unified vision has not been realised 2019-03-31 10:57:49 +02:00
Bruno Škvorc b0b275046e
Update README.md 2019-03-30 00:49:57 +01:00
Bruno Škvorc beb1f930ad
Merge pull request #32 from status-im/develop
Updates
2019-03-30 00:48:20 +01:00
Bruno Skvorc 729edc7611 Updates 2019-03-30 00:44:29 +01:00
Bruno Škvorc f7f910a7b2
Merge pull request #31 from status-im/develop
Develop
2019-01-25 09:37:29 +01:00
Bruno Škvorc 916bc49d81
Merge pull request #25 from samthomson/refactor/use-shared-js
refactor/use-shared-js
2019-01-15 09:11:27 +01:00
Sam Thomson acb1ada4c7 remove built js, no need for it to be in repo 2019-01-15 10:08:21 +07:00
Sam Thomson eaec08f795 swap out old duplicated code for new shared code 2019-01-15 10:05:51 +07:00
Sam Thomson 0d91513c89 add shared js to gulp build 2019-01-15 09:51:14 +07:00
Sam Thomson 40caeeac0d merge 2019-01-15 09:41:40 +07:00
Sam Thomson 8ddd1f7bfd can render EJS templates now too (#30)
* upated submodules, now have ejs partials

* ejs parser package
2019-01-14 12:25:08 +02:00
Bruno Skvorc 17686b678c Minor build updates 2019-01-09 18:32:14 +01:00
Bruno Skvorc 55d69927dc New build instructions 2019-01-09 14:33:26 +01:00
Bruno Skvorc 92093bfa9e New build instructions 2019-01-09 14:23:59 +01:00
Bruno Skvorc 681939f136 Fixed Peter 2019-01-09 11:17:34 +01:00
Bruno Škvorc 91d450e833
Merge pull request #28 from status-im/stefan-peter
Fixed team page, fixed broken link on home page
2019-01-08 20:44:48 +01:00
Bruno Skvorc de74ea9783 Fixed team page, fixed broken link on home page 2019-01-08 20:43:57 +01:00
Bruno Škvorc 02cf58dca1
Merge pull request #27 from status-im/stefan-peter
Fixed Stefan's and Peter's name
2019-01-08 19:37:14 +01:00
Bruno Skvorc af750883ee Fixed Stefan's and Peter's name 2019-01-08 19:36:34 +01:00
Bruno Škvorc e109fb1f16
Merge pull request #26 from status-im/stefan-peter
Stefan peter
2019-01-08 19:23:12 +01:00
Bruno Skvorc d1078d8c66 Removed Ryan, added Stefan, Peter 2019-01-08 19:21:08 +01:00
Bruno Skvorc 4356f8c481 Removed Ryan, added Stefan, Peter 2019-01-08 19:19:12 +01:00
Andy Tudhope 91fc044fb8
Merge branch 'develop'
Adds new shared partials, fixes other things
2018-11-29 15:45:51 +02:00
Andy Tudhope dfbc3fef9f
Change submodule commit 2018-11-29 15:43:05 +02:00