Commit Graph

235 Commits

Author SHA1 Message Date
xingxing
177561a7b4 resolve okhttp timeout 2017-04-07 13:27:52 +08:00
xxx
7fc3a0cb98 Merge pull request #29 from binsheng/dev
add launch animation
v1.0-beta.7
2017-04-07 13:12:20 +08:00
xxx
5d20a2ede1 Merge pull request #26 from binsheng/master
fix ProgressBar didn’t hide when host error in SignInActivity use custom host.
2017-04-07 00:37:02 +08:00
bin
0c41645317 add animate in LaunchActivity 2017-03-29 14:05:32 +08:00
bin
e1d3df3063 add launch background 2017-03-29 14:01:30 +08:00
bin
4e8ae67d81 fix ProgressBar didn’t hide when host error 2017-03-26 21:31:11 +08:00
xingxing
5d43387369 当搜索记录为0条的时候,提示toast,关闭软键盘 2017-03-21 23:45:12 +08:00
xingxing
b681327733 Merge branch 'develop' v1.0-beta.6.1 2017-03-11 22:38:48 +08:00
houxg
d708228fc9 fix #14 Merge branch 'upstream/develop' into develop
# Conflicts:
#	app/src/main/java/org/houxg/leamonax/ui/Navigation.java
#	app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java
#	app/src/main/res/values-zh/strings.xml
#	app/src/main/res/values/strings.xml
2017-03-10 15:23:51 +08:00
houxg
1fff5bf9fa apply noteFragment in SearchActivity; add pull to push 2017-03-09 21:29:55 +08:00
houxg
d6bda6a367 fix pass null to callback.onDestroy() 2017-03-09 15:21:18 +08:00
houxg
6c7926d8ed Merge branch 'upstream/develop' into develop
# Conflicts:
#	app/src/main/java/org/houxg/leamonax/ui/MainActivity.java
#	app/src/main/java/org/houxg/leamonax/ui/Navigation.java
#	app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java
#	app/src/main/res/values-zh/strings.xml
#	app/src/main/res/values/strings.xml
2017-03-09 15:19:00 +08:00
xingxing
6874a131fb fix add notebook but title is empty 2017-03-09 14:59:59 +08:00
houxg
f3e5de1d5f fix can't delete note 2017-03-09 14:48:18 +08:00
houxg
0343a345dc code refactoring: replace database query code to xxDataStore 2017-03-09 11:10:37 +08:00
xingxing
d731abf929 use stethoInterceptor for debug v1.0-beta.6 2017-03-08 23:35:14 +08:00
houxg
5f501b27d1 fix #18 can't login/register issue for some of self-hosts Nightly-20170307 2017-03-07 11:15:24 +08:00
houxg
b5dbf67d36 fix wrong example 2017-03-07 11:14:23 +08:00
houxg
8457376f58 fix can't login/register issue for some of self-hosts 2017-03-07 11:10:04 +08:00
houxg
66be19733d fix wrong example 2017-03-07 10:51:53 +08:00
xingxing
e0e4ce83be 修复笔记内容太多 预览出现anr v1.0-beta.3 v1.0-beta.4 v1.0-beta.5 2017-03-03 13:09:19 +08:00
life
a1271d9c6d update readme 2017-03-03 10:30:01 +08:00
xxx
932d9d4ccc Merge pull request #15 from leanote/feature/edit-notebook-title
Feature/edit notebook title
v1.0-beta.2
2017-03-01 08:57:09 -06:00
xingxing
053d795f3a use betterspinner
complete choose parent notebook to create new notebook
2017-03-01 19:18:57 +08:00
xingxing
58eb523332 update notebook title 2017-03-01 19:18:50 +08:00
houxg
9affd84981 code refactoring: extract pull-to-refresh 2017-03-01 17:34:41 +08:00
houxg
259167bf9a code refactoring: move getCurrent() method to Account class 2017-03-01 17:31:43 +08:00
houxg
ed7c476754 code refactoring: clean all static methon in db layer 2017-02-28 18:53:39 +08:00
life
a7e78d9c48 About/My blog/Leanote Explore v1.0-beta 2017-02-22 13:50:45 +08:00
life
805fa0d1af Editor style optimization 2017-02-22 11:58:46 +08:00
houxg
55ca0af690 when in notebook mode, use current notebook as deafault for create a note, otherwise use recent notebook 2017-02-22 11:55:16 +08:00
houxg
11a06dadc0 when in notebook mode, use current notebook as deafault for create a note, otherwise use recent notebook 2017-02-22 11:52:38 +08:00
life
04b6aa26c3 Leanote style menu 2017-02-22 10:31:38 +08:00
houxg
4eea3edf4d extract color 2017-02-21 18:13:13 +08:00
houxg
399cf2a654 code refactoring 2017-02-21 16:13:35 +08:00
houxg
b00ccddbec remove redundant method 2017-02-21 15:55:03 +08:00
houxg
a0757384e0 fix update note but actually add note 2017-02-21 15:40:48 +08:00
houxg
de94602c97 fix update note but actually add note 2017-02-21 15:40:09 +08:00
houxg
536ebb3969 fix wrong condition of local note 2017-02-21 14:55:06 +08:00
houxg
75582c2167 fix wrong condition of local note 2017-02-21 14:53:40 +08:00
houxg
8de405c68d Merge branch 'upstream/master' 2017-02-21 14:34:34 +08:00
houxg
99d07c90bf fix extra conflict note 2017-02-21 14:33:13 +08:00
houxg
99a56ac28a Merge branch 'upstream/master' 2017-02-21 11:25:02 +08:00
houxg
99e79e9622 Merge pull request #9 from leanote/bugfix/delete-note
修复ActionMode模式下,删除笔记,点击删除,list为null的错误
2017-02-19 19:44:48 +08:00
xingxing
c9998c1c21 修复ActionMode模式下,删除笔记,点击删除,list为null的错误 2017-02-18 14:37:22 +08:00
xingxing
4a3c1ffd8f hide search icon, it's ugly 2017-02-18 00:33:19 +08:00
xingxing
c49e521db1 fix #4 2017-02-17 23:09:55 +08:00
houxg
cb13146d3c fix migration crash 2017-02-17 20:50:35 +08:00
houxg
acc1bc5cf1 monitoring null drawable issue 2017-02-17 20:10:47 +08:00
houxg
f616101010 fix no response for toggle view type at first time 2017-02-17 15:57:16 +08:00