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
Andy Tudhope
c62b0f9194
Moves more to shared-partials
2018-11-29 15:25:28 +02:00
Andy Tudhope
fa2ba3cccf
Revert "Moves more stuff to shared folder"
...
This reverts commit 6799193586b23739968a5d69fb6477318593d22c.
2018-11-29 15:24:03 +02:00
Andy Tudhope
6799193586
Moves more stuff to shared folder
2018-11-29 15:10:56 +02:00
Andy Tudhope
0d3a6b5773
Updates shared-partials and removes Studio
2018-11-29 13:55:56 +02:00
Andy Tudhope
a13799e733
Merge branch 'develop'
...
Merge new Jenkinsfile
2018-11-28 10:55:25 +02:00
Andy Tudhope
5dc5a72c77
Update Jenkinsfile
2018-11-28 10:55:09 +02:00
Andy Tudhope
131e6a6c3b
Merge branch 'master' of github.com:status-im/nimbus.status.im
...
Merge issues
2018-11-28 10:32:13 +02:00
Sam Thomson
2063113431
Use shared partials ( #24 )
...
* add partials repo as submodule
* use header nav partial
* update header nav to use partial
* added missing popup html
* add update script
* updated submodule(s)
2018-11-28 10:29:37 +02:00
Santiago Gonzalez Toral
5f98d3dac6
Replicate the same structure as on status.im ( #21 )
...
* Replicate the same structure as on status.im
* Fixes parallax effect and overlapping with main menu popups
* Remove twitter social link on header
Co-Authored-By: santteegt <hernangt12re3@gmail.com>
* Remove github link on header
Co-Authored-By: santteegt <hernangt12re3@gmail.com>
* Remove unnecessary SCSS files
2018-11-21 12:40:27 +02:00
Bruno Škvorc
d3ce00e5d8
Merge pull request #19 from status-im/develop
...
Update fetch_blog_posts.js
2018-10-24 15:11:11 +02:00
Bruno Škvorc
2e3ade7a8f
Update fetch_blog_posts.js
2018-10-24 15:00:56 +02:00
Bruno Škvorc
d6ddb0cb04
Merge pull request #18 from status-im/develop
...
Merge pull request #17 from status-im/master
2018-10-24 15:00:00 +02:00
Bruno Škvorc
e994897bd0
Merge pull request #17 from status-im/master
...
Sync up
2018-10-24 14:59:35 +02:00
Bruno Škvorc
6c63df50f4
Update fetch_blog_posts.js
2018-10-24 11:55:11 +02:00
Bruno Škvorc
3169fecf45
Update index.swig
2018-10-22 07:12:42 +02:00
Bruno Škvorc
310f2ce99f
Merge pull request #15 from status-im/develop
...
Develop
2018-10-12 20:41:35 +02:00
Bruno Skvorc
3e1a763e50
Arnetheduck fix
2018-10-12 20:41:03 +02:00
Bruno Skvorc
81e7ee22e3
Jacek github fix
2018-10-12 20:40:07 +02:00
Jacek Sieka
940a881c5d
Merge pull request #14 from status-im/develop
...
Fix arnetheduck link
2018-10-12 10:51:56 -06:00
Jacek Sieka
2fcd82e6cb
Fix arnetheduck link
2018-10-12 10:50:57 -06:00
Bruno Škvorc
16a289876a
Merge pull request #13 from status-im/develop
...
UCFirst on Ryan
2018-10-12 17:04:00 +02:00
Bruno Skvorc
a644125b80
UCFirst on Ryan
2018-10-12 17:03:35 +02:00
Bruno Škvorc
d6c1c8588e
Merge pull request #12 from status-im/develop
...
New code for Ryan
2018-10-12 16:50:14 +02:00
Bruno Skvorc
3863a3625f
New code for Ryan
2018-10-12 16:49:49 +02:00
Bruno Škvorc
93750a0a61
Merge pull request #11 from status-im/develop
...
Develop
2018-10-12 16:12:38 +02:00
Bruno Skvorc
4b08855dd1
Merge branch 'develop' of https://github.com/status-im/nimbus.status.im into develop
2018-10-12 16:12:09 +02:00
Bruno Skvorc
d834f46a22
Hid links
2018-10-12 16:11:58 +02:00
Bruno Škvorc
d2f129d74f
Merge pull request #10 from status-im/master
...
Upstream
2018-10-12 16:09:56 +02:00
Bruno Škvorc
a9edb33bcf
Merge pull request #9 from status-im/develop
...
headline
2018-10-12 16:09:28 +02:00
Bruno Skvorc
545f3efbf4
headline
2018-10-12 16:08:55 +02:00
Bruno Škvorc
3199c6f7b4
Merge pull request #8 from status-im/develop
...
Team status chat links added
2018-10-12 16:07:26 +02:00
Bruno Skvorc
86810e1661
Team status chat links added
2018-10-12 16:06:16 +02:00
Bruno Škvorc
e84c9ddb2c
Merge pull request #7 from status-im/develop
...
Refactored team and some links
2018-10-12 15:51:40 +02:00
Bruno Skvorc
5addf04a37
Refactored team and some links
2018-10-12 15:50:57 +02:00
Bruno Škvorc
7970465077
Merge pull request #6 from status-im/develop
...
Refactored team and some links
2018-10-12 15:31:56 +02:00
Bruno Skvorc
a2742a7762
Refactored team and some links
2018-10-12 15:28:08 +02:00
Bruno Škvorc
85ff631c1e
Merge pull request #5 from status-im/develop
...
Removed stub links and fixed JS for fetching posts
2018-10-12 13:36:37 +02:00
Bruno Skvorc
fcab0d097c
Added nimbus tag to blog fetching
2018-10-12 13:34:52 +02:00
Bruno Skvorc
5a6afc31b0
Added nimbus tag to blog fetching
2018-10-12 13:32:24 +02:00
Bruno Skvorc
703443427c
Removed libs stub
2018-10-12 13:25:04 +02:00
Bruno Skvorc
c921283cd9
Removed advanced options stub
2018-10-12 13:24:41 +02:00
