scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
4736 commits 70 branches 179 tags 165 MiB
Commit graph

4736 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luka Murn 239b974fa0 Fix GET /tasks/:tid/protocols, GET /tasks/:tid/protocols/:id endpts 2018-10-07 11:29:56 +02:00
Luka Murn 24299ef4c0 Fix GET /tasks/:task_id/tags, GET /tasks/:task_id/tags/:id endpts 2018-10-07 11:10:41 +02:00
Luka Murn 98544f00e8 Fix GET /tasks/:task_id/users, GET /tasks/:task_id/users/1 endpts 2018-10-07 10:20:01 +02:00
Luka Murn 94e80edc9b Minor variable rename in task_groups_controller.rb 2018-10-07 10:16:00 +02:00
Luka Murn f56e5b1e5a Update GET /task/:task_id/items, GET /task/:task_id/items/:id endpts 2018-10-07 10:07:37 +02:00
Luka Murn 0de3c7eb4e Update GET /tasks, GET /tasks/:id endpoints, refactor routes.rb 2018-10-07 09:45:24 +02:00
Luka Murn 0643ba216e Fix GET /connections, /connections/:id endpoints 2018-10-07 00:53:39 +02:00
Luka Murn c9a15db85f Fix GET /task_groups endpoints 2018-10-06 20:11:01 +02:00
Luka Murn d235dd7807 Update GET /inventory_items, GET /inventory_items/:id endpoints 2018-10-06 18:37:40 +02:00
Luka Murn 9e78de6ef2 Update CREATE, PATCH, DELETE inventory_column endpoints 2018-10-06 17:11:59 +02:00
Luka Murn 6625b4019e Update GET /inventory_columns, GET /inventory_columns/:id endpts 2018-10-06 13:47:41 +02:00
Zanz2 cfe5801856 Disabled turbolinks in left navigation bar protocols button, i think it fixes the issue 2018-10-06 12:56:13 +02:00
Luka Murn eaa8a627a8 Update GET /inventories, GET /inventories/:inventory_id endpoints 2018-10-06 12:39:44 +02:00
Luka Murn 6faaff550b Update GET /teams, GET teams/:team_id endpoints slightly 2018-10-06 12:18:57 +02:00
Luka Murn 7b5a65416a Update status endpoint 2018-10-06 11:47:23 +02:00
Jure Grabnar d7c875135e
Merge pull request #1304 from jbargu/jg_zipfile_structure 
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
 2018-10-05 15:36:56 +02:00
Luka Murn be06630109
Merge pull request #1325 from Ducz0r/lm-update-doorkeeper 
Update doorkeeper gem to >= 4.6
 2018-10-05 12:05:32 +02:00
Luka Murn 9f4cb02fba Update doorkeeper gem to >= 4.6 2018-10-05 11:50:17 +02:00
Oleksii Kriuchykhin 0c452f519d Add CRUD endpoints for inventory cells [SCI-2765] 2018-10-05 00:18:42 +02:00
Alex Kriuchykhin 7bad772e81
Merge pull request #1323 from okriuchykhin/ok_SCI_2741 
Add endpoints for managing inventory list items [SCI-2741]
 2018-10-04 14:29:11 +02:00
Oleksii Kriuchykhin ed7c88f94d Improve tests [SCI-2741] 2018-10-04 12:00:50 +02:00
Oleksii Kriuchykhin 363c1e4a34 Add endpoints for managing inventory list items [SCI-2741] 2018-10-03 13:54:52 +02:00
Oleksii Kriuchykhin ba58eec2e2 Merge latest features/export-all [SCI-2731] 2018-10-03 11:04:44 +02:00
Alex Kriuchykhin 79b3a6cc52
Merge pull request #1315 from okriuchykhin/ok_SCI_2730 
Refactor Projects view - cards view [SCI-2730]
 2018-10-03 10:51:20 +02:00
Oleksii Kriuchykhin 53874c4680 Fix Hound config and CSS code styling [SCI-2730] 2018-10-03 10:39:22 +02:00
Luka Murn 21a24dc98b Fix invite users modal to display tooltips in all variants 
Closes SCI-2759.
 2018-10-02 17:55:39 +02:00
Oleksii Kriuchykhin 7623ac2a18 Merge branch 'features/export-all' into ok_SCI_2730 2018-10-02 14:26:06 +02:00
Oleksii Kriuchykhin 7d995189bd Fixies after code review [SCI-2730] 2018-10-02 14:24:44 +02:00
Luka Murn d71be76657 Fix minor styling & text on settings - preferences page 2018-10-02 13:59:19 +02:00
Luka Murn a2c2bca200 Update localized text in report elements modal 2018-10-02 13:51:59 +02:00
Luka Murn c079f16d58 Fix the tooltips positioning on canvas 2018-10-02 13:50:26 +02:00
Luka Murn 9632d1cd01 Set tooltips initialization to comply with turbolinks 
Also add custom styling options as another data attribute.
 2018-10-02 13:49:19 +02:00
Luka Murn c12f77d1d1 Fix styling (ESLint) on tooltip_helper.js 2018-10-02 11:25:51 +02:00
Alex Kriuchykhin ef96d973fe
Merge pull request #1310 from okriuchykhin/ok_SCI_2728 
Add project view JSON endpoints [SCI-2728]
 2018-10-01 15:40:36 +02:00
Oleksii Kriuchykhin 492a5de19e Add Projects view - list/table view [SCI-2731] 2018-10-01 15:39:42 +02:00
Luka Murn 2dc09f080d Revert "Revert "Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api"" 
This reverts commit 7ef85a9b60.
 2018-10-01 14:59:06 +02:00
Luka Murn cb9503af5d
Merge pull request #1319 from Ducz0r/lm-revert-pr-1300 
Revert "Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scin…
 2018-10-01 14:55:22 +02:00
Luka Murn 7ef85a9b60 Revert "Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api" 
This reverts commit 870dda255c, reversing
changes made to 2ac6563730.
 2018-10-01 14:41:18 +02:00
Luka Murn d21ec35cfc Merge branch 'czbiohub-mc-SCI-2704' into core-api 2018-10-01 11:54:07 +02:00
Luka Murn 548cfb65e1 Merge branch 'mc-SCI-2704' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SCI-2704 
Conflicts:
	spec/requests/api/v1/inventories_controller_spec.rb
 2018-10-01 11:53:47 +02:00
Luka Murn eade0fe1eb Merge branch 'czbiohub-mc-SC-2703' into core-api 2018-10-01 11:42:44 +02:00
Luka Murn bf59276afd Merge branch 'mc-SC-2703' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SC-2703 
Conflicts:
	spec/requests/api/v1/inventories_controller_spec.rb
 2018-10-01 11:41:29 +02:00
Luka Murn 870dda255c Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api 
Conflicts:
	spec/requests/api/v1/inventory_items_controller_spec.rb
 2018-10-01 09:20:58 +02:00
Luka Murn 2ac6563730
Merge pull request #1295 from czbiohub/mc-SCI-2702 
close SCI-2702; unit tests for create inventory [SCI-2702]
 2018-10-01 09:08:39 +02:00
Jure Grabnar 553ac4c360 Refactor code according to PR review 
PR review: https://github.com/biosistemika/scinote-web/pull/1304

Closes: [SCI-2640], [SCI-2642], [SCI-2643], [SCI-2644].
 2018-09-30 16:37:18 +02:00
Zanz2 ada98e9eaf
Merge pull request #1289 from Zanz2/step_save_table_too_long_bug_sci2719 
Fixed bug with table name of step not being length validated [SCI-2719]
 2018-09-28 14:37:08 +02:00
Zanz2 16f9728a05 fixed to not use gon gem 2018-09-28 14:26:05 +02:00
Zanz2 c6936bc71e fixed the implementation according to PR review, now validates all table names, when multiple are present, and uses gon gem 2018-09-28 13:13:25 +02:00
Luka Murn 5e797c5dae
Remove double 'kaminari' Gem inclusion in Gemfile 2018-09-28 10:47:33 +02:00
Michael 2f99904000 merge core-api and handle merge issues 2018-09-27 10:43:52 -07:00