1
0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2024-12-12 13:30:26 +00:00
Commit Graph

267 Commits

Author SHA1 Message Date
bouncepaw
9070ef90e2 Refactor the toolbar a little and move the cursor more 2021-04-05 22:38:44 +05:00
bouncepaw
ded26881fd Feed numerous minor issues 2021-04-04 22:22:14 +05:00
bouncepaw
770114f764 Change the license to AGPL 2021-03-29 16:13:52 +05:00
bouncepaw
b2e8cb1da8 Fix some bugs with links 2021-03-22 19:06:31 +05:00
Timur Ismagilov
d9921a8649
Merge pull request #50 from DanInSpace104/toolbar
More actions on toolbar, correct cursor position
2021-03-20 22:53:25 +05:00
DanInSpace
52d7e0f87e More actions on toolbar, correct cursor position 2021-03-20 22:48:56 +05:00
Timur Ismagilov
107b525eba
Merge pull request #49 from DanInSpace104/toolbar
#47 Insert current date button
2021-03-20 20:56:10 +05:00
DanInSpace
310a3f4a63 review changes 2021-03-20 19:21:50 +05:00
DanInSpace
9071a72de3 47 insert current date button 2021-03-20 19:02:56 +05:00
Timur Ismagilov
30ec26c5e2
Update stuff.qtpl 2021-03-19 19:01:55 +05:00
Timur Ismagilov
5937cdd09a
Update README.md 2021-03-19 19:01:14 +05:00
Timur Ismagilov
24d79dac8c
Merge pull request #46 from bouncepaw/0.14
1.0
2021-03-14 20:35:25 +05:00
bouncepaw
215ce70c08 Write 1.0 version 2021-03-14 20:34:24 +05:00
bouncepaw
bcb33f7048 Delete the markup tests 2021-03-14 20:24:46 +05:00
bouncepaw
016aa83016 Fix a bug related to hypha creation 2021-03-14 20:20:02 +05:00
bouncepaw
140d97ddf4 Handle anchored links correctly 2021-03-14 20:10:08 +05:00
bouncepaw
f3c4a45c3d Add primitive diffs accessible from history pages 2021-03-14 20:01:32 +05:00
bouncepaw
f11314488c Add /admin/reindex-users 2021-03-14 18:29:57 +05:00
bouncepaw
8fc036ba1c Throw away all backlink-related stuff 2021-03-14 18:16:30 +05:00
bouncepaw
8e94048f15 Make preview look more like view 2021-03-09 20:51:37 +05:00
bouncepaw
e35643bb9d Add -print-example-config 2021-03-09 19:27:14 +05:00
Timur Ismagilov
d2792ff83d
Merge pull request #45 from hugmouse/fix-no-hypha-connection-reset
Panic fix (#44)
2021-03-09 07:28:24 +05:00
Mysh!
b4143ed589
Panic fix (#44)
This fixes the bug when there are no hypha in the wiki and the user clicks the "random" button.

Since there are zero amount of pages, a number 0 is given to random, which causes a panic and resets the connection.

See: https://github.com/bouncepaw/mycorrhiza/issues/44
2021-03-09 09:55:22 +08:00
bouncepaw
be19d19a5e Fix user credentials not being read 2021-03-07 19:58:37 +05:00
Timur Ismagilov
81c75a4926
Merge pull request #41 from DanInSpace104/0.14
Fix more typos
2021-03-06 14:46:12 +05:00
DanInSpace
b5838c946f Fix more typos 2021-03-06 14:44:20 +05:00
bouncepaw
0426c372de Support configuration files
See https://mycorrhiza.lesarbr.es/hypha/configuration for an example.
A copy of this example is stored at assets/config.ini.

Use option -config-path to pass the config file. Note that all other
CLI options have been removed. Some of them may be returned later.
Also note that no real testing has been done.
2021-03-06 14:40:47 +05:00
Timur Ismagilov
adfe080a31
Merge pull request #40 from DanInSpace104/0.14
Typo fix
2021-03-06 12:41:13 +05:00
DanInSpace
dd5d78322f Typo fix 2021-03-06 12:38:08 +05:00
Timur Ismagilov
d83543b4d7
Merge pull request #39 from DanInSpace104/0.14
gitignore editors and IDEA folders
2021-03-06 10:00:08 +05:00
DanInSpace
964bd4168a gitignore editors and IDEA folders 2021-03-06 02:44:46 +05:00
Timur Ismagilov
db75078452
Merge pull request #38 from GuAlSe/0.14
Fix token storage path
2021-03-06 01:45:35 +05:00
Alexey Gusev
c7ab41a3b0 Fix token storage path 2021-03-05 23:40:41 +03:00
Timur Ismagilov
b9806c89e1
Merge pull request #37 from hugmouse/Empty-page-handling
Sending a 404 status if there is no content on the page
2021-03-05 19:13:59 +05:00
hugmouse
416c606e6d
Sending a 404 status if there is no content on the page
Probably a hack. I'm not sure how it should be done normally, but I have no other idea how to do it.
2021-03-05 20:20:51 +08:00
Timur Ismagilov
df9ee15a7f
Merge pull request #36 from hugmouse/optimise-css
Fix invalid css rules
2021-03-05 16:37:06 +05:00
hugmouse
a22b70023f
Fix invalid css rules 2021-03-05 18:40:28 +08:00
Timur Ismagilov
15aab93dd9
Merge pull request #35 from bouncepaw/0.13
0.13
2021-03-05 14:40:31 +05:00
bouncepaw
f6a41b4818 Some adjusting before merging 2021-03-05 14:39:33 +05:00
Timur Ismagilov
b45be35247
Merge pull request #34 from hugmouse/0.13
Fix lexer for "----" (<hr/>) case
2021-03-05 13:53:27 +05:00
hugmouse
62c616985d
Replace old method with new that is a little overcomplicated 2021-03-05 16:29:39 +08:00
hugmouse
8dfd2fcf9b
Fix lexer for "----" (<hr/>) case
The point is that there may be another character in the string.
For example, a space or a line break.

Because we check the whole string, not the first 4 characters - we can ignore the variant where it can be "----\s" or "----\r\n" and make the wrong markup.

Alternatively: use `startsWith("----")`, but this is a bit more expensive operation.
2021-03-05 14:34:56 +08:00
bouncepaw
fbf94975aa Add anchor links 2021-03-02 21:36:57 +05:00
bouncepaw
f45758cb0e Show only stems of names in the relative hyphae block 2021-02-27 13:42:32 +05:00
bouncepaw
2d14d30603 Rename Makefile targets 2021-02-26 21:45:52 +05:00
bouncepaw
9052f31e1f Fix the bug with git locking 2021-02-26 21:43:45 +05:00
bouncepaw
f33eefe502 Change the wording slightly 2021-02-24 22:37:34 +05:00
bouncepaw
a8a2735363 Add the attachment tab 2021-02-24 22:34:42 +05:00
bouncepaw
22420bf690 Move assets from templates to the assets module 2021-02-23 19:41:22 +05:00
bouncepaw
170240177e Slight redesign of the login form 2021-02-23 19:36:12 +05:00