leanote/leanote-android
1
0
Fork 0
mirror of https://github.com/leanote/leanote-android.git synced 2025-10-14 06:07:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
226 Commits 17 Branches 28 Tags
develop
Commit Graph

226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
houxg
9147d1a4fe add missing translation 2017-02-17 13:45:49 +08:00
houxg
16f0a54942 handle note conflicts while updating note 2017-02-17 13:36:13 +08:00
xingxing
f7931d275f fix #4 2017-02-17 13:12:23 +08:00
houxg
44bcf5f3e0 fix fix fetch failed but send a success event 2017-02-17 12:44:42 +08:00
houxg
71bbf10c03 fix bugly key not found 2017-02-17 00:53:52 +08:00
houxg
698b8a393d Merge from upstream, 6ff5c7934e 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/houxg/leamonax/database/AppDataBase.java
#	app/src/main/java/org/houxg/leamonax/ui/MainActivity.java
 2017-02-16 23:14:21 +08:00
houxg
6ff5c7934e fix switch account issue 1.2.1 2017-02-16 23:08:58 +08:00
houxg
2d564321b5 fix none avatar issue 2017-02-16 23:03:36 +08:00
houxg
80a289cdb7 deploy with tag only. test 2017-02-16 13:16:19 +08:00