Skip to content

Update the fork from original repository #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m0ver merged 22 commits into from
Jul 24, 2017
Merged

Update the fork from original repository #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
df647d0
Update smalltalk.java
m0ver Jun 4, 2016
73cb12d
Merge branch 'master' of https://github.com/m0ver/tinystruct2.0.git
m0ver Jan 25, 2017
2bf95cc
Merge branch 'master' of https://github.com/m0ver/tinystruct2.0
m0ver May 6, 2017
03e98c7
It's unnecessary to wait for messages.
m0ver May 23, 2017
f2ee505
Merge branch 'master' of https://github.com/m0ver/tinystruct2.0.git
m0ver May 23, 2017
52093bb
Use newSingleThreadExecutor to avoid "unable to create new native
m0ver May 23, 2017
54798ce
Added a monitor object to guarantee the data synchronization
m0ver May 26, 2017
6527101
Fixed conflicts
May 26, 2017
3ddda00
Update unstaged changes
m0ver Jul 4, 2017
3dfa232
Update struct-2.0.jar
m0ver Jul 4, 2017
40b1f8b
Update talk.java as message would not be copied once it hasn't pushed to
m0ver Jul 4, 2017
f479a26
Update talk.java to improve the performance for message update.
m0ver Jul 12, 2017
4b1e023
Update talk.java for improve a logic
m0ver Jul 14, 2017
0091409
Move the servlet-api.jar to lib folder.
m0ver Jul 20, 2017
022d330
Use Lock to instead of synchronized block.
m0ver Jul 20, 2017
43c1853
Improved the using of the Lock
m0ver Jul 21, 2017
b886082
Removed the servlet-api.jar
Jul 21, 2017
079df54
Merge branch 'master' of https://github.com/m0ver/tinystruct2.0.git
Jul 21, 2017
e5c1e7b
Update talk.java for removing locks out.
m0ver Jul 24, 2017
4871af6
Added a timeout for message updating
m0ver Jul 24, 2017
c7b5b70
Fixed NullPointerException issue
m0ver Jul 24, 2017
23f7ec6
Merge pull request #9 from tinystruct/master
m0ver Jul 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified WEB-INF/classes/ApplicationGenerator.class
View file
Open in desktop
Binary file not shown.
138 changes: 49 additions & 89 deletions WEB-INF/classes/themes/reading.view
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,14 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="" />
<meta name="author" content="" />
<link href="/favicon.png" rel="icon" type="image/x-icon"/>
<link href="/favicon.png" rel="shortcut icon" type="image/x-icon"/>

<title>{%book.name%}</title>

<!-- Bootstrap core CSS -->
<link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="/scripts/bootstrap/bootstrap.min.css?raw=true" rel="stylesheet" />
<!-- Custom styles for this template -->

<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="http://getbootstrap.com/assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="http://getbootstrap.com/assets/js/ie-emulation-modes-warning.js"></script>

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<style type="text/css">
#list {
overflow-x:hidden;
Expand Down Expand Up @@ -61,101 +52,70 @@
.arrowline { top:-1px; border-style:dashed dashed solid; border-width:7px; border-color:transparent transparent #d9d9d9 transparent; }
.arrowbg { top:0; border-style:dashed dashed solid; border-width:7px; border-color:transparent transparent #fff transparent; }
</style>
<script type="text/javascript" src="//jquery.com/jquery-wp-content/themes/jquery/js/jquery-1.11.2.min.js"></script>
<script type="text/javascript" src="//ingod.asia/themes/scripts/timer.js"></script>

<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="http://getbootstrap.com/assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="/scripts/bootstrap/ie-emulation-modes-warning.js?raw=true"></script>
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<script type="text/javascript" src="/scripts/jquery-1.11.3.min.js?raw=true"></script>
<script type="text/javascript" src="/scripts/timer.js?raw=true"></script>
</head>
<body>
<!-- Fixed navbar -->
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Library</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>
</ul>
</div><!--/.nav-collapse -->
<!-- Fixed navbar -->
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Library</a>
</div>
</nav>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li><a href="#">Settings</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Manual</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">About</a></li>
</ul>
</li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>

<!-- Begin page content -->
<div class="container">
<div class="pageheader">
</div>
<h1>{%book.name%}</h1>
<div class="clear-fix">[%holy.book.forward%]：<a href="{%base_url%}book/{%book.Id%}/{%lastchapter%}#up" title="{%book.name%} | 第{%lastchapter%}章">&#8249;&#8249; [%holy.book.previous%]</a> <a href="{%base_url%}book/{%book.Id%}/{%nextchapter%}#up" title="{%book.name%} | 第{%nextchapter%}章">[%holy.book.next%] &#8250;&#8250;</a> </div>
<div class="clear-fix">[%book.info%]</div>

<div class="clear-fix">[%holy.book.forward%]：<a href="{%base_url%}book/{%book.Id%}/{%lastchapter%}#up" title="{%book.name%} | 第{%lastchapter%}章">&#8249;&#8249; [%holy.book.previous%]</a> <a href="{%base_url%}book/{%book.Id%}/{%nextchapter%}#up" title="{%book.name%} | 第{%nextchapter%}章">[%holy.book.next%] &#8250;&#8250;</a> </div>
<div class="article">{%content%}</div>
<div class="clear-fix">[%holy.book.forward%]：<a href="{%base_url%}book/{%book.Id%}/{%lastchapter%}#up" title="{%book.name%} | 第{%lastchapter%}章">&#8249;&#8249; [%holy.book.previous%]</a> <a href="{%base_url%}book/{%book.Id%}/{%nextchapter%}#up" title="{%book.name%} | 第{%nextchapter%}章">[%holy.book.next%] &#8250;&#8250;</a> </div>

</div>

<!-- Modal -->
<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true"></span></button>
<h4 class="modal-title" id="myModalLabel">Dialog</h4>
</div>
<div class="modal-body">
<label for="nickname">Your Name:</label><input type="text" class="form-control" name="nickname" id="nickname"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" id="dialog_submit">Save changes</button>
</div>
</div>
</div>
</div>
<!-- Modal -->
<div class="modal fade" id="topic_modal" tabindex="-1" role="dialog" aria-labelledby="ModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true"></span></button>
<h4 class="modal-title" id="ModalLabel">Dialog</h4>
</div>
<div class="modal-body">
<label for="brief">Topics / Questions:</label><textarea class="form-control" name="brief" id="brief"></textarea>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" id="topic_submit">Save changes</button>
</div>
</div>
</div>
</div>

<footer class="footer">
<div class="container">
<p class="text-muted"> © 2015 </p>
</div>
</footer>

<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="http://getbootstrap.com/dist/js/bootstrap.min.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="http://getbootstrap.com/assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="/scripts/bootstrap/bootstrap.min.js?raw=true"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="/scripts/bootstrap/ie10-viewport-bug-workaround.js?raw=true"></script>
</body>
</html>
Loading