Commit Graph

1439 Commits

Author SHA1 Message Date
Patrick Jentsch
09fdad2162 Standardize code for reference 2023-03-07 16:34:49 +01:00
Patrick Jentsch
9272150212 combine content_negotiation related decorators 2023-03-07 16:32:15 +01:00
Patrick Jentsch
cb830a6f9b Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-03-06 15:04:11 +01:00
Patrick Jentsch
7770d4d478 Restructure toggle ispublic requests 2023-03-06 15:04:06 +01:00
Patrick Jentsch
cfa4fa68f2 Remove dev route 2023-03-06 15:03:33 +01:00
Patrick Jentsch
b98e30022e restructure corpus routes file and add new decorators 2023-03-06 15:03:13 +01:00
Patrick Jentsch
4fb5f2f2dc Add content negotiation related route decorators 2023-03-06 15:02:46 +01:00
Inga Kirschnick
fecbb50d39 bug fixes and unfollow_corpus update 2023-03-06 12:27:24 +01:00
Inga Kirschnick
8a55ce902e color SCSS update social area+ decorator fix 2023-03-02 15:08:50 +01:00
Inga Kirschnick
b364480de6 Public Page update 2023-03-02 09:59:47 +01:00
Inga Kirschnick
e11b2e3c1a Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-03-02 09:57:59 +01:00
Inga Kirschnick
2dc7efbc8d Update follow corpus by token method 2023-03-02 09:57:43 +01:00
Patrick Jentsch
c01068e96b cleanup imports 2023-03-01 16:33:29 +01:00
Patrick Jentsch
73cb566db2 Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-03-01 16:33:03 +01:00
Patrick Jentsch
145b80356d Redesign corpus page and add possibility to add followers by username for owner 2023-03-01 16:31:41 +01:00
Inga Kirschnick
ed195af6a2 corpus follower permission decorator update 2023-03-01 15:14:51 +01:00
Inga Kirschnick
b1586b3679 social-area page and profile page update 2023-03-01 14:09:15 +01:00
Inga Kirschnick
ec6d0a6477 corpus permission decorator + sidenav update 2023-02-28 10:27:10 +01:00
Inga Kirschnick
d2828cabbe Explanation update and profile link button 2023-02-24 15:46:44 +01:00
Inga Kirschnick
8b01777318 Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-02-24 15:22:33 +01:00
Inga Kirschnick
e2ddbf26f1 Update User Card and Share link with specific role 2023-02-24 15:22:26 +01:00
Patrick Jentsch
3147bed90a codestyle enhancements 2023-02-24 10:34:42 +01:00
Patrick Jentsch
c565b08f9c Found a better solution for default role assignments 2023-02-24 10:30:42 +01:00
Patrick Jentsch
ff3ac3658f Yet another small fix 2023-02-24 10:02:28 +01:00
Inga Kirschnick
17ec3e292a Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-02-24 09:47:18 +01:00
Patrick Jentsch
122cce98a1 another small fix 2023-02-24 09:46:35 +01:00
Patrick Jentsch
cb31afe723 small fix 2023-02-24 09:44:09 +01:00
Inga Kirschnick
d0b369efaf Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-02-24 09:30:43 +01:00
Inga Kirschnick
b27a1051af import share link token generation to models.py 2023-02-24 09:30:29 +01:00
Patrick Jentsch
0609e2cd72 Fix follow corpus mechanics 2023-02-24 09:27:20 +01:00
Patrick Jentsch
1d85e96d3a Let the Corpus owner change Roles of followers 2023-02-23 15:18:53 +01:00
Patrick Jentsch
9e5bb7ad90 Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-02-23 13:05:11 +01:00
Patrick Jentsch
38d09a3490 Integrate CorpusFollowerRoles 2023-02-23 13:05:04 +01:00
Inga Kirschnick
a459d6607a Update Share Link 2023-02-23 09:50:09 +01:00
Inga Kirschnick
5881588160 Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-02-22 16:00:11 +01:00
Inga Kirschnick
3ad942f17b Share link implementation for followers 2023-02-22 16:00:04 +01:00
Patrick Jentsch
1be8a449fe cleanup in models file 2023-02-22 09:35:19 +01:00
Patrick Jentsch
288014969a Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-02-21 16:23:14 +01:00
Patrick Jentsch
68dc8de476 Add function to dynamically add followers to CorpusFollowerList 2023-02-21 16:23:10 +01:00
Inga Kirschnick
4fab75f0e2 Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-02-21 16:18:58 +01:00
Inga Kirschnick
726e781692 share link generator update 2023-02-21 16:18:04 +01:00
Patrick Jentsch
d699fd09e5 Add live data updates for corpus follower lists 2023-02-21 13:59:11 +01:00
Patrick Jentsch
ff238cd823 Change style of contributionlists 2023-02-21 11:05:23 +01:00
Patrick Jentsch
8d70e93856 Update CorpusFollowerAssociation table 2023-02-21 11:05:09 +01:00
Patrick Jentsch
8168a2384f Add unfollow and view function to corpusfollowerlist 2023-02-20 16:15:17 +01:00
Patrick Jentsch
2dc41fd387 Add CorpusFollowerList and functions 2023-02-20 10:40:33 +01:00
Patrick Jentsch
5837e05024 Add routes for CorpusFollower permission management 2023-02-15 16:17:25 +01:00
Patrick Jentsch
112d1ec020 Merge branch 'public-corpus' into development 2023-02-15 11:32:44 +01:00
Patrick Jentsch
fc8517649f Remove debug messages and more leftovers 2023-02-15 11:31:47 +01:00
Patrick Jentsch
dcdb71ac74 Remove more UI leftovers from community update 2023-02-15 11:30:27 +01:00
Patrick Jentsch
23cdfb1441 Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-02-15 11:00:10 +01:00
Patrick Jentsch
3e8bc5214c Remove public share mechanisms until legal matters are clarified 2023-02-15 10:56:54 +01:00
Inga Kirschnick
1f7baa6390 Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-02-13 10:17:05 +01:00
Inga Kirschnick
8595e2a203 Share link expiration update and small fixes 2023-02-13 10:16:44 +01:00
Patrick Jentsch
874c963cc4 Fix some list problems 2023-02-10 14:51:47 +01:00
Patrick Jentsch
1767ceee01 Remove function call of missing function 2023-02-10 09:53:59 +01:00
Inga Kirschnick
dabf0d1344 Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus 2023-02-10 09:43:05 +01:00
Inga Kirschnick
33a54b6206 Corpus first share link 2023-02-10 09:37:31 +01:00
Patrick Jentsch
428400df3f Add public switch without form 2023-02-09 16:22:37 +01:00
Inga Kirschnick
e03b54cfcd update public corpora list on dashboard 2023-02-09 14:03:03 +01:00
Patrick Jentsch
91a800f7fd Add analyse button in public corpus pages 2023-02-09 12:10:37 +01:00
Patrick Jentsch
52fa23ff65 Fix some problems after merge 2023-02-09 12:02:00 +01:00
Inga Kirschnick
66fbf4d57b update corpus public page 2023-02-09 11:56:02 +01:00
Inga Kirschnick
4d227415d9 Merge branch 'development' into public-corpus 2023-02-09 11:54:58 +01:00
Patrick Jentsch
b83f8e8fb9 Fix admin lists 2023-02-09 11:33:16 +01:00
Inga Kirschnick
f06508b412 New Public Corpus Page 2023-02-09 11:21:03 +01:00
Patrick Jentsch
71d13d482b Add back old news implementation 2023-02-09 11:07:13 +01:00
Patrick Jentsch
a7136df5d2 let followers analyse corpus 2023-02-09 11:06:03 +01:00
Patrick Jentsch
965bc9d68a Update public corpus logic 2023-02-09 11:05:27 +01:00
Patrick Jentsch
817c9c376f Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2023-02-08 15:57:25 +01:00
Inga Kirschnick
5b6e889443 New public corpus route 2023-02-07 16:06:09 +01:00
Inga Kirschnick
96520fa46f Merge branch 'following-mechanics' into development 2023-02-07 08:58:30 +01:00
Patrick Jentsch
2b164fc51d remove new news system as it needs more work 2023-02-06 15:50:07 +01:00
Inga Kirschnick
c8cfbc8e21 Query Builder fix and placeholder change 2023-02-06 12:12:19 +01:00
Inga Kirschnick
bd6f94582b some testing 2023-02-06 10:52:36 +01:00
Inga Kirschnick
b0f61b28fe Small changes on the Corpus page 2023-02-02 09:14:50 +01:00
Inga Kirschnick
e2cdcd3f7c first implementation of follow mechanics 2023-01-31 08:59:42 +01:00
Patrick Jentsch
97bba2498b Add m2m corpus-follower table 2023-01-23 11:50:12 +01:00
Patrick Jentsch
7a9e6f5d6f Add an icon for the export button 2023-01-19 15:02:51 +01:00
Patrick Jentsch
d025e7c3c7 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2023-01-19 14:59:13 +01:00
Patrick Jentsch
14820643ed Add export options to subcorpora 2023-01-19 14:59:09 +01:00
Inga Kirschnick
eb2d7d9538 User following mechanics 2023-01-19 08:58:57 +01:00
Patrick Jentsch
ce96de240d Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2023-01-16 15:46:30 +01:00
Patrick Jentsch
f36b4fb317 Add a first csv export idea 2023-01-16 15:46:26 +01:00
Inga Kirschnick
8b7c334007 Corpus Following Functions & small QB fix 2023-01-16 15:43:43 +01:00
Inga Kirschnick
d669ed3ffc New SpaCy NLP Version 2023-01-16 08:26:17 +01:00
Patrick Jentsch
112be76217 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2023-01-12 16:26:38 +01:00
Patrick Jentsch
7b20b11c6e add user_corpus m2m relationship 2023-01-12 16:26:33 +01:00
Inga Kirschnick
f4a378d9d3 Query Builder fixes 2023-01-12 15:40:28 +01:00
Inga Kirschnick
0bf54ad00b Updated Clean Up 2023-01-12 10:05:14 +01:00
Inga Kirschnick
b832536f2b Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2023-01-12 09:26:08 +01:00
Inga Kirschnick
f1b9680764 Cleanup of tests to push into live system 2023-01-12 09:25:58 +01:00
Patrick Jentsch
d462c1e4d6 Rename PublicUserList to UserList 2023-01-11 13:47:09 +01:00
Patrick Jentsch
ce03201133 Remove debug message 2023-01-11 13:39:48 +01:00
Patrick Jentsch
f972c13b81 Fix contributionslists share toggle 2023-01-11 13:29:47 +01:00
Patrick Jentsch
632aab258b Simplify News aggregation 2023-01-10 10:04:15 +01:00
Patrick Jentsch
6facf133bc Update some html to element generation code 2023-01-10 10:04:01 +01:00
Patrick Jentsch
900ef1ad6d Simplify onclick code for ressource lists 2023-01-10 10:03:27 +01:00
Patrick Jentsch
0891176fd7 Use the move curser for draggable="true" elements 2023-01-10 10:02:32 +01:00
Patrick Jentsch
0222a1f16e Fix Ressource Displays to show status again 2023-01-10 10:01:54 +01:00
Patrick Jentsch
ecea33ffa9 Make Utils functions more stable 2023-01-09 10:03:52 +01:00
Patrick Jentsch
7836774fef Update AdminUserList 2023-01-09 08:45:47 +01:00
Patrick Jentsch
381716f87a Enhance list onClick handling 2023-01-05 15:03:59 +01:00
Patrick Jentsch
9977128cb9 Remove old resource lists 2023-01-05 14:12:22 +01:00
Patrick Jentsch
d6b772c2e8 Remove helper comments 2023-01-05 08:11:27 +01:00
Patrick Jentsch
8b18571725 Rework all Resource Lists 2023-01-04 20:00:37 +01:00
Patrick Jentsch
7b88493e7d Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2023-01-03 17:03:56 +01:00
Patrick Jentsch
77b58d03c3 Change List.js integration and rename service-icon css 2023-01-03 17:03:47 +01:00
Inga Kirschnick
647969ef0e profile to users 2022-12-23 18:08:33 +01:00
Inga Kirschnick
30739f9111 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2022-12-23 09:56:01 +01:00
Inga Kirschnick
5e34252cb4 Fix ID/Hashid Problem 2022-12-23 09:55:46 +01:00
Patrick Jentsch
980b8cc1d3 Codestyle enhancements 2022-12-22 16:02:12 +01:00
Patrick Jentsch
320811279c Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2022-12-22 13:58:00 +01:00
Patrick Jentsch
598f67078a Change how user data is get and subscribed 2022-12-22 13:57:55 +01:00
Patrick Jentsch
55b7428045 Manually add Caroline Minuscle Model to HTR service 2022-12-22 13:57:37 +01:00
Inga Kirschnick
e633b834c6 Adding date and time to news content 2022-12-21 15:23:59 +01:00
Inga Kirschnick
f5a1cf75dd Bug fixes and new styling for the news page 2022-12-21 14:38:17 +01:00
Patrick Jentsch
c79bc1ed57 Update Dashboard2 2022-12-21 14:34:53 +01:00
Patrick Jentsch
14d7dfc957 Update some logic for avatars 2022-12-19 16:25:10 +01:00
Patrick Jentsch
c27d6ec0fe use hashid for serialization 2022-12-19 15:46:17 +01:00
Patrick Jentsch
b8637fcb9f Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2022-12-19 15:37:48 +01:00
Patrick Jentsch
c00f5230a1 Some changes for profile 2022-12-19 15:35:06 +01:00
Inga Kirschnick
7674550f33 Merge branch 'profile-page' into development 2022-12-19 15:04:00 +01:00
Inga Kirschnick
7d368ed0ac Avatar picture dashboard list 2022-12-19 15:02:43 +01:00
Inga Kirschnick
c0d015acd8 Merge branch 'profile-page' into development 2022-12-19 12:51:06 +01:00
Inga Kirschnick
d9699b9c6d Avatar Update 2022-12-19 12:46:18 +01:00
Patrick Jentsch
9904e54c51 Add dashboard2 2022-12-15 09:53:19 +01:00
Inga Kirschnick
5a396ce214 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2022-12-13 15:05:20 +01:00
Inga Kirschnick
3c4bf096d4 Merge branch 'profile-page' into development 2022-12-13 15:05:08 +01:00
Inga Kirschnick
61a6ddd4be Privacy settings for profile pages 2022-12-13 15:01:04 +01:00
Patrick Jentsch
a413b41dfd Update News page 2022-12-12 15:37:33 +01:00
Patrick Jentsch
69152f5e6a Remove PublicCorporaList.js 2022-12-12 13:18:22 +01:00
Patrick Jentsch
65c907a990 Add search functionality to public corpora page 2022-12-07 14:12:30 +01:00
Patrick Jentsch
f056a15ba8 Merge branch 'development' into public-corpora 2022-12-07 14:05:21 +01:00
Patrick Jentsch
c51a47a9aa Add first work for masto news and update public coropora page 2022-12-07 14:04:36 +01:00
Inga Kirschnick
7856e97402 Social area update 2022-12-07 14:02:33 +01:00
Inga Kirschnick
3ee62f0a82 profile page update for other users 2022-12-05 16:25:54 +01:00
Inga Kirschnick
be517a04af Update profile page with avatar 2022-12-05 09:40:02 +01:00
Patrick Jentsch
4e6aec3575 Merge branch 'development' into public-corpora 2022-11-30 14:59:10 +01:00
Patrick Jentsch
c8d7de434f Extend CorpusList for use in public corpora route 2022-11-30 14:58:45 +01:00
Inga Kirschnick
b98e711ad5 Merge branch 'profile-page' into development 2022-11-30 14:56:17 +01:00
Inga Kirschnick
a009bbe1f9 Profile page 2022-11-30 14:36:42 +01:00
Inga Kirschnick
102772d1a7 user settings page 2022-11-29 16:46:33 +01:00
Patrick Jentsch
5491cb184a add all files for last commit 2022-11-29 15:28:10 +01:00
Patrick Jentsch
5864aa653e standardize db col names and some preliminary work for public corpora 2022-11-29 15:27:50 +01:00
Patrick Jentsch
f8d4b601f7 Fix corpus building process for vrt files without entities 2022-11-25 10:46:46 +01:00
Patrick Jentsch
aff85f2145 Remove last edited date from FileMixin 2022-11-24 12:24:29 +01:00
Patrick Jentsch
28b1461ef9 Fix tesseract-ocr-pipeline job creation process 2022-11-24 12:24:11 +01:00
Inga Kirschnick
9c49c164de update icon 2022-11-22 09:31:00 +01:00
Inga Kirschnick
37fb764d15 update icon 2022-11-22 09:28:25 +01:00