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
Oleksii Kriuchykhin d0112bebb5 Merge branch 'features/export-all' into ok_SCI_2730 2018-09-27 13:29:18 +02:00
Alex Kriuchykhin da55060f20
Merge pull request #1312 from okriuchykhin/ok_SCI_2729 
Implement Projects view - navigation bar (tabs) [SCI-2729]
 2018-09-27 13:28:13 +02:00
Oleksii Kriuchykhin 2508394924 Refactor Projects view - cards view [SCI-2730] 2018-09-27 10:43:44 +02:00
Michael 088e06cae7 fix check to inventory 2018-09-26 10:47:13 -07:00
Luka Murn 07c8c448d5 Fix codestyle 2018-09-26 18:30:07 +02:00
Luka Murn 3a2740604d Merge branch 'czbiohub-mc-SCI-2696' into core-api 2018-09-26 18:21:47 +02:00
Luka Murn 46883150d1 Merge branch 'mc-SCI-2696' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SCI-2696 
Conflicts:
	spec/requests/api/v1/inventory_items_controller_spec.rb
 2018-09-26 18:16:25 +02:00
Luka Murn d0d0939afd Move @valid_headers content type to global @valid_headers def 2018-09-26 18:13:10 +02:00
Alex Kriuchykhin 38a4360361
Merge pull request #1302 from okriuchykhin/ok_SCI_2718 
Add CREATE Result endpoint: Create Text result [SCI-2718]
 2018-09-26 13:29:54 +02:00
Zanz2 1e12de90f5
Merge pull request #1231 from Zanz2/tables_sum_error_sci2587 
Tables sum error (tables now use big.js for +-/* calculations) [SCI-2587]
 2018-09-26 13:03:01 +02:00
Zanz2 2e0c40ed45 fixed merge 2018-09-26 12:20:13 +02:00
Zanz2 c8ed808920 merged with core-api 2018-09-26 12:17:49 +02:00
Zanz2 1a512698e8
Merge pull request #1286 from Zanz2/zz_search_page_update_bug_sci2684_v2 
( better solution ) Search page results from different teams than active not switching active team on click [SCI-2684]
 2018-09-26 12:04:09 +02:00
Zanz2 89e9cb86e2 fixed according to pull request review 2018-09-26 12:01:36 +02:00
Alex Kriuchykhin 112343e65d
Merge pull request #1311 from okriuchykhin/ok_SCI_2738 
Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]
 2018-09-25 11:49:19 +02:00
Oleksii Kriuchykhin f8388d4bcd Merge branch 'ok_SCI_2729' into ok_SCI_2730 2018-09-25 10:26:46 +02:00
Oleksii Kriuchykhin e06684b7cf Few fixes after review [SCI-2718] 2018-09-24 18:10:37 +02:00
Oleksii Kriuchykhin ab3aeac26b Merge latest core-api branch [SCI-2718] 2018-09-24 16:49:27 +02:00
Luka Murn 2a1c3037b8 Merge branch 'czbiohub-mc-SC-2701' into core-api 2018-09-24 16:44:06 +02:00
Luka Murn 39dafd2179 Merge branch 'mc-SC-2701' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SC-2701 
Conflicts:
	spec/requests/api/v1/inventory_columns_controller_spec.rb
 2018-09-24 16:40:44 +02:00
Oleksii Kriuchykhin 80e73bfb97 Implement Projects view - navigation bar (tabs) [SCI-2729] 2018-09-24 16:25:04 +02:00
Luka Murn 63b4f7d909
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662 
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
 2018-09-24 16:23:53 +02:00
Luka Murn 2396149c57
Merge pull request #1273 from Zanz2/zz_tooltip_settings_enable_sci2663 
Added toggle checkbox for tooltips help in prefferences [SCI-2663]
 2018-09-24 16:23:28 +02:00
Zanz2 87d2b0db14 fixed accordign to pr review 2018-09-24 15:57:31 +02:00
Zanz2 8699761389
Merge pull request #1297 from Zanz2/zz_tasks_api_task_2667 
Created read endpoint for tasks, results and related data [SCI-2667] [SCI-2669]
 2018-09-24 15:31:47 +02:00
Zanz2 e5b7d68031 this should fix travis ci 2018-09-24 13:33:44 +02:00
Zanz2 1e8442e22e fixed pull request review, forgot some small thing 2018-09-24 12:50:11 +02:00
Zanz2 1a9890ee0f fixed pull request review 2018-09-24 12:48:53 +02:00
Alex Kriuchykhin b38e85c282
Merge pull request #1301 from okriuchykhin/ok_SCI_2693_v2 
Fix CREATE inventory endpoint [SCI-2693]
 2018-09-24 10:51:13 +02:00
Luka Murn 00c714be07
Merge pull request #1299 from Ducz0r/lm-fix-rubocop 
Update rubocop to 0.59.0, fix the config to be compliant
 2018-09-24 10:27:19 +02:00
Jure Grabnar 872a1211bb Format according to Houndbot #3 2018-09-23 18:58:56 +02:00
Jure Grabnar d6f7ec2604 Format according to houndbot #2 2018-09-23 18:53:43 +02:00
Jure Grabnar 869967361c Fix according to Houndbot 2018-09-23 18:48:44 +02:00
Jure Grabnar 7877d559a3 Update email/notification, type: deliver 
Closes [SCI-2643], [SCI-2644].
 2018-09-23 18:45:13 +02:00
Jure Grabnar 59169f882d Add permission check for every project 2018-09-23 14:34:21 +02:00
Jure Grabnar 6106904460 Format according to Houndbot #5 2018-09-23 12:07:53 +02:00
Jure Grabnar 90b220ddda Format according to Houndbot #4 2018-09-23 12:06:06 +02:00
Jure Grabnar 970341e7d7 Format according to Houndbot #3 2018-09-23 11:56:23 +02:00
Jure Grabnar a3d7d37081 Format according to Hound bot #2 2018-09-23 11:30:20 +02:00
Zanz2 b536aa6f3e
Merge pull request #1287 from Zanz2/zz_dropdown_blue_sci2672 
Fixed blue block in dropdown, now its a full line [SCI-2672]
 2018-09-23 11:27:00 +02:00
Jure Grabnar 64a6ed7ffe Format according to houndbot 2018-09-23 11:14:59 +02:00
Oleksii Kriuchykhin 7f7ece2be0 Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738] 2018-09-21 17:46:18 +02:00
Oleksii Kriuchykhin 84428b37c2 Add project view JSON endpoints [SCI-2728] 2018-09-21 10:39:20 +02:00
Luka Murn 5d6881bae1
Merge pull request #1309 from biosistemika/release-1.14.5 
Merge release-1.14.5 into master
 2018-09-20 08:53:51 +02:00
Luka Murn 32e068f298
Merge pull request #1307 from biosistemika/release-1.14.4 
Merge release-1.14.4 into release-1.14.5
 2018-09-19 15:29:57 +02:00
Luka Murn 90caad3c85
Update VERSION to 1.14.5 2018-09-19 14:37:43 +02:00
Alex Kriuchykhin adf31581f1
Merge pull request #1306 from okriuchykhin/ok_SCI_2739 
Improve search speed on files and inventories [SCI-2739]
 2018-09-18 15:16:36 +02:00
Oleksii Kriuchykhin 872a48082a Remove Samples from search controller [SCI-2739] 2018-09-18 15:03:19 +02:00
Alex Kriuchykhin 105d34f2ae
Merge pull request #1305 from okriuchykhin/ok_SCI_2739 
Improve search speed on files and inventories [SCI-2739]
 2018-09-18 10:25:08 +02:00
Oleksii Kriuchykhin 4ee9eb3134 Improve search speed on files and inventories [SCI-2739] 2018-09-17 17:06:47 +02:00