156 Commits

Author	SHA1	Message	Date
houxg	536ebb3969	fix wrong condition of local note	2017-02-21 14:55:06 +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
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	2017-02-16 23:08:58 +08:00
houxg	2d564321b5	fix none avatar issue	2017-02-16 23:03:36 +08:00
houxg	fdf863cd82	apply bugly in production mode only	2017-02-16 13:02:24 +08:00
houxg	61743f341b	fix wrong file name	2017-02-16 12:16:00 +08:00
houxg	efb06e1a59	change the layout of content placeholder	2017-02-15 00:04:37 +08:00
xingxing	9aec891a8e	fixed add notebook title not empty	2017-02-14 22:47:05 +08:00
xingxing	366f89d2ef	support android 4.4(api 19)	2017-02-14 22:36:20 +08:00
houxg	dd2b466139	remember user's habits	2017-02-14 22:20:01 +08:00
houxg	98af752260	showing placeholder while srolling note list	2017-02-14 19:33:13 +08:00
houxg	70eac69784	show image in detail mode	2017-02-14 18:34:04 +08:00
xingxing	fd8735ecc8	update application package name	2017-02-14 13:59:37 +08:00
houxg	b1d60c906f	fix #20, add viewer for big picture	2017-02-14 13:47:28 +08:00
houxg	5c164e99cd	fix large image's width can't be adjust to device's width	2017-02-14 13:45:11 +08:00
yu juehun	cd1c8f41b8	leanoteN	2017-02-14 13:40:49 +08:00
yu juehun	1b9d7518c9	leanote-android	2017-02-14 13:15:21 +08:00
houxg	5635697223	fix recent notebook might be null	2017-02-14 11:40:20 +08:00
houxg	2226ae20b9	add state drawable for account list	2017-02-13 20:01:56 +08:00
houxg	b64e03ed00	add change account animation	2017-02-13 20:00:14 +08:00
houxg	21618d2377	change network log level	2017-02-13 17:31:19 +08:00
houxg	be5e3822d0	apply prd bugly only in travis build	2017-02-13 17:09:30 +08:00
houxg	0c289fa0b8	add translations	2017-02-13 16:50:18 +08:00
houxg	bf20d03d53	code refactor: remove the required context valuable	2017-02-13 16:46:33 +08:00
houxg	3cd583dd60	code refactor ... - extract navigation bar - extract triangle view - remove the definetion of Mode from NoteFragment, now it only accept note list as its input - MainActivity only maintains the control flow	2017-02-13 16:44:43 +08:00
houxg	a0b9361369	code refactor: extract triangle view	2017-02-13 14:35:12 +08:00
houxg	8ad0c0462e	add switch account feature	2017-02-13 14:16:32 +08:00
houxg	f7d9f14639	extract string	2017-02-13 14:09:43 +08:00
houxg	1ebaabdbc8	change the style of action mode	2017-02-11 01:13:37 +08:00
houxg	f139d51c96	fix typefoo	2017-02-11 00:58:28 +08:00
houxg	bded63b809	apply actionmode for deleting notes	2017-02-10 19:50:04 +08:00
houxg	53fafebf32	add change note type action	2017-02-10 17:44:17 +08:00
houxg	acb72fe618	change the transition of SearchActivity to slide from left	2017-02-10 17:27:51 +08:00
houxg	7076aaf6ce	merge 1fa04c6a48	2017-02-09 21:09:47 +08:00
houxg	8898a5c484	merge markdown editor code update from e60a47c63b, 180bc174b1	2017-02-09 19:08:40 +08:00
houxg	65cbea03c0	fix #26	2017-02-09 16:18:50 +08:00