Commit graph

4683 commits

Author SHA1 Message Date
Zanz2 5b955da74c makes tooltip behaviour more reliable and less erratic 2018-09-16 21:34:36 +02:00
Jure Grabnar 06eaafd118 Suffix should append to basename first and then extension 2018-09-16 20:57:37 +02:00
Jure Grabnar 449aa12070 Refactor TeamZipExport code (move it into special file) 2018-09-16 20:28:26 +02:00
Zanz2 07757e382a fixed hound 2018-09-14 13:43:31 +02:00
Zanz2 22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Alex Kriuchykhin 7526dad859
Merge pull request #1268 from okriuchykhin/ok_SCI_2515
Add OAuth2 provider [SCI-2515]
2018-09-14 10:40:20 +02:00
Oleksii Kriuchykhin 49e788a9ad Mergre latest core-api [SCI-2515] 2018-09-14 10:24:05 +02:00
Luka Murn f9d771d01a
Add minor comment 2018-09-13 14:50:00 +02:00
Luka Murn 0ddc3e0968
Merge pull request #1303 from biosistemika/release-1.14.4
Merge release-1.14.4 into master
2018-09-13 14:47:17 +02:00
Oleksii Kriuchykhin acc00ff3b9 Add CREATE Result endpoint: Create Text result [SCI-2718] 2018-09-13 13:38:11 +02:00
Zanz2 e47acfb4a1 Fixed attribute names 2018-09-13 11:57:31 +02:00
Zanz2 81115f411a Renaming my module attribute to tasks 2018-09-13 11:46:25 +02:00
Zanz2 bbca47684f Merge branch 'zz_projects_api_task_2539' of https://github.com/Zanz2/scinote-web into zz_projects_api_task_2539 2018-09-13 11:39:53 +02:00
Zanz2 46d33d28a3 standardized serializers by removing specified attributes 2018-09-13 11:38:29 +02:00
Zanz2 8ac1445ace Fixed hound 2018-09-13 11:37:07 +02:00
Zanz2 7f704c07e3 Created base endpoints for projects and related models 2018-09-13 11:37:07 +02:00
Zanz2 dace81f724 created base projects endpoint 2018-09-13 11:37:07 +02:00
Zanz2 a9c0201fcc
Merge pull request #1277 from Zanz2/zz_export_items_unselectable_sci2629
Fixed disabled export button after new inventory item save [SCI-2629]
2018-09-13 11:35:07 +02:00
Zanz2 5f39404e83 minor indendation fix 2018-09-13 11:25:25 +02:00
Zanz2 26856463ac rebased with core api 2018-09-13 11:24:31 +02:00
Zanz2 68385b36cc removed attributes 2018-09-13 11:20:30 +02:00
Zanz2 23f74a5b9b standardized serializers by removing specified attributes 2018-09-13 11:19:54 +02:00
Zanz2 8a925008f9 fixed hound 2018-09-13 11:18:49 +02:00
Zanz2 bd49ea56c5 Added results endpoint 2018-09-13 11:16:34 +02:00
Zanz2 426bd129cc Added task inputs and outputs functionality 2018-09-13 11:14:22 +02:00
Oleksii Kriuchykhin 9d9a5d07d8 Fix CREATE inventory endpoint [SCI-2693] 2018-09-13 11:08:58 +02:00
Zanz2 2519a010f6 Created new controllers and serializers for nested task related attributes 2018-09-13 11:04:52 +02:00
Zanz2 8d70764fe8 new routes for endpoints 2018-09-13 11:04:52 +02:00
Zanz2 765ee25853
Merge pull request #1292 from Zanz2/zz_experiments_api_task_2666
Created API endpoints for experiments and related data [SCI-2666]
2018-09-13 10:49:49 +02:00
Zanz2 1159ce519c Review changes 2018-09-13 09:25:16 +02:00
Luka Murn 0a2be5072a Update rubocop to 0.59.0, fix the config to be compliant 2018-09-12 17:17:55 +02:00
Luka Murn 3b3d682ab2
Merge pull request #1294 from czbiohub/mc-SCI-2699
add unit tests for Create inventory_column endpoint [SCI-2699]
2018-09-12 15:39:18 +02:00
Luka Murn 99c156de94 Fix (hopefully) the TinyMCE files from being cached
Closes SCI-2717.
2018-09-12 15:28:21 +02:00
Luka Murn 8e376a0293 Hound is love, Hound is life. 2018-09-12 13:47:52 +02:00
Luka Murn 0b68a670c2 Fix the inventory_columns_controller#create action
Based on unit tests, fix the create inventory columns endpoint
to work as intended. Also add another unit test case.
2018-09-12 13:44:10 +02:00
Luka Murn 3099725065
Merge pull request #1293 from czbiohub/mc-SCI-2698
close SCI-2698; unit tests for DELETE inventory item [SCI-2698]
2018-09-11 19:05:56 +02:00
Michael 9fab092c31 remove funky symbol 2018-09-11 09:55:38 -07:00
Zanz2 98ef3585a3 removed attributes 2018-09-11 15:41:38 +02:00
Zanz2 a086d181f5 removing attributes 2018-09-11 15:37:42 +02:00
Zanz2 ae3c19ced5 removing attributes 2018-09-11 15:35:03 +02:00
Zanz2 4c2c92445c fixed oversight, added paging to connections 2018-09-11 13:07:28 +02:00
Zanz2 fa54badb9a fixed oversight, added paging to connections 2018-09-11 13:06:41 +02:00
Zanz2 6c51a14292 Fixed oversight, added paging to connections 2018-09-11 13:04:40 +02:00
Zanz2 c5300865d6 fixed hound 2018-09-11 10:49:24 +02:00
Zanz2 c8c0ed6298 standardized serializers by removing specified attributes 2018-09-11 10:47:33 +02:00
Zanz2 34f408b552 refactored serializers, removed attributes 2018-09-11 10:34:05 +02:00
Zanz2 43e6524392 standardized serializers by removing specified attributes 2018-09-11 10:31:16 +02:00
Zanz2 7cb50145a0
Merge pull request #1275 from Zanz2/zz_adding_removing_table_sci2621
Fixed table add and remove crash [SCI-2621]
2018-09-11 09:37:07 +02:00
Zanz2 0efaf827b8
Merge pull request #1285 from Zanz2/zz_refactor_icons_sci_2445_v2
Replaced image icon with paperclip on scinote [SCI-2712]
2018-09-11 09:36:47 +02:00
Zanz2 94a7868d6e Fixed hound 2018-09-11 09:16:59 +02:00