这是indexloc提供的服务，不要输入任何密码
Skip to content

resync #1

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

Jump to bottom
Merged
merged 247 commits into from
Dec 22, 2020
Merged

resync #1

merged 247 commits into from
Dec 22, 2020

Conversation

@Xepo
Copy link
Owner

@Xepo Xepo commented Dec 22, 2020

resync

anoffvu and others added 30 commits November 30, 2020 21:16
@anoffvu
reconciling old repo branch to current
e73729a
@xyhp915
style: fix #771
7fac80d
@xyhp915
style: try to fix left sidebar
864a32f
@xyhp915
style: fix #767
f579c85
@xyhp915
style: fix #771
e4112b4
@xyhp915
[refactor] improve main content layout .
8f67acc
@xyhp915
chore: update PostCSS & Tailwind major version .
a1b6144
@xyhp915
fix conflicts
b3eb78d
@xyhp915
refactor: adapt some styles for new layout container
1ed6795
@anoffvu
Merge branch 'master' into feat/light-theme
d409aa6
@xyhp915
refactor: add default css variable for editor content area
6dbfd5b
@xyhp915
style: fix #771
7870c80
@xyhp915
[refactor] improve main content layout .
8bf550d
@xyhp915
chore: update PostCSS & Tailwind major version .
9e0367e
@xyhp915
refactor: adapt some styles for new layout container
e0b224c
@xyhp915
refactor: add default css variable for editor content area
1cc12f4
@xyhp915
fix: devtool warning
06b2793
@xyhp915
fix: conflicts
0a979b7
@xyhp915
Merge remote-tracking branch 'origin2/master' into fix/priority-style…
e2949a5 
…-issues

# Conflicts:
#	package.json
#	resources/css/common.css
#	src/main/frontend/components/block.cljs
#	src/main/frontend/components/page.cljs
#	src/main/frontend/components/sidebar.css
#	yarn.lock
@anoffvu
Merge branch 'master' into feat/light-theme
24ccc6a
@anoffvu
Merge branch 'master' into feat/light-theme
7795a51
@xyhp915
reactor: ui styles
0217142
@xyhp915
refactor: add stylelint processor
7c7ce3d
@xyhp915
fix: journals list scroll listener
849ad93
@xyhp915
chore: update yarn.lock
c954d5a
@xyhp915
fix: remove slide style
ad3874a
@tiensonqin
fix: properties editing not working
71b286f
@tiensonqin
fix: slide style
1dfd795 
Resolved #835
@tiensonqin
fix: restore the editing cursor after saving a block
1b20c3e
@tiensonqin
fix: don't show :token/cannot-set-token for local repos
e622124
tiensonqin and others added 29 commits December 18, 2020 18:46
@tiensonqin
fix: css styles
6c1a170
@tiensonqin
Merge branch 'master' of github.com:logseq/logseq into master
43d31d5
@tiensonqin
fix(editor): rename page will promotes file has been modified
a7c7fa5 
Resolved #947
@tiensonqin
fix: move the theme button to settings
8208b92 
There're several other things
1. remove help button because there's one in the right bottom corner.
2. remove config/mobile? check for right sidebar
3. add open collective link
4. adjust left bar width
@tiensonqin
fix(css): remove break-all
511f903
@tiensonqin
fix(db): support recursive alias relationship
4799bd6
@tiensonqin
enhance(editor): make it easier to edit page's properties (tags, alias)
04b63ad
@tiensonqin
enhance(editor): scroll to the top of right sidebar when shift+click
e57d862
@tiensonqin
fix(editor): remove page refs with empty string
4b5a177
@tiensonqin
fix(editor): linked references
013e933
@tiensonqin
fix(editor): embeds
e925304
@tiensonqin
fix(editor): page alias should at least contains itself
4cd2627
@tiensonqin
enhance(search): only show new file when ext matched
c2b0576
@tiensonqin
style: external link use border bottom instead of underline
f791ec9
@tiensonqin
chore: remove debugging prn
d4f27fc
@tiensonqin
fix(editor): hide page properties if there's only a title attribute
82a2f04 
We need to design a better UX for both page and block's properties.
@tiensonqin
enhance(editor): add a warning to notice users to not remove page's t…
bca7ca4 
…itle
@linktohack @tiensonqin
feat: Compatibility with default datetree format
a0677d9
@xyhp915 @tiensonqin
refactor: build styles
b40b592
@mfehlhaber @tiensonqin
add docker dev environment
5b4ca74
@tiensonqin
fix: aliases not working
2a4451e
@tiensonqin
fix(ci): closure define NODETEST
0d96ce6
@tiensonqin
test(alias): add more tests
b1d5d37
@tiensonqin
chore: remove mldoc.min.js
202a49b
@tiensonqin
chore: fix tests
bdfdf4d
@tiensonqin
fix(test): bump version of react and react-dom
2baa71b 
also, fixed keyboards on datepicker
@tiensonqin
fix: draw links
84dd5eb
@gyk @tiensonqin
fix: git add unstaged files before committing
a1ff34f
@tiensonqin
chore: bump minor version
e596463
@Xepo Xepo merged commit ae3d8bc into Xepo:master Dec 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@Xepo @anoffvu @xyhp915 @tiensonqin @defclass @gyk @shady2k @SlyBouhafs @linktohack @mfehlhaber