Commit Graph

444 Commits

Author SHA1 Message Date
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
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
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
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
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
Inga Kirschnick
96520fa46f Merge branch 'following-mechanics' into development 2023-02-07 08:58:30 +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
e2cdcd3f7c first implementation of follow mechanics 2023-01-31 08:59:42 +01:00
Patrick Jentsch
7a9e6f5d6f Add an icon for the export button 2023-01-19 15:02:51 +01:00
Patrick Jentsch
14820643ed Add export options to subcorpora 2023-01-19 14:59:09 +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
f4a378d9d3 Query Builder fixes 2023-01-12 15:40:28 +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
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
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
Patrick Jentsch
598f67078a Change how user data is get and subscribed 2022-12-22 13:57:55 +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
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
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
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
Inga Kirschnick
3ee62f0a82 profile page update for other users 2022-12-05 16:25:54 +01:00
Patrick Jentsch
c8d7de434f Extend CorpusList for use in public corpora route 2022-11-30 14:58:45 +01:00
Patrick Jentsch
aff85f2145 Remove last edited date from FileMixin 2022-11-24 12:24:29 +01:00
Inga Kirschnick
c0f6c9333c update contribute share button 2022-11-21 16:35:11 +01:00
Inga Kirschnick
0128c6310b Bug fixes 2022-11-21 15:41:07 +01:00
Inga Kirschnick
3f5750a000 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2022-11-21 14:22:23 +01:00
Inga Kirschnick
5df3c8be35 bug fixes 2022-11-21 14:08:49 +01:00
Patrick Jentsch
a822a2e3a0 Fix issues 2022-11-18 16:02:24 +01:00
Patrick Jentsch
821571e97f Some updates regarding contributions 2022-11-18 11:51:41 +01:00
Patrick Jentsch
3004334d05 simplification 2022-11-17 13:10:06 +01:00
Inga Kirschnick
f4ec47ad57 Share toggle update & fix 2022-11-17 12:48:19 +01:00
Inga Kirschnick
d412f2c61a share toggle update in contributions 2022-11-17 12:11:21 +01:00
Patrick Jentsch
f1677e2931 Fix url issues and remove unused modules 2022-11-16 14:15:52 +01:00
Patrick Jentsch
cd72614c0f Contributions update revised 2022-11-15 15:11:16 +01:00
Inga Kirschnick
05340ea7ff Contribution Package Spacy NLP 2022-11-07 09:15:38 +01:00
Inga Kirschnick
46ba14b923 Contribution Package Tesseract OCR 2022-11-03 15:38:35 +01:00
Inga Kirschnick
0b3456f877 Small fixes 2022-10-24 15:01:13 +02:00
Inga Kirschnick
0009a0bacf Query Builder implementation 2022-10-20 15:52:25 +02:00
Inga Kirschnick
20b1a96862 New CSS File 2022-10-13 15:15:53 +02:00
Inga Kirschnick
2e45db10ca Optical adjustments 2.0 2022-10-12 14:08:42 +02:00
Inga Kirschnick
f96bac93f2 Optical code adjustments 2022-10-12 14:05:01 +02:00
Patrick Jentsch
086fe22649 Fix some bugs in corpus analysis and simplify code 2022-10-07 09:43:11 +02:00
Inga Kirschnick
7fe183bf2a Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2022-09-07 14:53:51 +02:00
Inga Kirschnick
f46544451e Code Style 2022-09-07 14:47:42 +02:00
Inga Kirschnick
f09403e61d QueryBuilder 1.1 2022-09-07 14:22:59 +02:00
Inga Kirschnick
d537a38712 Querybuilder 1.0 2022-09-07 09:06:21 +02:00
Patrick Jentsch
8e1d94bb5d Restructure project 2022-09-02 13:07:30 +02:00
Patrick Jentsch
131afd6419 New logic for forms including file upload. 2022-09-02 12:56:59 +02:00
Inga Kirschnick
9781425602 Query Builder New Design 2022-08-03 16:21:11 +02:00
Inga Kirschnick
4497567de0 Final prototype 2022-08-01 10:00:12 +02:00
Inga Kirschnick
5cbc6ea822 Prototype Query Builder for demo only 2022-07-13 14:06:22 +02:00
Patrick Jentsch
4e5957eea2 Change the Subscription Logic for Socket.IO Data exchange 2022-07-08 11:46:47 +02:00
Patrick Jentsch
76924956de Change the user session SocketIO Logic 2022-07-04 14:09:17 +02:00
Patrick Jentsch
b8bf004684 Restructure code and use APScheduler for daemon functionality 2022-06-28 12:30:02 +02:00
Patrick Jentsch
b4082a2547 Update services.yml 2022-04-29 13:04:03 +02:00
Patrick Jentsch
f425ca6fa1 Fix missing color for icons in corpus lists 2022-02-17 11:53:54 +01:00
Patrick Jentsch
15e897f005 Delete unused files, restructure assets and use scss 2022-02-15 09:25:34 +01:00
Patrick Jentsch
df6ab3991c Use enums where appropriate. This commit includes new migrations that are NOT compatible with older nopaque instances 2022-02-08 12:26:20 +01:00
Patrick Jentsch
fe938c0ca2 Big update, corpus analysis reworked, versioned services, preliminary work for contributions 2022-02-03 12:39:16 +01:00
Patrick Jentsch
0647537192 Fix automatic id generation for RessourceLists 2022-01-14 14:14:04 +01:00
Patrick Jentsch
40bd169101 Some cleanup (css, html, js) 2021-12-09 12:50:14 +01:00
Patrick Jentsch
067273df6d Minor Codestyle updates. 2021-12-08 15:36:10 +01:00
Patrick Jentsch
982d5bc46f Fix broken download link in job result lists 2021-12-08 14:45:15 +01:00
Patrick Jentsch
832a0283bd Some styling for ressource lists 2021-12-08 11:25:52 +01:00
Patrick Jentsch
9d30dda733 Codestyle 2021-12-06 14:42:49 +01:00
Patrick Jentsch
b3f34648c4 Bug fixes 2021-12-03 16:10:54 +01:00
Patrick Jentsch
89f518fe38 Sort lists by ressources creation date. CSS and HTML cleanup 2021-12-03 12:01:50 +01:00
Patrick Jentsch
03a57fd7ee Create a proper class for the upload form 2021-12-02 16:25:48 +01:00
Patrick Jentsch
d8f11a9759 update nopaque forms 2021-12-02 13:48:48 +01:00
Patrick Jentsch
962e58f2d3 Enable auto initialization for ressource lists 2021-12-02 11:16:06 +01:00
Patrick Jentsch
f977c808ec Even better solution for concurrent promise handling 2021-12-01 17:52:09 +01:00
Patrick Jentsch
ff514368c3 Try to avoid requesting user data multiple times 2021-12-01 17:07:05 +01:00
Patrick Jentsch
82745629bc Bug fixes 2021-12-01 16:03:55 +01:00
Patrick Jentsch
12ec6be60b JS codestyle enhancements 2021-12-01 14:15:20 +01:00
Patrick Jentsch
72ba61f369 Only reveal hashids to the ui 2021-11-30 16:22:16 +01:00
Patrick Jentsch
f6c2292e03 Big Corpus analysis update 2021-11-16 15:23:57 +01:00
Patrick Jentsch
727553412f add flag to socketio, hope it will improve firefox compatibility 2021-09-15 15:26:43 +02:00
Patrick Jentsch
10483c1e45 Fix Date display issue in UserList 2021-09-13 16:35:09 +02:00
Patrick Jentsch
281e568edf Use ISO 8601 as the default datetime format 2021-09-08 12:56:51 +02:00
Patrick Jentsch
5cd18c4c2a Sort after list ressource list insertions 2021-08-23 16:34:25 +02:00
Patrick Jentsch
d6ab379418 Change directory structure (move ./nopaque/* to ./) 2021-07-20 15:07:42 +02:00
Patrick Jentsch
cb2b64fa9d integrate nopaque repo 2020-06-05 14:42:04 +02:00
Patrick Jentsch
ba916b70bd Change location where socket is initialized...again 2020-05-27 13:32:07 +02:00
Patrick Jentsch
ecac2c481c Only initialize socket when the user is logged in 2020-05-27 11:11:54 +02:00
Patrick Jentsch
af527c1cf3 Bump socketio-client version. (2.2.0 -> 2.3.0) 2020-05-26 14:26:11 +02:00
Patrick Jentsch
d4e81b11e0 Fix foreign user data transmission for admins 2020-05-20 10:32:39 +02:00
Stephan Porada
c49684611a Add more metadata 2020-05-04 11:05:17 +02:00
Stephan Porada
58295b986d Rename some things. Add metadata to downloadable json 2020-04-30 15:21:55 +02:00
Stephan Porada
1350e6ddd6 Add metadata object on analysis 2020-04-30 14:45:54 +02:00
Patrick Jentsch
f87fe589c1 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-30 11:29:01 +02:00
Patrick Jentsch
e1b07d8719 Handle user data streams different 1/2
In the future this will be much more performant!
2020-04-30 11:28:55 +02:00
Stephan Porada
d54a3d3f33 First metadata addition 2020-04-29 16:15:11 +02:00
Stephan Porada
eb5e5c3253 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-27 16:16:59 +02:00
Stephan Porada
deda16f0f5 Add meta data recv after corpus analysis init 2020-04-27 16:16:57 +02:00
Patrick Jentsch
c67c033aec Rework notification system 2020-04-27 15:22:20 +02:00
Patrick Jentsch
45a3c664a2 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-27 13:51:07 +02:00
Patrick Jentsch
565274fce1 A lot of database changes and add options to change notification level 2020-04-27 13:50:54 +02:00
Stephan Porada
5dfaf51793 Add download for context data. 2020-04-27 13:25:29 +02:00
Patrick Jentsch
7fc1084749 Add notifications on status changes of jobs and corpora 2020-04-24 15:22:04 +02:00
Stephan Porada
9e693fc440 Remove &nsbp; 2020-04-23 13:28:13 +02:00
Stephan Porada
1c27c0a36c uncomment log messages 2020-04-23 12:10:36 +02:00
Stephan Porada
d9353e3d7d Clean up 2020-04-23 12:07:08 +02:00
Stephan Porada
a1439f37d7 Set callbac kfor match_context 2020-04-23 10:37:44 +02:00
Stephan Porada
beba4c1558 Fix expert mode automatic activation 2020-04-21 10:45:40 +02:00
Stephan Porada
b4c98a9713 Last fix 2020-04-20 13:59:28 +02:00
Stephan Porada
986336618b Add fix 2020-04-20 13:55:11 +02:00
Stephan Porada
6126477825 Finalize inspect view display options 2020-04-20 13:48:40 +02:00
Stephan Porada
2eb3d2f03e Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-20 09:59:34 +02:00
Patrick Jentsch
1f0a87a474 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-17 11:07:47 +02:00
Patrick Jentsch
3aafe664a3 Add macros and use them 2020-04-17 11:04:09 +02:00
Stephan Porada
9145265e4b Add expert mode and higlight sentences switch to inspect. WIP 2020-04-16 15:06:03 +02:00
Stephan Porada
fe26c56344 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-16 13:49:24 +02:00
Stephan Porada
1567e6e134 Filx text break 2020-04-16 13:49:21 +02:00
Patrick Jentsch
72e585395b status update handling for corpus list 2020-04-16 13:28:09 +02:00
Patrick Jentsch
8cec7b2d3a Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-16 09:40:45 +02:00
Patrick Jentsch
fede774196 Change nopaque upload forms. Add corpus file form has an upload progress bar now. 2020-04-16 09:40:38 +02:00
Stephan Porada
bcd431da22 fix 2020-04-15 15:22:48 +02:00
Stephan Porada
4992ac73a8 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-15 15:11:31 +02:00
Stephan Porada
8b27ddf5d2 fix 2020-04-15 15:11:25 +02:00
Patrick Jentsch
20d4d1c0b3 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-15 14:57:19 +02:00
Patrick Jentsch
f264b27ae5 Change validation process (currently broken) 2020-04-15 14:57:17 +02:00
Stephan Porada
68eb1d1972 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-15 14:55:36 +02:00
Stephan Porada
9031ca5845 New context options 2020-04-15 14:55:29 +02:00
Patrick Jentsch
338e760bfb Hide analyze button if corpus is not ready for this 2020-04-15 10:32:21 +02:00
Stephan Porada
9578a12f42 Fix match_count in resultsJSON 2020-04-14 12:46:33 +02:00
Stephan Porada
514baf0f5e New expert mode 2020-04-14 11:31:57 +02:00
Patrick Jentsch
9a1efbe5f3 corpus logic 2020-04-09 15:14:39 +02:00
Stephan Porada
f19f67614d Remove cascade plus new tooltip creation and destruction (a bit buggy) 2020-04-09 14:49:17 +02:00
Stephan Porada
ca333e29ee Some fixes and clean up 2020-04-09 10:17:04 +02:00
Stephan Porada
f69a401db6 Clean up and stuff 2020-04-08 11:37:34 +02:00
Stephan Porada
b0104fe606 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-08 09:46:38 +02:00
Stephan Porada
0146a92f6d reverse array 2020-04-08 09:46:37 +02:00
Patrick Jentsch
83a607728d cqi package update and changes to match the new functions 2020-04-07 16:25:44 +02:00
Stephan Porada
90ef828e61 Make analyse OOP style 2020-04-07 13:13:48 +02:00
Stephan Porada
6260f2436a Remove some useless loading animations 2020-04-07 09:53:17 +02:00
Stephan Porada
69b17f350e Remove all pjs! 2020-04-06 15:28:58 +02:00
Stephan Porada
961027a8f7 Add global prgress for inspect activation 2020-04-06 15:27:25 +02:00
Stephan Porada
2aca966d13 Fix wrong expert mode check 2020-04-06 14:35:57 +02:00
Stephan Porada
99e82a1cc3 Rename pj_analyse_corpus.js to analyse_corpus.js 2020-04-06 14:33:58 +02:00
Stephan Porada
52efa0e821 Remove old analyse_corpus.js 2020-04-06 14:33:26 +02:00
Stephan Porada
e7bed7dee1 Add comment 2020-04-06 14:09:12 +02:00
Stephan Porada
1ed696f558 Fix 2 2020-04-06 12:52:26 +02:00
Stephan Porada
41f24a03b4 Fix 2020-04-06 12:41:23 +02:00
Stephan Porada
12586bb13d First feature complete rebuilt of analysis interface 2020-04-06 12:32:29 +02:00
Patrick Jentsch
498defa386 Fix 2020-04-02 14:45:02 +02:00
Stephan Porada
2c93f02c11 Update 2020-04-02 14:22:03 +02:00
Stephan Porada
89891da663 handle result ranges 2020-04-02 11:37:45 +02:00
Stephan Porada
fb1403e9cb Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-01 15:58:26 +02:00
Patrick Jentsch
bfd7591f4d add comment 2020-04-01 14:27:01 +02:00
Stephan Porada
8c83bb87a5 Fix to 3.1 2020-04-01 13:49:28 +02:00
Stephan Porada
46b82f5737 Corpus analysis version 3.0 lul 2020-04-01 13:44:06 +02:00
Stephan Porada
90cf1bf8a0 Fix 2020-03-31 10:27:26 +02:00
Stephan Porada
0d40f04bdd Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-31 10:19:44 +02:00
Stephan Porada
c33889f617 Enhance pj_analyse 2020-03-31 10:17:04 +02:00
Patrick Jentsch
9ced65f34c Force socketio to use websockets 2020-03-30 17:27:24 +02:00
Patrick Jentsch
4ff372de77 small updates 2020-03-29 20:33:00 +02:00
Patrick Jentsch
d07b73781f Update 2020-03-29 19:40:29 +02:00
Patrick Jentsch
2db9677659 Make it work again 2020-03-28 20:45:33 +01:00
Patrick Jentsch
e3fde2d5c9 compatibility fixes and add reimplementations 2020-03-28 19:29:19 +01:00