Oleksii Kriuchykhin
|
943c01cada
|
Remove simple_token_authentication [SCI-5595]
|
2021-03-25 14:55:22 +01:00 |
|
aignatov-bio
|
0920d0a5cd
|
Add reports wizzard layout [SCI-5569]
|
2021-03-25 13:21:54 +01:00 |
|
aignatov-bio
|
7c573a1ee9
|
Add reload action for assets [SCI-5563]
|
2021-03-22 13:02:13 +01:00 |
|
Urban Rotnik
|
96ef0c10da
|
Merge pull request #3148 from urbanrotnik/ur-sci-5450-remamber-user-view-mode
Store Table/Cards view setting per user [SCI-5450]
|
2021-03-08 11:48:33 +01:00 |
|
aignatov-bio
|
df4297f6f7
|
Merge branch 'develop' into features/local_file_previews
|
2021-03-08 11:30:47 +01:00 |
|
Urban Rotnik
|
235f19cf25
|
Store Table/Cards view setting per user
SCI-5450
|
2021-03-04 14:56:59 +01:00 |
|
mlorb
|
20dc9967f5
|
Merge pull request #3113 from mlorb/ml-sci-5311
Implement the option of deleting empty folders [SCI-5311]
|
2021-02-15 10:27:05 +01:00 |
|
Mojca Lorber
|
7071f4a6c5
|
Send selected folders param to modal
|
2021-02-11 18:27:16 +01:00 |
|
aignatov-bio
|
1eff3494fb
|
Fix archived experiments page routes and clean old archive page [SCI-5479]
|
2021-02-11 14:21:15 +01:00 |
|
Mojca Lorber
|
19733ba7d9
|
Refactor deleting of empty folders
|
2021-02-10 22:11:42 +01:00 |
|
aignatov-bio
|
9d3d1f8eac
|
Connect toolbar actions to buttons [SCI-5465]
|
2021-02-09 15:47:15 +01:00 |
|
mlorb
|
45da42b924
|
Merge branch 'develop' into ml-sci-5311
|
2021-02-07 19:20:09 +01:00 |
|
Oleksii Kriuchykhin
|
c62c464902
|
Implement editing options and modals for experiment card [SCI-5367]
|
2021-02-04 12:06:51 +01:00 |
|
Oleksii Kriuchykhin
|
8a0a0cbacc
|
Add view only project users modal for project card [SCI-5337]
|
2021-02-04 11:25:35 +01:00 |
|
aignatov-bio
|
a7a948abaf
|
Add archive/restore toolbar buttons and backend [SCI-5457]
|
2021-02-03 14:29:50 +01:00 |
|
aignatov-bio
|
7726eae4da
|
Add experiments page load logic and connect filters [SCI-5457]
|
2021-02-03 14:29:50 +01:00 |
|
Mojca Lorber
|
c58d5734ad
|
Implement the option of deleting empty folders [SCI-5311]
|
2021-01-21 19:42:25 +01:00 |
|
aignatov-bio
|
bba1165c7b
|
Fix edit button for folder in archive mode [SCI-5418] (#3096)
* Fix edit button for folder in archive mode [SCI-5418]
* Remove archive folder from routes [SCI-5418]
|
2021-01-19 11:22:53 +01:00 |
|
Oleksii Kriuchykhin
|
684674952c
|
Add Restore button to the archived Projects screen [SCI-5344]
|
2021-01-09 21:27:19 +01:00 |
|
Urban Rotnik
|
3a52f62d85
|
Implement folders tree for move action
|
2021-01-07 17:42:01 +01:00 |
|
Oleksii Kriuchykhin
|
696b8d19f0
|
Fix new project creation and archiving [SCI-5321][SCI-5326]
|
2021-01-05 14:14:01 +01:00 |
|
Alex Kriuchykhin
|
a8991356b5
|
Merge pull request #3033 from okriuchykhin/ok_SCI_5341
Fix restore action for experiments and tasks [SCI-5341]
|
2021-01-05 10:09:39 +01:00 |
|
Oleksii Kriuchykhin
|
ffd9132b52
|
Make active projects view default [SCI-5340]
|
2020-12-31 16:00:26 +01:00 |
|
Oleksii Kriuchykhin
|
f76eb170a1
|
Fix restore action for experiments and tasks [SCI-5341]
|
2020-12-28 22:21:38 +01:00 |
|
Oleksii Kriuchykhin
|
67b3f853d7
|
Merge branch 'develop' into features/folders
|
2020-12-18 14:51:21 +01:00 |
|
Oleksii Kriuchykhin
|
2a666a3718
|
Implement additional preview type PDF of the whole document [SCI-5297]
|
2020-12-16 12:51:10 +01:00 |
|
aignatov-bio
|
30cfe78805
|
Add edit modal for project folders [SCI-5265] (#3002)
Add edit modal for project folders [SCI-5265]
|
2020-12-14 15:54:18 +01:00 |
|
aignatov-bio
|
6a44e23697
|
Add projects sidebar [SCI-5178] (#2995)
* Add projects sidebar navigation [SCI-5178]
|
2020-12-08 16:07:26 +01:00 |
|
Urban Rotnik
|
1332ad2fcd
|
Fix project creation activity [SCI-5181]
|
2020-12-04 14:13:43 +01:00 |
|
Urban Rotnik
|
7773afbcdb
|
Add activities for Project Folders [SCI-5181]
|
2020-12-04 12:03:49 +01:00 |
|
mlorb
|
74f0f0474a
|
Merge branch 'features/folders' into ml-sci-5240
|
2020-12-03 12:50:19 +01:00 |
|
Oleksii Kriuchykhin
|
9546b8f71d
|
Prepare backend for the improved navigation [SCI-5177]
|
2020-12-03 10:19:11 +01:00 |
|
Alex Kriuchykhin
|
92d579ab8e
|
Merge pull request #2935 from okriuchykhin/ok_SCI_5135
Generate backend for moving the projects and folders [SCI-5135]
|
2020-12-02 14:59:01 +01:00 |
|
Urban Rotnik
|
088fa79874
|
Add Project Folders API endpoints
|
2020-12-02 13:15:48 +01:00 |
|
Oleksii Kriuchykhin
|
dfce57d481
|
Generate backend for moving the projects and folders [SCI-5135]
|
2020-12-02 12:11:01 +01:00 |
|
Mojca Lorber
|
d7e3b57d0d
|
[SCI-5240] Implement Create new folder function
|
2020-12-01 09:59:08 +01:00 |
|
Oleksii Kriuchykhin
|
78e050ccc0
|
Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171]
|
2020-11-27 14:27:24 +01:00 |
|
Urban Rotnik
|
efd4f8abde
|
Add members dropdown on project filters flyout
|
2020-11-26 12:29:43 +01:00 |
|
aignatov-bio
|
dc62e2780a
|
Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout
Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]
|
2020-11-24 11:25:36 +01:00 |
|
aignatov-bio
|
60ce51149d
|
Add CRUD to comments
|
2020-11-20 20:25:28 +01:00 |
|
aignatov-bio
|
da4b8aaf2f
|
Add comments list
|
2020-11-20 12:29:40 +01:00 |
|
Oleksii Kriuchykhin
|
4c8d8c176f
|
Improve routes for folders [SCI-5136]
|
2020-11-20 11:12:36 +01:00 |
|
Oleksii Kriuchykhin
|
ee1bcd7aac
|
Implement search endpoint for Projects & folders search [SCI-5136]
|
2020-11-09 16:16:09 +01:00 |
|
aignatov-bio
|
12fdea8d89
|
Add context menu to attahcments
|
2020-11-04 13:08:40 +01:00 |
|
Mojca Lorber
|
8aed48d1ae
|
Merge branch 'develop' into features/office-file-previews
|
2020-11-02 13:45:06 +01:00 |
|
aignatov-bio
|
12991e8fd3
|
Commit add asset preview mode switcher to step
|
2020-10-29 16:42:05 +01:00 |
|
Oleksii Kriuchykhin
|
13fcfedf41
|
Refactor experiment workflow image generation [SCI-5063]
|
2020-10-29 13:16:09 +01:00 |
|
Urban Rotnik
|
b94a3a6cb8
|
Clean up controller
|
2020-10-26 16:17:39 +01:00 |
|
Urban Rotnik
|
aa1520bfb8
|
Merge branch 'develop' into jg_sci_2228
|
2020-10-22 14:21:39 +02:00 |
|
aignatov-bio
|
0a4b89cf39
|
Merge branch 'develop' into features/office-file-previews
|
2020-10-15 15:19:56 +02:00 |
|
Oleksii Kriuchykhin
|
2cda80dc5f
|
Add Endpoins for Project Membership manipulation [SCI-5001]
|
2020-09-23 11:03:29 +02:00 |
|
Alex Kriuchykhin
|
136ce06022
|
Merge pull request #2851 from okriuchykhin/ok_SCI_4999
Add Create and Update endpoints for experiments [SCI-4999]
|
2020-09-22 10:20:00 +02:00 |
|
Alex Kriuchykhin
|
e19efe3975
|
Merge pull request #2850 from okriuchykhin/ok_SCI_4997
Add Create and Update endpoints for projects [SCI-4997]
|
2020-09-21 13:22:12 +02:00 |
|
aignatov-bio
|
e5d3fac112
|
Merge branch 'features/smart-annotation-improvements' into develop
|
2020-09-17 14:52:51 +02:00 |
|
aignatov-bio
|
6ed8757eb1
|
Merge branch 'features/task-flows' into develop
|
2020-09-17 14:52:05 +02:00 |
|
Oleksii Kriuchykhin
|
0147e1aee1
|
Add Create and Update endpoints for experiments [SCI-4999]
|
2020-09-16 23:15:36 +02:00 |
|
Oleksii Kriuchykhin
|
dd4a62bb45
|
Add Create and Update endpoints for projects [SCI-4997]
|
2020-09-16 17:03:39 +02:00 |
|
Oleksii Kriuchykhin
|
a7c6ab9d89
|
Move some consequence executon into background process [SCI-4978]
|
2020-09-11 16:18:39 +02:00 |
|
aignatov-bio
|
f4a13a73cb
|
Refactor smart annotation front-end
|
2020-09-09 12:25:34 +02:00 |
|
aignatov-bio
|
9a8e53c4bc
|
Fix routes
|
2020-09-02 12:08:43 +02:00 |
|
aignatov-bio
|
4c7312faf9
|
Add tests for new workflow endpoints
|
2020-09-02 11:43:00 +02:00 |
|
aignatov-bio
|
68f31ce7ec
|
Add api endpoints for workflows
|
2020-09-01 15:01:38 +02:00 |
|
Urban Rotnik
|
a259800590
|
Merge branch 'develop' into jg_sci_2228
|
2020-08-31 16:29:23 +02:00 |
|
Urban Rotnik
|
4eebfa5461
|
Controller action for card inline preview
|
2020-08-28 11:05:52 +02:00 |
|
Oleksii Kriuchykhin
|
a206890a8c
|
Fix step position adjusting on move and destroy [SCI-4880]
|
2020-08-25 15:46:21 +02:00 |
|
Urban Rotnik
|
5923a4c014
|
Merge branch 'develop' into features/task-flows
|
2020-08-25 15:30:22 +02:00 |
|
Alex Kriuchykhin
|
121644decf
|
Merge pull request #2770 from okriuchykhin/ok_SCI_4881
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
|
2020-08-21 11:01:49 +02:00 |
|
Miha Mencin
|
b333700f40
|
Merge pull request #2779 from okriuchykhin/ok_SCI_4910
Fix rendering of RTE in API [SCI-4910]
|
2020-08-10 15:26:35 +02:00 |
|
Urban Rotnik
|
3c1c562e4c
|
Override password reset action, sign_in user only if 2fa disabled
|
2020-08-10 09:24:15 +02:00 |
|
Oleksii Kriuchykhin
|
91d9f5d6ee
|
Fix rendering of RTE in API [SCI-4910]
|
2020-08-07 16:51:57 +02:00 |
|
Oleksii Kriuchykhin
|
ce8d12e1c4
|
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
|
2020-08-05 09:59:58 +02:00 |
|
Urban Rotnik
|
7c14da70d9
|
Merge branch 'features/task-flows' into develop_to_task_flows
|
2020-08-04 14:50:46 +02:00 |
|
Urban Rotnik
|
ac3c06d882
|
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items
Add export for assigned items [SCI-4748]
|
2020-08-03 11:30:31 +02:00 |
|
aignatov-bio
|
6bd12e0397
|
Add modal for status flow
|
2020-07-27 13:48:21 +02:00 |
|
Oleksii Kriuchykhin
|
1a8333612a
|
Merge branch 'features/pwa' into develop
|
2020-07-27 09:47:41 +02:00 |
|
Urban Rotnik
|
512d6f3229
|
Add actions for update status, clean old complete actions
|
2020-07-22 16:12:34 +02:00 |
|
aignatov-bio
|
ddfe8231d8
|
Merge branch 'features/2fa' into develop
|
2020-07-22 11:56:36 +02:00 |
|
aignatov-bio
|
e69e3ea8d3
|
Add export for assigned items
|
2020-07-17 15:17:09 +02:00 |
|
aignatov-bio
|
7d20bf6fea
|
Add recovery screen
|
2020-07-13 09:51:04 +02:00 |
|
Oleksii Kriuchykhin
|
b4fab62d38
|
Merge branch 'develop' into ok_SCI_4776
|
2020-07-10 13:40:46 +02:00 |
|
aignatov-bio
|
13f7653667
|
Merge branch 'develop' into features/2fa
|
2020-07-07 13:05:45 +02:00 |
|
Oleksii Kriuchykhin
|
dc481cf236
|
Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776]
|
2020-07-03 16:48:29 +02:00 |
|
aignatov-bio
|
4b9881e31e
|
Add 2fa to user settings page
|
2020-07-01 13:25:06 +02:00 |
|
Urban Rotnik
|
62a4a5f203
|
Add 2fa login
|
2020-07-01 12:46:26 +02:00 |
|
Mojca Lorber
|
22b71bc9cb
|
Merge branch 'develop' into ml-sci-4261
|
2020-06-30 13:47:32 +02:00 |
|
Oleksii Kriuchykhin
|
7ea577d8d4
|
Merge branch 'features/inventory-archiving' into develop
|
2020-06-24 14:04:54 +02:00 |
|
Mojca Lorber
|
6e8062179c
|
Implement archiving and restoring of whole inventories
|
2020-06-18 18:07:23 +02:00 |
|
Urban Rotnik
|
fabfd7ddaf
|
Add controller action for Archive&Restore
|
2020-06-09 19:18:30 +02:00 |
|
aignatov-bio
|
dd58fc4199
|
Fix i18n
|
2020-06-04 18:41:45 +02:00 |
|
aignatov-bio
|
66a77d8de9
|
Add sidebar reload on view change
|
2020-06-04 18:41:45 +02:00 |
|
Oleksii Kriuchykhin
|
48865c8cea
|
Clear the obsolete code for assiging inventory items to the task [SCI-4571]
|
2020-06-03 22:54:45 +02:00 |
|
Oleksii Kriuchykhin
|
6afebdc5da
|
Remove inventory links of unshared inventory [SCI-4715]
|
2020-06-01 17:50:31 +02:00 |
|
Mojca Lorber
|
285280827a
|
Refactor repository column base controller
|
2020-05-28 12:18:46 +02:00 |
|
Mojca Lorber
|
c673e27109
|
Merge branch 'develop' into ml-sci-4261
|
2020-05-28 08:18:24 +02:00 |
|
Oleksii Kriuchykhin
|
0465dba2cf
|
Fix file dowload from MS Office online [SCI-4673]
|
2020-05-27 16:59:28 +02:00 |
|
Alex Kriuchykhin
|
afdd6fd149
|
Merge pull request #2572 from okriuchykhin/ok_SCI_4629
Prevent the inventory items editing while snapshot is being created [SCI-4629]
|
2020-05-19 10:10:34 +02:00 |
|
Oleksii Kriuchykhin
|
d77930af61
|
Fix failing tests for repository rows controller [SCI-4629]
|
2020-05-18 14:12:06 +02:00 |
|
Oleksii Kriuchykhin
|
c0521c3ca7
|
Prevent the inventory items editing while snapshot is being created [SCI-4629]
|
2020-05-15 17:46:59 +02:00 |
|
aignatov-bio
|
bac98bdbdc
|
Remove inventory tab from task and routes to inventory page
|
2020-05-14 22:10:13 +02:00 |
|
Oleksii Kriuchykhin
|
ba1661b40f
|
Fix handling of deleted repositories for snapshots [SCI-4596]
|
2020-05-13 18:00:56 +02:00 |
|
Oleksii Kriuchykhin
|
c74fa3c244
|
Make snapshots selectable [SCI-4596]
|
2020-05-13 17:58:05 +02:00 |
|
aignatov-bio
|
8e20dccc66
|
Merge pull request #2510 from aignatov-bio/ai-sci-4509-add-recent-protocols-tab
Add recent protocol tab to load protocal from repository [SCI-4509]
|
2020-05-08 13:17:26 +02:00 |
|
aignatov-bio
|
c9545ddb19
|
Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab
|
2020-05-08 10:28:33 +02:00 |
|
aignatov-bio
|
8ec7a4b7b4
|
Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory
|
2020-05-07 13:03:00 +02:00 |
|
aignatov-bio
|
19d30e2019
|
Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task
|
2020-04-29 15:13:38 +02:00 |
|
aignatov-bio
|
61bbca6bcf
|
Fix path names and markup
|
2020-04-28 19:12:17 +02:00 |
|
Oleksii Kriuchykhin
|
e6ad5047e0
|
Implement background processing of repository snapshots [SCI-4552]
|
2020-04-28 12:09:36 +02:00 |
|
aignatov-bio
|
0604815c00
|
Add assigned task dropdown to repository
|
2020-04-24 15:43:10 +02:00 |
|
aignatov-bio
|
f65b50c6ff
|
Fix rebase conflicts
|
2020-04-23 16:36:22 +02:00 |
|
aignatov-bio
|
34d6e903a4
|
Add assign items modal and update modal for task inventories
|
2020-04-23 15:24:40 +02:00 |
|
Oleksii Kriuchykhin
|
f811d11c59
|
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
|
2020-04-21 14:49:36 +02:00 |
|
aignatov-bio
|
be47efce74
|
Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list
Add repositories dropdown list [SCI-4506]
|
2020-04-16 14:17:17 +02:00 |
|
mlorb
|
9584b11d45
|
Merge pull request #2507 from mlorb/ml-sci-4505
Add the user management section of to the Details section of task layout [SCI-4505]
|
2020-04-16 13:47:31 +02:00 |
|
Mojca Lorber
|
e9959747d6
|
small refactor
|
2020-04-14 17:25:36 +02:00 |
|
aignatov-bio
|
c1cac01b28
|
Add repositories dropdown list
|
2020-04-14 12:10:16 +02:00 |
|
aignatov-bio
|
fe718349da
|
Add recent protocol tab to load protocal from repository
|
2020-04-09 17:29:39 +02:00 |
|
Mojca Lorber
|
f22f076e6c
|
Add the user management secion of to the Details section of task layout
|
2020-04-08 16:24:59 +02:00 |
|
aignatov-bio
|
087f71a82f
|
Add full view for my-module repository
|
2020-04-07 21:02:16 +02:00 |
|
aignatov-bio
|
7fdc169ba2
|
Add simple view to repository table
|
2020-04-06 19:52:41 +02:00 |
|
aignatov-bio
|
d924faaafd
|
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
|
2020-03-12 11:26:23 +01:00 |
|
Miha Mencin
|
26b687f2e6
|
Merge pull request #2460 from biosistemika/features/dashboard
Features/dashboard
|
2020-03-10 18:06:23 +01:00 |
|
aignatov-bio
|
e729aa043e
|
Add recent work widget
|
2020-03-06 13:51:18 +01:00 |
|
Mojca Lorber
|
8325ed80f0
|
Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard
|
2020-03-04 23:26:01 +01:00 |
|
aignatov-bio
|
0ae5e51cb3
|
Merge branch 'features/dashboard' into ai-sci-4375-end-point-to-task-create
|
2020-02-28 14:37:27 +01:00 |
|
aignatov-bio
|
a28d729aeb
|
Add end point
|
2020-02-24 17:09:10 +01:00 |
|
aignatov-bio
|
cf4dbd5ff4
|
Add calendar widget
|
2020-02-20 17:02:38 +01:00 |
|
Oleksii Kriuchykhin
|
9d0d75acc5
|
Add API endpoints for new column types [SCI-4276]
|
2020-02-18 15:13:46 +01:00 |
|
aignatov-bio
|
a438f6b4f0
|
Finished filters
|
2020-02-17 10:47:10 +01:00 |
|
aignatov-bio
|
485597a9ef
|
Add front-end part
|
2020-02-14 12:07:40 +01:00 |
|
aignatov-bio
|
98d7092a51
|
Change root page
|
2020-02-13 13:51:49 +01:00 |
|
aignatov-bio
|
5c0a769f87
|
General dashboard layout
|
2020-02-13 13:50:29 +01:00 |
|
Mojca Lorber
|
2727614603
|
Clean up controllers for manage repository columns
|
2020-02-04 16:05:16 +01:00 |
|
Mojca Lorber
|
9176301b7b
|
Refactor manage repository columns, move it from page into modal
|
2020-01-14 11:13:19 +01:00 |
|
Oleksii Kriuchykhin
|
d9b9243da7
|
Merge branch 'develop' into features/new-column-types
|
2020-01-07 16:03:33 +01:00 |
|
Urban Rotnik
|
400c109592
|
Refactor StatusesJS for new dropdown
|
2019-12-23 14:34:11 +01:00 |
|
aignatov-bio
|
7fc9c0d1e4
|
Adding frontend for checklist edit mode
|
2019-12-10 15:58:59 +01:00 |
|
Mojca Lorber
|
8503dd7007
|
Add numeric repository column type
|
2019-12-09 16:38:21 +01:00 |
|
aignatov-bio
|
09079fbcda
|
Fix naming and tests
|
2019-12-09 13:48:36 +01:00 |
|
aignatov-bio
|
d8676596f1
|
Add checklists column type
|
2019-12-09 13:48:36 +01:00 |
|
Urban Rotnik
|
3ab1967703
|
Add Edit renderer for Statuses
|
2019-12-02 11:03:05 +01:00 |
|
Urban Rotnik
|
fe4aa12ced
|
Add DateTime columns CRUD endpoints
|
2019-11-29 10:19:14 +01:00 |
|
Urban Rotnik
|
9e0d0d74ea
|
Remove check in routes
|
2019-11-29 10:19:08 +01:00 |
|
Urban Rotnik
|
7ab12baef9
|
Add API endpoint for StatusItems
|
2019-11-29 10:19:07 +01:00 |
|
Urban Rotnik
|
28d7a4f284
|
Refactor FileColumnController
|
2019-11-29 10:17:51 +01:00 |
|
Urban Rotnik
|
1720623665
|
Refactor RepositoryListColumn controller
|
2019-11-29 10:17:50 +01:00 |
|
Mojca Lorber
|
fe8829b592
|
Fix multiple load of modal
|
2019-11-29 10:17:49 +01:00 |
|
Urban Rotnik
|
5930bdd794
|
Add StatusColumnsController
|
2019-11-29 10:16:44 +01:00 |
|
Oleksii Kriuchykhin
|
f5abb7c767
|
Add connected accounts section to settings [SCI-4106]
|
2019-11-27 23:16:25 +01:00 |
|
Oleksii Kriuchykhin
|
6b20a10473
|
Refactor Azure configuration [SCI-4098]
|
2019-11-26 15:09:40 +01:00 |
|
Anton Ignatov
|
fc70ce24f8
|
Refactor side filters for global activities
|
2019-11-18 13:59:54 +01:00 |
|
Urban Rotnik
|
cc9d987321
|
Add update result(file) and create result(file) API endpoint
|
2019-11-18 11:11:38 +01:00 |
|
Urban Rotnik
|
1be88baab1
|
Add API endpoint for Attachments resource
|
2019-11-18 11:11:38 +01:00 |
|
Urban Rotnik
|
e7083e188c
|
Add API endpoint for Step resource
[SCI-3835]
|
2019-11-18 11:11:37 +01:00 |
|
Urban Rotnik
|
24033bec7a
|
Add API endpoint for Task creation
|
2019-11-18 11:11:37 +01:00 |
|
aignatov-bio
|
a9690482d1
|
Add autosave feature to text fields
|
2019-11-12 11:26:18 +01:00 |
|
Anton Ignatov
|
63d62734ee
|
Fix routes for addons installer
|
2019-09-17 16:11:40 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
Oleksii Kriuchykhin
|
c068901b00
|
Upgrade Rails to 6.0 [SCI-3745]
|
2019-09-12 17:24:08 +02:00 |
|
Miha Mencin
|
d522b3807a
|
codestyle improvements
|
2019-09-06 14:59:30 +02:00 |
|
Miha Mencin
|
7fc5035d2d
|
PR fixes, codestyle fixes
|
2019-09-06 13:47:06 +02:00 |
|
Miha Mencin
|
2486bd0077
|
SCI3818-unshared-inventory-screen
|
2019-09-05 14:03:08 +02:00 |
|
Oleksii Kriuchykhin
|
267c53c2d2
|
Refactor inventory sharing logic [SCI-3803]
|
2019-08-29 17:21:49 +02:00 |
|
Luka Murn
|
084cdcdd6b
|
Remove old archive endpoint, controller logic
|
2019-08-21 13:17:19 +02:00 |
|
Oleksii Kriuchykhin
|
c352a73d79
|
ActiveStorage fixies after latest master merge [SCI-3757]
|
2019-08-09 14:56:00 +02:00 |
|
Urban Rotnik
|
32783576c1
|
Add controller action 'multiple_update'
Add controller action, add update permission activity, add JS for handling ajax req
|
2019-08-09 14:15:50 +02:00 |
|
Urban Rotnik
|
2648521924
|
Invite modal with form
|
2019-08-09 14:15:49 +02:00 |
|
Urban Rotnik
|
5456c1e38a
|
Add basic controller for TeamRepositories
|
2019-08-09 14:12:59 +02:00 |
|
aignatov-bio
|
6e5f078dea
|
Add activities for marvinJS [SCI-3630] (#1950)
* Add marvinJs activities to step and results
* Add activities for TinyMCE marvinJS assets
* Fix markup
|
2019-08-09 09:47:07 +02:00 |
|
Oleksii Kriuchykhin
|
973efa55e1
|
Merge branch 'master' into ok_SCI_3678
|
2019-08-08 11:17:07 +02:00 |
|
Oleksii Kriuchykhin
|
b4f632dba8
|
Remove dowload endpoint from assets controller [SCI-3680]
|
2019-08-07 15:21:41 +02:00 |
|
Luka Murn
|
83bb89fdf5
|
Cherry-picked commit from ZZ (and LM)'s various changes
|
2019-07-26 10:13:14 +02:00 |
|
Urban Rotnik
|
1b9db2f61e
|
Fix for file annotating on Safari
|
2019-07-24 14:16:29 +02:00 |
|
Anton Ignatov
|
d79fec3345
|
Move TinyMCE logic to correspond controller
|
2019-07-16 15:51:44 +02:00 |
|
Anton Ignatov
|
1e8663548e
|
Add MarvinJS assets to TinyMCE
|
2019-07-16 13:40:54 +02:00 |
|
Anton Ignatov
|
ffd415d409
|
Inital refactor for Assets model
|
2019-07-12 15:02:06 +02:00 |
|
Anton Ignatov
|
57a273d5d0
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 11:34:41 +02:00 |
|
Oleksii Kriuchykhin
|
a1941a21dc
|
Futher refactoring of old Paperclip methods [SCI-3539]
|
2019-07-09 10:28:15 +02:00 |
|
Oleksii Kriuchykhin
|
9d926dc956
|
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
|
2019-07-05 16:56:05 +02:00 |
|
Oleksii Kriuchykhin
|
c0c8e0e1a3
|
Refactor Experiment workflow images [SCI-3539]
|
2019-07-04 09:33:12 +02:00 |
|
Jure Grabnar
|
20134c9f8a
|
Features/protocolsio integration (#1893)
Features/protocolsio integration
|
2019-07-03 17:32:20 +02:00 |
|
aignatov-bio
|
2793777463
|
Features/docx report (#1873)
* Initial setup for docx report
* Add render for project, experiment, my_module
* Implement converter for RTE fields
* Add all report elements
* fix markup
* Change headers, remove empty blocks, refactored repository draw
* Add smart annotations support
* Fix justify fields
* Prepare for addons integration
* Fix markup
* Add comments to GemFile
* Fix TinyMCE error
* Change UI for new report download selector
* Fix file error in inventory cell for docx
* Fix i18n object for header
|
2019-07-01 10:14:16 +02:00 |
|
Anton Ignatov
|
6be227b2d3
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
|
2019-06-28 10:47:38 +02:00 |
|
aignatov-bio
|
83bc9eb22f
|
Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation
Adding new activities for image editing [SCI-3369]
|
2019-06-24 10:31:39 +02:00 |
|
Anton Ignatov
|
7e5c39d3e4
|
Merge branch 'master' into features/marvinjs-integration
|
2019-06-21 14:51:45 +02:00 |
|
Alex Kriuchykhin
|
db7c6435b3
|
Merge pull request #1851 from okriuchykhin/ok_SCI_3436
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-20 11:31:15 +02:00 |
|
Anton Ignatov
|
a843a016a0
|
Fix markup and naming
|
2019-06-19 15:19:47 +02:00 |
|
Jure Grabnar
|
c8b8bcffdb
|
Add external_protocols#show action
|
2019-06-17 12:24:14 +02:00 |
|
Jure Grabnar
|
f7c6f78925
|
Add external_protocols#index action
|
2019-06-17 12:24:14 +02:00 |
|
Jure Grabnar
|
2a61075156
|
Add ExternalProtocols#create action and tests
|
2019-06-17 12:24:14 +02:00 |
|
Jure Grabnar
|
9baa66c998
|
Refactor OnlineSources -> ExternalProtocols
|
2019-06-17 12:24:13 +02:00 |
|
Jure Grabnar
|
94e7fe1e6c
|
OnlineSourcesController skeleton and #new action tested
|
2019-06-17 12:24:13 +02:00 |
|
Anton Ignatov
|
f480c0eb8d
|
Adding new activtiies for image editing
|
2019-06-14 16:15:30 +02:00 |
|
aignatov-bio
|
52a2f5cd0e
|
Add recent protocols dropdown to task page [SCI-3417] (#1800)
* Add recent protocols dropdown to task page
|
2019-06-13 15:47:29 +02:00 |
|
Oleksii Kriuchykhin
|
6e1a7a3392
|
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-11 10:08:33 +02:00 |
|
Oleksii Kriuchykhin
|
84a2ad4487
|
Refactor the async thumbnail reloading (spinner) [SCI-3461]
|
2019-05-21 17:29:33 +02:00 |
|
Anton Ignatov
|
259b75a6ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-16 09:28:48 +02:00 |
|
Oleksii Kriuchykhin
|
4b1c4bd140
|
Fix handling of proccessing step attachments [SCI-3381]
|
2019-05-13 17:12:06 +02:00 |
|
Anton Ignatov
|
f73dd38780
|
Add image editor to tinymce drawings
|
2019-04-30 18:32:59 +02:00 |
|
Anton Ignatov
|
4d0d5aa014
|
Adding team sketches selector
|
2019-04-30 17:32:55 +02:00 |
|
Anton Ignatov
|
f80d881847
|
Fix markup
|
2019-04-28 19:11:41 +02:00 |
|
Anton Ignatov
|
260810fff8
|
Add editing mode for tinymce images
|
2019-04-28 16:16:31 +02:00 |
|
Anton Ignatov
|
fe620c4a63
|
Add marvin model and controller
|
2019-04-26 22:59:38 +02:00 |
|
aignatov-bio
|
84993ea3ef
|
Update protocol repository for new description format [SCI-3371] (#1689)
* Update protocol repository for new description format
* move image clone method to concerns
|
2019-04-24 13:34:56 +02:00 |
|
Urban Rotnik
|
11a7a975af
|
Merge branch 'features/scinote-improvements' into master-with-note-section
|
2019-04-23 14:50:03 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
aignatov-bio
|
e2e299b424
|
Add dynamic generating filters for global activities [SCI-3228] (#1644)
* Add dynamic generating filters
* Add url methods
|
2019-04-09 09:08:27 +02:00 |
|
Jure Grabnar
|
613843d095
|
Temp commit
|
2019-04-04 16:58:55 +02:00 |
|
Jure Grabnar
|
3b8e6fa47c
|
Test office online
|
2019-04-04 16:57:36 +02:00 |
|
aignatov-bio
|
08263ab64e
|
adding filters for task activities [SCI-3076] (#1553)
* update task activity screen
|
2019-03-28 10:55:48 +01:00 |
|
Miha Mencin
|
4a87216a3d
|
Merge branch 'master' into features/global-activities
|
2019-03-25 14:35:24 +01:00 |
|
aignatov-bio
|
e8827b0d74
|
Update tags in task info [SCI-3093] (#1575)
* Adding inline tags selection
|
2019-03-21 10:13:07 +01:00 |
|
Oleksii Kriuchykhin
|
0c2b7959b6
|
Fix smart annotations in RTE [SCI-3111]
|
2019-03-20 11:41:36 +01:00 |
|
Oleksii Kriuchykhin
|
a822227383
|
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
|
2019-03-14 16:27:33 +01:00 |
|
Oleksii Kriuchykhin
|
89e968c410
|
Add tui.image-editor [SCI-2815]
|
2019-03-11 15:08:15 +01:00 |
|
Oleksii Kriuchykhin
|
0b87e8e1e4
|
Merge branch 'features/global-activities' into ok_SCI_3024_v3
|
2019-03-08 10:29:51 +01:00 |
|
aignatov-bio
|
ec2dbb897f
|
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521)
* Adding side pane filtering and top pane
|
2019-03-06 10:34:04 +01:00 |
|
aignatov-bio
|
125d2a3b9b
|
New inline tags editing in task [SCI 3093] (#1529)
* Adding inline tags selection
|
2019-03-06 09:18:45 +01:00 |
|
Oleksii Kriuchykhin
|
0930277c4e
|
Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]
|
2019-02-27 16:02:53 +01:00 |
|
Oleksii Kriuchykhin
|
61147b480c
|
Add main global activities bussiness logic [SCI-3014]
|
2019-02-26 11:01:15 +01:00 |
|
Miha Mencin
|
a93402d69f
|
sci-2992 routes
|
2019-02-25 16:50:38 +01:00 |
|
Urban Rotnik
|
7b6c6c414d
|
Merge branch 'master' into features/templates
|
2019-02-19 14:46:15 +01:00 |
|
aignatov-bio
|
8e905b67b2
|
System notification navbar menu drop down [SCI 2955] (#1498)
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
|
2019-02-19 11:08:59 +01:00 |
|
aignatov-bio
|
c598541e09
|
System notification modal window [SCI-2957 and SCI-2958] (#1484)
* Added new system notification modal
* Adding loading system notification on sign in
|
2019-02-15 13:07:29 +01:00 |
|
aignatov-bio
|
5c85595ab4
|
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482)
* System notification view and notification partial (SCI 2956 and SCI 3001)
|
2019-02-13 13:06:14 +01:00 |
|
mz3944
|
f6c8af105d
|
Merge pull request #1434 from mz3944/mz-SCI-2903
Fix (unite) Date and Time display formats [SCI-2903]
|
2019-01-21 09:50:34 +01:00 |
|
Miha Mencin
|
0766ee96a7
|
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-16 12:44:50 +01:00 |
|
Oleksii Kriuchykhin
|
89240659a7
|
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-11 17:20:39 +01:00 |
|
Alex Kriuchykhin
|
b530cea771
|
Merge pull request #1438 from okriuchykhin/ok_SCI_2776
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-11 16:27:22 +01:00 |
|
Matej Zrimšek
|
8070b7f8b5
|
Fix Date and Time display formats on JS side
|
2019-01-08 08:07:24 +01:00 |
|
Oleksii Kriuchykhin
|
6a64b23f90
|
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
|
2019-01-04 10:44:38 +01:00 |
|
Oleksii Kriuchykhin
|
534866467b
|
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-03 14:11:00 +01:00 |
|
Alex Kriuchykhin
|
4e416fe81b
|
Merge pull request #1404 from okriuchykhin/ok_SCI_2822
Return task inputs/outputs as references [SCI-2822]
|
2018-12-12 11:36:39 +01:00 |
|
Alex Kriuchykhin
|
37db41e18e
|
Merge pull request #1405 from okriuchykhin/ok_SCI_2881
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-12-10 14:11:34 +01:00 |
|
Oleksii Kriuchykhin
|
2c96f08b98
|
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-11-29 14:20:20 +01:00 |
|
Oleksii Kriuchykhin
|
5b566b48ae
|
Improve error messages and fix task users/items endpoints [SCI-2886]
|
2018-11-28 14:14:45 +01:00 |
|
Oleksii Kriuchykhin
|
b3a377f949
|
Return task inputs/outputs as references [SCI-2822]
|
2018-11-28 11:33:00 +01:00 |
|
mlorb
|
4b540958bd
|
change close/cancel button and refactor export_project_modal endpoint
|
2018-11-16 13:37:32 +01:00 |
|
mlorb
|
6453ab6fb1
|
update the Export all confirmation modal and export interaction
|
2018-11-15 15:53:58 +01:00 |
|
Luka Murn
|
e9c0b34662
|
Merge branch 'core-api' into 'master'
Conflicts:
Gemfile
app/services/api.rb
config/initializers/api.rb
config/initializers/extends.rb
config/routes.rb
db/schema.rb
spec/controllers/api/api_controller_spec.rb
|
2018-11-14 16:59:04 +01:00 |
|
Luka Murn
|
84df2c81f9
|
Merge branch 'features/export-all'
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
|
2018-11-13 09:14:02 +01:00 |
|
mlorb
|
0f8c80172e
|
remove show protocol api endpoint
|
2018-10-29 11:21:48 +01:00 |
|
Oleksii Kriuchykhin
|
6d5af3da8f
|
Remove error message for index page and unauthenticated users [SCI-2775]
|
2018-10-28 23:19:06 +01:00 |
|
Oleksii Kriuchykhin
|
02f536cd08
|
Merge latest features/export-all [SCI-2733]
|
2018-10-16 17:20:19 +02:00 |
|
Oleksii Kriuchykhin
|
f6b039d54e
|
Merge latest core-api branch [SCI-2765]
|
2018-10-16 12:07:47 +02:00 |
|
Jure Grabnar
|
26df1e5a98
|
Add export project modal
Closes [SCI-2645]
|
2018-10-16 11:00:38 +02:00 |
|
Luka Murn
|
1093ea11f4
|
Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes
Conflicts:
app/serializers/api/v1/activity_serializer.rb
app/serializers/api/v1/inventory_column_serializer.rb
app/serializers/api/v1/project_serializer.rb
|
2018-10-15 15:20:26 +02:00 |
|
Luka Murn
|
a217b11bba
|
Merge pull request #1298 from Zanz2/zz_projects_api_task_2539
Created read endpoint for projects and related models [SCI-2539]
|
2018-10-11 09:03:18 +02:00 |
|
Luka Murn
|
dd4f7b5d02
|
Fix project users, activities, comments, reports endpoints
|
2018-10-10 17:35:09 +02:00 |
|
Oleksii Kriuchykhin
|
af02f29fb5
|
Implement user state saving for projects overview [SCI-2733]
|
2018-10-10 16:15:31 +02:00 |
|
Alex Kriuchykhin
|
16b29b50a5
|
Merge pull request #1321 from okriuchykhin/ok_SCI_2731
Add Projects view - list/table view [SCI-2731]
|
2018-10-08 17:53:35 +02:00 |
|