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
101 Commits 17 Branches 28 Tags
ad8cf04d0c5cbdb72eba7eb054f8e7146e3e1a60
Commit Graph

101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
houxg
ad8cf04d0c Merge branch 'develop' into feature/import_html 
# Conflicts:
#	app/src/main/res/values/strings.xml
 2016-12-21 18:39:49 +08:00
houxg
5d01486134 fix different UI in SearchActivity 2016-12-21 18:38:27 +08:00
houxg
5ddd1f6538 add Chinese support 2016-12-21 18:36:01 +08:00
houxg
a8deccc0c5 fix typeos 2016-12-21 18:33:57 +08:00
houxg
13d34e5590 fix can’t save changes when clicked navigation button 2016-12-21 16:38:20 +08:00
houxg
726649e245 add dialog for declare which notebook that html files should be import to 2016-12-21 16:32:09 +08:00
houxg
bb20a51344 add dialog for selecting notebook 2016-12-21 16:05:33 +08:00
houxg
6338b4fecd fixed scrolling stuck issue 2016-12-21 14:54:46 +08:00
houxg
25004b4f39 paralle import 2016-12-20 17:37:40 +08:00
houxg
12c327da62 Merge branch 'develop' into feature/import_html 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/houxg/leamonax/ui/AboutActivity.java
#	app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java
#	app/src/main/res/menu/preview.xml
 2016-12-19 15:45:17 +08:00
houxg
9c0fe8b9c8 Merge branch 'feature/tinnyMCE' into develop 
# Conflicts:
#	app/src/main/res/values/strings.xml
 2016-12-19 15:32:11 +08:00
houxg
1d6cae0ee3 add github url 2016-12-19 15:30:42 +08:00
houxg
6864ce5d7e add better tips for custom host; fix issue that user can’t sign up by app 2016-12-19 15:19:08 +08:00
houxg
1bba209bed integrate ugly 2016-12-16 19:25:55 +08:00
houxg
21e192ae02 fix get content error 2016-12-16 18:32:38 +08:00
houxg
d6f6bfe277 Merge branch 'develop' into feature/tinnyMCE 2016-12-16 18:28:53 +08:00
houxg
d67ec29088 be compatible with desktop-app 2016-12-16 18:27:55 +08:00
houxg
39a7fecd37 get editor’s content by retrieve DOM structure, just like what desktop-app did. 
- use origin tinyMCE
- add no-border style to title and content container
 2016-12-16 16:39:18 +08:00
houxg
50e5f91b0a fix compile error 2016-12-16 15:56:42 +08:00
houxg
1e6b7663f9 modify condition to be compatible with SENSITIVE ACE 2016-12-16 15:55:40 +08:00
houxg
ea43d3bfa8 Update README.md 1.1.1 2016-12-16 12:42:44 +08:00
houxg
290b16618c change screenshot name 2016-12-16 12:35:36 +08:00
houxg
da54213961 update README 2016-12-16 12:34:08 +08:00
houxg
9d263e12a9 fix condition of xml-like code detection 2016-12-15 19:31:43 +08:00
houxg
13c7621335 hide editor’s border 2016-12-15 18:00:53 +08:00
houxg
cb803d542c accomplish format bar 2016-12-15 18:00:32 +08:00
houxg
d3c5fc55dd identify code type, add “brush:html” for xml like code 2016-12-15 14:56:13 +08:00
houxg
6e557f398d to be compatible with desktop app, remove the <code> element which is the only child of <pre> 2016-12-15 13:27:21 +08:00
houxg
899d647028 add brush class to avoid code missing in desk app 2016-12-15 10:43:58 +08:00
houxg
878529d9ce temporary commit: add native js callback 2016-12-15 10:16:53 +08:00
houxg
73ee654862 remove tag’s attributes 2016-12-13 16:14:57 +08:00
houxg
5feb20ee0e add simple html importer 2016-12-12 16:19:32 +08:00
houxg
042dc56b91 Merge branch 'feature/note_item_with_parsed_html' into develop 2016-12-12 11:21:46 +08:00
houxg
79e20c86c2 display parsed content of note 2016-12-12 11:20:18 +08:00
houxg
e2a6aed953 return 'header' when it's h1-h6 2016-12-10 02:26:00 +08:00
houxg
f39bf4b82b add new web container, support format: bold, italic, blockquote, ordered list, bullet list, header, image 
remaining problems
- unfinished link format
- format button’s status
- output not equals to input
- editor’s border
 2016-12-09 19:14:42 +08:00
houxg
1df309e6fd import tinyMCE 2016-12-09 13:21:56 +08:00
houxg
a2a375d25b fix trigger save draft when click save without doing anything 2016-12-08 18:17:25 +08:00
xingxing
77062387ed Fix not show content in EditorFragment 2016-12-08 11:16:11 +08:00
houxg
fd4f473dee code refactor: remove context param 2016-12-05 19:12:51 +08:00
houxg
a18f7d09a3 show notes in card view 2016-12-05 18:24:26 +08:00
houxg
6376f40a7d increase version number 
- support tag
- bugs fixs
1.1.0 		2016-12-01 11:37:31 +08:00
houxg
0bf08b087a add travis config 2016-12-01 11:22:02 +08:00
houxg
057843e7f9 add icon for notebook list’s item 2016-11-30 16:11:22 +08:00
houxg
5b51f14b79 add selectable background 2016-11-30 15:15:05 +08:00
houxg
9beba839c1 support show notes by tag 2016-11-30 14:40:29 +08:00
houxg
f22da5f40f fix migration bug 2016-11-30 12:48:37 +08:00
houxg
3452c26a11 fix empty tag issue 2016-11-30 12:29:50 +08:00
houxg
f8bfbf5098 handle database upgradation 2016-11-29 18:09:11 +08:00
houxg
c577dc2670 Merge branch 'develop' into feature/support_tag 
# Conflicts:
#	app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java
 2016-11-29 16:12:25 +08:00