Alex Kriuchykhin
5ce6a9babd
Merge pull request #1399 from okriuchykhin/ok_SCI_2727
...
Add subfolder option to S3 bucket config [SCI-2727]
2018-11-27 17:46:36 +01:00
Oleksii Kriuchykhin
32536db171
Add subfolder option to S3 bucket config [SCI-2727]
2018-11-27 14:58:34 +01:00
mlorb
398c2f0576
Merge pull request #1392 from mlorb/ml-sci-2676
...
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]
2018-11-27 11:06:45 +01:00
Jure Grabnar
7812f70c2f
Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix
...
Protocols - import from protocols.io doesn't work
2018-11-26 14:56:25 +01:00
mlorb
18d9ab5888
fixes upon @Ducz0r request
2018-11-26 14:23:26 +01:00
Jure Grabnar
2834edb286
Add command/subprotocol/safety for PIO
2018-11-23 20:13:34 +01:00
Jure Grabnar
c00b08b101
Add sw_package and dataset component for PIO
2018-11-23 19:44:10 +01:00
Jure Grabnar
87d5e5029a
Fix publish_date in PIO import
2018-11-23 17:37:26 +01:00
Luka Murn
87ff7c71e3
Update the delivery email look & feel
...
Closes SCI-2884.
2018-11-23 17:24:10 +01:00
mlorb
4052fad9e0
fix hound
2018-11-23 15:51:18 +01:00
mlorb
f61187dd18
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows
2018-11-23 15:44:04 +01:00
Luka Murn
af307eae73
Move some text into localization file
2018-11-23 11:12:10 +01:00
Alex Kriuchykhin
95e19e1229
Merge pull request #1381 from okriuchykhin/ok_SCI_2859
...
Refactor & restyle the API authorization screen [SCI-2859]
2018-11-22 13:06:13 +01:00
Oleksii Kriuchykhin
d98f11abdc
Refactor & restyle the API authorization screen [SCI-2859]
2018-11-20 17:02:45 +01:00
Oleksii Kriuchykhin
5deaf25fd9
Prevent user being added to project/task multiple times [SCI-2869]
2018-11-20 14:29:33 +01:00
mlorb
3b96a60938
Merge pull request #1374 from mlorb/ml-sci-2842
...
Update the Export all confirmation modal and export interaction [SCI-2842]
2018-11-19 11:36:08 +01:00
Alex Kriuchykhin
d524a1d508
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
...
Add time format selection to settings [SCI-2778]
2018-11-19 10:17:09 +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
Oleksii Kriuchykhin
537de596a7
Merge latest master [SCI-2778]
2018-11-14 13:05:57 +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
Oleksii Kriuchykhin
8d0dbc7076
Add time format selection to settings [SCI-2778]
2018-11-09 16:19:40 +01:00
Oleksii Kriuchykhin
23ee4760ae
Fix failing tests [SCI-2773]
2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin
30885e060d
Merge latest core-api branch [SCI-2773]
2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin
60e78fa868
Improve code style for error handling [SCI-2773]
2018-11-07 15:43:44 +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
Luka Murn
95340bcf36
Update team name placeholder & sublabel on sign up pages
2018-10-24 13:43:56 +02:00
Matej Zrimšek
4bf1d904b7
Add project controller unit tests [SCI-2732]
2018-10-23 19:51:50 +02:00
Oleksii Kriuchykhin
b53f2c8347
Improve error messages in API [SCI-2773]
2018-10-23 17:52:48 +02:00
Alex Kriuchykhin
e9b64b65a3
Merge pull request #1330 from okriuchykhin/ok_SCI_2770
...
Add request rate throttling for API [SCI-2770]
2018-10-19 09:38:31 +02:00
mlorb
e5fca1b1cd
change the rich text max limit on frontend to 50000
2018-10-18 14:22:15 +02:00
Alex Kriuchykhin
18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772
...
Implement inventory column data type name mappings [SCI-2772]
2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin
02f536cd08
Merge latest features/export-all [SCI-2733]
2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin
ed46115b3f
Implement inventory column data type name mappings [SCI-2772]
2018-10-16 15:35:02 +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
Matej Zrimšek
17380ba0ca
Refactoring rebased code [SCI-2641]
2018-10-15 01:12:25 +02:00
Matej Zrimšek
aa30cf6130
Refactor StringUtility#to_filesystems_compatible_filename [SCI-2641]
2018-10-12 07:40:22 +02:00
Matej Zrimšek
c0dc4f6951
Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641]
2018-10-12 07:40:21 +02:00
Matej Zrimšek
7152d2f0f1
Fix/update file naming convection for exported files [SCI-2641]
2018-10-12 07:40:21 +02:00
Matej Zrimšek
0ebce8e283
Add relative links (not working) to files and tables into the PDF [SCI-2641]
2018-10-12 07:40:21 +02:00
Oleksii Kriuchykhin
8cf59d8d22
Add request rate throttling for API [SCI-2770]
2018-10-11 09:48:06 +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
Luka Murn
dc2ab5fdc0
Fix the Doorkeeper config/access for all users (due to update of Gem)
2018-10-07 13:11:56 +02:00
Luka Murn
0bd3c81e39
Fix /users, /users/:id/identities endpoints
2018-10-07 13:07:27 +02:00
Luka Murn
7527dc7352
Fix READ index, READ show, POST create /tasks/:id/results endpoints
2018-10-07 12:58:17 +02:00
Luka Murn
fc5cf33614
Fix GET /tasks/:id/activities endpoint
2018-10-07 11:54:11 +02:00
Luka Murn
fca580face
Fix GET /tasks/:id/inputs, GET /tasks/:id/outputs endpoints
2018-10-07 11:35:12 +02:00
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
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
9e78de6ef2
Update CREATE, PATCH, DELETE inventory_column endpoints
2018-10-06 17:11:59 +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
Oleksii Kriuchykhin
0c452f519d
Add CRUD endpoints for inventory cells [SCI-2765]
2018-10-05 00:18:42 +02:00
Oleksii Kriuchykhin
363c1e4a34
Add endpoints for managing inventory list items [SCI-2741]
2018-10-03 13:54:52 +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
Oleksii Kriuchykhin
492a5de19e
Add Projects view - list/table view [SCI-2731]
2018-10-01 15:39:42 +02:00
Oleksii Kriuchykhin
2508394924
Refactor Projects view - cards view [SCI-2730]
2018-09-27 10:43:44 +02:00
Zanz2
c8ed808920
merged with core-api
2018-09-26 12:17:49 +02:00
Oleksii Kriuchykhin
f8388d4bcd
Merge branch 'ok_SCI_2729' into ok_SCI_2730
2018-09-25 10:26:46 +02:00
Oleksii Kriuchykhin
ab3aeac26b
Merge latest core-api branch [SCI-2718]
2018-09-24 16:49:27 +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
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
Jure Grabnar
7877d559a3
Update email/notification, type: deliver
...
Closes [SCI-2643], [SCI-2644].
2018-09-23 18:45:13 +02:00
Oleksii Kriuchykhin
84428b37c2
Add project view JSON endpoints [SCI-2728]
2018-09-21 10:39:20 +02:00
Jure Grabnar
449aa12070
Refactor TeamZipExport code (move it into special file)
2018-09-16 20:28:26 +02:00
Zanz2
22a565a684
Made fixes according to review
2018-09-14 13:07:09 +02:00
Oleksii Kriuchykhin
49e788a9ad
Mergre latest core-api [SCI-2515]
2018-09-14 10:24:05 +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
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
5f39404e83
minor indendation fix
2018-09-13 11:25:25 +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
Zanz2
8d70764fe8
new routes for endpoints
2018-09-13 11:04:52 +02:00
Zanz2
c2d62667e4
fixed hound
2018-09-10 15:42:21 +02:00
Zanz2
4acc8f5719
fixes travis ci mistake
2018-09-07 12:54:09 +02:00
Zanz2
e64aee5db0
Completed the functionality for experiments and related endpoints
2018-09-07 11:58:02 +02:00
Zanz2
1589cfb1b2
saving work
2018-09-06 15:38:48 +02:00
Luka Murn
586a442abc
Refactor the settings page, rename setting to tooltips_enabled
2018-09-05 16:36:32 +02:00
Zanz2
5ada21725f
inital experiments api functionality
2018-09-05 09:55:04 +02:00
Zanz2
e9e7fa08b0
new tooltip texts, provided by Tea
2018-09-05 08:42:00 +02:00
Zanz2
1bed2c2a3c
Partially fixed according to pull request review, added comments to code review
2018-08-31 12:11:51 +02:00
Zanz2
d4aa5e60a2
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663
...
Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones
2018-08-31 11:42:26 +02:00
Alex Kriuchykhin
18dfeb537b
Merge pull request #1269 from okriuchykhin/ok_SCI_2604
...
Improve health check endpoint [SCI-2604]
2018-08-24 16:55:47 +02:00
Oleksii Kriuchykhin
4d49671ae8
Add CRUD for inventories and columns [SCI-2690][SCI-2691][SCI-2692][SCI-2693][SCI-2694][SCI-2695]
2018-08-24 16:41:26 +02:00
Oleksii Kriuchykhin
c8efa4bffc
Add SHOW, UPDATE and DELETE inventory item endpoints [SCI-2688][SCI-2689]
2018-08-24 15:48:49 +02:00
Oleksii Kriuchykhin
5c2f268471
Refactor JSON API mime type registration [SCI-2687]
2018-08-24 15:48:10 +02:00
Oleksii Kriuchykhin
730ce96a43
Add inventory item CREATE endpoint [SCI-2687]
2018-08-24 15:46:00 +02:00
Oleksii Kriuchykhin
5488fc66fc
Refactor JSON API mime type registration [SCI-2687]
2018-08-24 15:37:23 +02:00
Oleksii Kriuchykhin
490376513b
Add inventory item CREATE endpoint [SCI-2687]
2018-08-24 15:36:19 +02:00
Oleksii Kriuchykhin
c8abb3d9b8
Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686]
2018-08-24 15:27:59 +02:00
Alex Kriuchykhin
eb2d3e7951
Merge pull request #1276 from okriuchykhin/ok_SCI_2613
...
Add READ user endpoint [SCI-2613]
2018-08-24 15:23:05 +02:00
Alex Kriuchykhin
427ab5fb41
Merge pull request #1264 from okriuchykhin/ok_SCI_2615
...
Add GET inventory columns API endpoint [SCI-2615]
2018-08-24 15:22:35 +02:00
Alex Kriuchykhin
1832c0e806
Merge pull request #1262 from okriuchykhin/ok_SCI_2614
...
Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]
2018-08-24 15:22:13 +02:00
Oleksii Kriuchykhin
0322316d74
Make API V1 togglable [SCI-2686]
2018-08-24 12:11:28 +02:00
Oleksii Kriuchykhin
a8013118d4
Add READ user endpoint [SCI-2613]
2018-08-21 13:56:14 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662
2018-08-21 11:27:01 +02:00
Zanz2
beb1d02914
Made fiew part for toggler, now debugging why checkbox doenst render properly and why it defaults to false always
2018-08-20 15:57:09 +02:00
Oleksii Kriuchykhin
6795b08a91
Refactor invite users modal initialization [SCI-2651]
2018-08-20 13:13:34 +02:00
Oleksii Kriuchykhin
1a57289009
Improve health check endpoint [SCI-2604]
2018-08-17 16:13:21 +02:00
Zanz2
8c492e1491
started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute
2018-08-17 16:03:49 +02:00
Oleksii Kriuchykhin
ecde634a2c
Add OAuth2 provider [SCI-2515]
2018-08-17 13:17:59 +02:00
Zanz2
637c7dfb19
modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic
2018-08-17 11:33:44 +02:00
Zanz2
d2373980d4
Testing out new popover
2018-08-16 15:07:59 +02:00
Oleksii Kriuchykhin
3f7590bb57
Rename type for inventories and add mimetype for JSON API [SCI-2614][SCI-2616][SCI-2617]
2018-08-10 17:01:14 +02:00
Oleksii Kriuchykhin
ef7e0ac489
Add GET inventory columns API endpoint [SCI-2615]
2018-08-08 17:31:37 +02:00
Oleksii Kriuchykhin
4df9a4c9ca
Fix code style warnings [SCI-2614][SCI-2616][SCI-2617]
2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
8d11e03d47
Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]
2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
298b866df4
Fix failing tests [SCI-2611][SCI-2612]
2018-08-07 14:58:02 +02:00
Oleksii Kriuchykhin
22e12d8fc3
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
2018-07-31 13:40:27 +02:00
Oleksii Kriuchykhin
26b0bd9e11
Refactor tasks tree API endpoint [SCI-2609]
2018-07-30 14:48:11 +02:00
Oleksii Kriuchykhin
0e372af729
Adds API authentication with Azure AD [SCI-2608]
2018-07-24 14:21:33 +02:00
zmagod
5b9b86a2d4
fixes per @Ducz0r 's request
2018-07-04 15:23:41 +02:00
zmagod
c9dd8b356a
fixes locale, fixes custom file upload style
2018-07-04 13:43:45 +02:00
zmagod
43903080ce
code style fixes
2018-07-04 12:42:28 +02:00
nbernot
7aacc2b4a2
extract repository_item html form creation in to a separate 'class'
2018-06-29 14:28:06 +02:00
Zmago Devetak
7fd3eec195
Merge pull request #1219 from ZmagoD/zd_SCI_2415
...
move maximum file size limit to an ENV variable [fixes SCI-2415]
2018-06-26 18:43:16 +02:00
Oleksii Kriuchykhin
c0232d9eb2
Add extend for task child elements in reports [SCI-2377]
2018-06-19 14:34:36 +02:00
zmagod
db1944cc90
move maximum file size limit to an ENV variable [fixes SCI-2415]
2018-06-19 14:15:14 +02:00
zmagod
6a6ff534c0
fixes import flash message [fixes SCI-2398]
2018-06-15 11:12:11 +02:00
Zmago Devetak
29fe58de80
Merge pull request #1208 from ZmagoD/zd_SCI_2408
...
adds an additional check if some other user has added/removed reposit…
2018-06-13 11:30:43 +02:00
Luka Murn
9a4fdd166e
Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix
...
Conflicts:
app/views/projects/index.html.erb
2018-06-12 17:44:42 +02:00
zmagod
f8ac083d39
adds an additional check if some other user has added/removed repository columns [fixes SCI-2408]
2018-06-12 15:28:03 +02:00
Zmago Devetak
6ba5c587f7
Merge pull request #1189 from ZmagoD/zd_SCI_2211
...
add data-hook, refactor add user to project modal to support addons
2018-06-08 15:23:26 +02:00
Zmago Devetak
2d3738fc70
Merge pull request #1198 from ZmagoD/zd_SCI_2456
...
fixes label in save report to inventory item modal [fixes SCI-2456]
2018-06-08 15:08:53 +02:00
Zmago Devetak
eff68aead8
Merge pull request #1193 from ZmagoD/zd_SCI_2481_
...
fixes project validation message [fixes SCI-2481]
2018-06-08 14:40:27 +02:00
Zmago Devetak
74ccaf06b9
Merge pull request #1184 from ZmagoD/zd_SCI_2417
...
adds asset_text_data to global search options
2018-06-08 14:30:52 +02:00
zmagod
d78c130a47
fixes label in save report to inventory item modal [fixes SCI-2456]
2018-06-08 11:26:33 +02:00
zmagod
11ebea573a
fixes project validation message [fixes SCI-2481]
2018-06-07 16:42:11 +02:00
Luka Murn
b324a2dab3
Restyle activities page
2018-06-07 09:29:47 +02:00
Luka Murn
c07fa5adc2
Update blank page for projects
2018-06-06 17:23:22 +02:00
Luka Murn
ff485cb75d
Update wording on 'save protocol to protocol repository' modal
2018-06-06 16:38:04 +02:00
Luka Murn
e0a3b5a941
Fix Save PDF to repository modal window
2018-06-06 16:29:07 +02:00
Luka Murn
b6c4f724db
Update text when no experiments are found for moving tasks
2018-06-06 16:10:55 +02:00
Zmago Devetak
fad67d7730
Merge pull request #1185 from ZmagoD/zd_SCI_2468
...
Limits the max. amount of rows when importing into inventories [fixes…
2018-06-04 16:29:33 +02:00
zmagod
84170f6de0
add data-hook, refactor add user to project modal to support addons
2018-06-01 16:13:22 +02:00
Oleksii Kriuchykhin
2ddc0fb561
Improve sidebar rendering performance [SCI-2478]
2018-06-01 13:49:02 +02:00
zmagod
9abf50e7c5
Limits the max. amount of rows when importing into inventories [fixes SCI-2468]
2018-05-31 10:45:31 +02:00
zmagod
3da098cb60
fixes the issue with extraction of text from file [fixes SCI-2417]
2018-05-31 09:42:57 +02:00
zmagod
e0908fb85f
adds asset_text_data to global search options
2018-05-30 18:18:09 +02:00
zmagod
89046e9787
fixes items assign flash message [fixes SCI-2395]
2018-05-29 12:54:41 +02:00
Luka Murn
80323eaf67
Merge branch 'lm-improve-sidebar-toggle' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-improve-sidebar-toggle
...
Conflicts:
app/assets/javascripts/sidebar_toggle.js.erb
2018-05-28 12:39:24 +02:00
mlorb
2bce62cab8
Merge branch 'ux-release-1' into ml-sci-2405
2018-05-28 11:43:14 +02:00
mlorb
58ba596a24
update locales
2018-05-28 09:38:24 +02:00
zmagod
bcebc03416
adds missing locales
2018-05-28 09:17:29 +02:00
Luka Murn
f8c8887d72
Forgot to remove the constant
2018-05-27 17:23:50 +02:00
Luka Murn
b86edf20a5
Remove auto-toggling of navigation sidebar depending on width
2018-05-27 15:44:15 +02:00
mlorb
f02363dfce
fix error if user is not assigned to any teams
2018-05-25 17:14:22 +02:00
mlorb
f972676f8d
Merge pull request #1158 from Ducz0r/lm-sci-2416-fix
...
Update software with new logo & new brand [SCI-2416]
2018-05-23 15:47:17 +02:00
mlorb
c4ecfc4d38
Change icons throughout sciNote - navigation, project, task cards
2018-05-22 16:55:58 +02:00
Luka Murn
dac44acf2a
Rename sciNote -> SciNote (config/ folder)
2018-05-21 15:11:12 +02:00
mlorb
0fccc71fc3
fix load protocol wording and UI-style
2018-05-18 16:57:18 +02:00
mlorb
64cbddb9a0
UI/UX restyle - update colours for navigation
2018-05-18 10:41:32 +02:00
zmagod
cf4c33bf92
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371
2018-05-17 15:22:43 +02:00
zmagod
e019767e90
refactor save_pdf_to_inventory_item service
2018-05-17 13:17:19 +02:00
zmagod
b125863baf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371
2018-05-17 11:25:33 +02:00
zmagod
ca0c8cbb71
fixes typos, fixes pdf rendering
2018-05-17 11:21:34 +02:00
mlorb
06ce285ae2
add locales
2018-05-16 14:32:15 +02:00
Zmago Devetak
9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321
...
fixes images preview in repository/library [fixes SCI-2321]
2018-05-16 12:05:33 +02:00
mlorb
f59ea8c7a6
Merge pull request #1137 from mlorb/ml-sci-2336-v2
...
UI/UX restyle - fixes throughout application - part 2 [SCI-2336]
2018-05-16 11:30:54 +02:00
zmagod
712a3c7ff6
fixes css, changes spinner in preview modal
2018-05-16 10:40:49 +02:00
okriuchykhin
ac6c5de83c
Merge pull request #1134 from okriuchykhin/ok_SCI_2301
...
Fix initialization of default value for repositories limit [SCI-2301]
2018-05-16 10:24:56 +02:00
Oleksii Kriuchykhin
beacdb934f
Change default inventory limit to 6 [SCI-2301]
2018-05-16 10:23:36 +02:00
zmagod
4573655ec8
adds save PDF report to inventory feature [fixes SCI-2371]
2018-05-16 09:31:19 +02:00
mlorb
cea7f5a3f7
some extra style unification
2018-05-15 17:10:31 +02:00
Luka Murn
10cd494936
Update WEBINARS_URL
2018-05-15 15:58:35 +02:00
mlorb
dfe65ccaed
UI/UX restyle - fixes throughout application - part 2
2018-05-14 18:33:57 +02:00
Oleksii Kriuchykhin
1e5f9519ca
Fix initialization of default value for repositories limit [SCI-2301]
2018-05-11 10:34:32 +02:00
mlorb
b5649f0574
Merge branch 'ux-release-1' into ml-sci-2336-v1
2018-05-10 13:59:57 +02:00
okriuchykhin
3b4d9fe744
Merge pull request #1132 from okriuchykhin/ok_SCI_2301
...
Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]
2018-05-10 10:46:25 +02:00
Zmago Devetak
0a4deeaa35
Merge pull request #1112 from ZmagoD/zd_SCI_2261
...
propagate assigned repository items in workflow [fixes SCI-2261]
2018-05-10 09:57:49 +02:00
Oleksii Kriuchykhin
8ec643c54b
Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]
2018-05-09 18:03:16 +02:00
mlorb
7df40e56c7
UI/UX restyle - fixes throughout application part one
2018-05-08 16:33:42 +02:00
Zmago Devetak
a6275062b7
Merge pull request #1126 from ZmagoD/zd_SCI_2344
...
adds new string truncation method [fixes SCI-2344]
2018-05-07 16:30:12 +02:00
Zmago Devetak
d744f24b85
Merge pull request #1118 from ZmagoD/zd_SCI_2323
...
sign_out user after 7 days [fixes SCI-2323]
2018-05-03 14:36:44 +02:00
zmagod
0b721d86b1
adds new string truncation method [fixes SCI-2344]
2018-05-03 14:24:23 +02:00
mlorb
d2c0ae241e
Merge pull request #1121 from mlorb/ml-sci-2244
...
Update buttons positions and wording throughout app [SCI-2244]
2018-05-03 11:05:15 +02:00
mlorb
ca022fead7
rename inventories buttons
2018-05-03 10:39:50 +02:00
zmagod
0584453575
fixes per @okriuchykhin 's request
2018-04-26 17:18:03 +02:00
mlorb
f97477f3f0
some extra button styling
2018-04-26 15:19:05 +02:00
mlorb
763d934aa7
fix buttons again
2018-04-26 15:02:24 +02:00
zmagod
e9642cadad
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304
2018-04-26 14:26:30 +02:00
zmagod
8dac887f10
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261
2018-04-26 14:18:41 +02:00
mlorb
88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244
2018-04-26 14:07:03 +02:00
Luka Murn
cb6fe50832
Merge branch 'master' into ux-release-1
...
Conflicts:
app/assets/javascripts/repositories/index.js
2018-04-26 11:38:54 +02:00
mlorb
9e11f3b220
update buttons positions and wording throughout app
2018-04-25 13:57:12 +02:00
Luka Murn
cd04596c62
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix
...
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
2018-04-25 12:37:27 +02:00
Luka Murn
bd6f97fabc
Add initializer to include helpers in all assets (including .js)
2018-04-25 10:51:19 +02:00
zmagod
503ad1ba20
removes samples from views [fixes SCI-2304]
2018-04-24 08:26:55 +02:00
zmagod
824962c084
propagate assigned repository items in workflow [fixes SCI-2261]
2018-04-23 11:33:16 +02:00
Luka Murn
68caf56ec2
Add comment to constants
2018-04-20 12:31:22 +02:00
Luka Murn
21e7e7057e
Refactor all the methods into two new services
2018-04-20 12:31:22 +02:00
Luka Murn
5e2622ecfc
Change default repository state to Ruby representation
...
Also remove some dead code from repositories datatables
2018-04-20 12:31:22 +02:00
zmagod
e96b690a5b
removes reports link from secondary navigation, fix bug with turbolinks
2018-04-20 11:57:52 +02:00
zmagod
dafa29d4bf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2124
2018-04-20 10:33:15 +02:00
mlorb
3249d5db0d
Merge pull request #1100 from mlorb/ml-sci-2303
...
Update reports show page to work with new navigation [SCI-2303]
2018-04-20 09:50:35 +02:00
Zmago Devetak
93fc1af12d
Merge pull request #1083 from ZmagoD/zd_SCI_2259
...
set limit on maximum number of dropdown list items [fixes SCI-2259]
2018-04-19 17:17:54 +02:00
Zmago Devetak
1290435372
Merge pull request #1086 from ZmagoD/zd_SCI_2207
...
enables copying of repository items [fixes SCI-2207]
2018-04-19 17:13:43 +02:00
mlorb
d7eccac289
Merge pull request #1099 from mlorb/ml-sci-2167
...
Remove breadcrumbs throughout application [SCI-2167]
2018-04-19 16:11:37 +02:00
Zmago Devetak
540dff25e7
Merge pull request #1091 from ZmagoD/zd_SCI_2254
...
adds correct preview images to files [fixes SCI-2254]
2018-04-19 14:04:24 +02:00
zmagod
ce52eb851b
add validation to dropdown items
2018-04-19 14:02:42 +02:00
zmagod
66cc76f640
add view label in locales
2018-04-19 12:49:32 +02:00
zmagod
9d282d1800
adds new reports index page [fixes SCI-2124]
2018-04-18 16:47:52 +02:00
mlorb
cc34376253
update reports show page to work with new navigation
2018-04-18 14:40:53 +02:00
Luka Murn
2290b75f8a
Merge pull request #1097 from biosistemika/lm-fix-production-compiling
...
Change JS compressor from :uglifier to Uglifier.new(harmony: true)
2018-04-17 17:46:01 +02:00
mlorb
c08d72be36
remove breadcrumbs throughout application
2018-04-17 17:00:04 +02:00
Luka Murn
a633861e1f
Change JS compressor from :uglifier to Uglifier.new(harmony: true)
...
This should fix the command rails assets:precompile for production
environment.
2018-04-17 09:05:19 +02:00
mlorb
04a20ab7ec
change links
2018-04-16 17:05:22 +02:00
zmagod
bef166ff30
hides the create new inventory button for non admin users [fixes SCI-2296]
2018-04-13 13:39:58 +02:00
Zmago Devetak
d466fdf8e8
Merge pull request #1089 from ZmagoD/zd_SCI_2292
...
remove unneeded label in destroy repository record modal [fixes SCI-2…
2018-04-12 16:58:28 +02:00
Zmago Devetak
09e5579f0f
Merge pull request #1087 from ZmagoD/zd_SCI_2240
...
rename Repository/Library => Inventory [fixes SCI-2240]
2018-04-12 16:58:08 +02:00
Zmago Devetak
9d58292dcf
fix
2018-04-12 16:44:38 +02:00
Zmago Devetak
f83390e5ad
fix
2018-04-12 16:20:05 +02:00
zmagod
d084998906
remove unneeded label in destroy repository record modal [fixes SCI-2292]
2018-04-12 15:00:41 +02:00
Luka Murn
09c60d2468
Fixes per @Ducz0r's request
2018-04-12 14:38:22 +02:00
zmagod
309bd04e61
rename Repository/Library => Inventory [fixes SCI-2240]
2018-04-12 14:11:26 +02:00
Luka Murn
9bf8b5d864
Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
...
Conflicts:
Makefile
app/assets/javascripts/projects/index.js.erb
app/assets/stylesheets/themes/scinote.scss
config/locales/en.yml
2018-04-12 13:16:46 +02:00
zmagod
6291857bbf
enables copying of repository items [fixes SCI-2207]
2018-04-11 17:17:19 +02:00
zmagod
ea4bd8831f
fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284]
2018-04-10 13:19:53 +02:00
mlorb
a10f671184
Merge pull request #1081 from mlorb/ml-sci-2123
...
Refactor settings into the new navigation bar [SCI-2123]
2018-04-09 13:21:16 +02:00
zmagod
b12f6f1b92
set limit on maximum number of dropdown list items [fixes SCI-2259]
2018-04-09 12:50:25 +02:00
mlorb
8a35ce5c58
add locales
2018-04-09 10:53:03 +02:00
Zmago Devetak
bdb6554870
Merge pull request #1049 from ZmagoD/zd_SCI_2218_2219
...
adds manage columns page
2018-04-06 17:06:28 +02:00
mlorb
0c851f227c
remove unused locals
2018-04-06 15:00:19 +02:00
mlorb
70dfe66b2d
refactoring
2018-04-06 14:20:40 +02:00
zmagod
cf7761daaa
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223
2018-04-06 12:56:39 +02:00
mlorb
b8e91e91a1
refactor settings into the new navigation bar
2018-04-05 16:30:02 +02:00
Luka Murn
386ede0400
Add special middleware for handling of Rails 5.1 WOPI errors
...
Closes SCI-2266.
2018-04-05 13:26:08 +02:00
zmagod
a8a19df06d
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-04-05 08:51:58 +02:00
okriuchykhin
e608d629c7
Merge pull request #1068 from okriuchykhin/ok_SCI_2217
...
Refactor file preview modal [SCI-2217]
2018-04-05 00:18:43 +02:00
Oleksii Kriuchykhin
9720063fb3
Fix tests [SCI-2217]
2018-04-05 00:06:11 +02:00
zmagod
0c05c60ebf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-04-04 16:06:38 +02:00
Zmago Devetak
ab48e4f527
Merge pull request #1072 from ZmagoD/zd_SCI_2239
...
change export model wording [fixes SCI-2239]
2018-04-04 15:40:18 +02:00
Zmago Devetak
d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206
...
add ID column to repository [fixes SCI-2206]
2018-04-04 15:39:59 +02:00
zmagod
77f80271dd
fixes per @mojca 's request
2018-04-04 14:52:59 +02:00
Oleksii Kriuchykhin
3b7977ee3b
Merge latest changes from ux-release-1 [SCI-2217]
2018-04-04 14:20:34 +02:00
zmagod
5eb007f4d2
fixes per @mlorb 's request
2018-04-04 13:22:14 +02:00
zmagod
38b84edfb0
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
2018-04-04 12:59:41 +02:00
zmagod
e630d3113f
add ID column to repository [fixes SCI-2206]
2018-04-04 11:55:11 +02:00
mlorb
11c0f5e5a1
Merge pull request #1067 from mlorb/ml-sci-2243
...
Style Guide - refactor colors, typography and buttons [SCI-2243]
2018-04-03 11:30:02 +02:00
zmagod
3d5137b56f
change export model wording [fixes SCI-2239]
2018-04-03 11:22:23 +02:00
mlorb
e5e92eb215
fix the rest of the constants
2018-04-03 10:28:39 +02:00
Oleksii Kriuchykhin
51860652c1
Refactor smart annotations modal [SCI-2223]
2018-04-02 20:38:56 +02:00
Oleksii Kriuchykhin
f656ad1561
Fix fa icons [SCI-2217]
2018-03-30 17:03:44 +02:00
Zmago Devetak
f5f6fa4a4f
Merge pull request #1066 from ZmagoD/zd_SCI_2235
...
updated repository import modal html [fixes SCI-2235]
2018-03-30 14:32:53 +02:00
okriuchykhin
a6d45fea0a
Merge pull request #1059 from okriuchykhin/ok_SCI_2205
...
Add repository name to record info modal [SCI-2205]
2018-03-30 14:02:53 +02:00
Oleksii Kriuchykhin
cc855cda86
Fix translations [SCI-2205]
2018-03-30 12:48:34 +02:00
okriuchykhin
5e0cf58bc5
Merge pull request #1058 from okriuchykhin/ok_SCI_2111
...
Implement search in file repository cells and improve performance [SCI-2111]
2018-03-30 12:39:47 +02:00
Oleksii Kriuchykhin
cc5d8550b1
Refactor file preview modal [SCI-2217]
2018-03-30 11:50:28 +02:00
zmagod
802e917e69
updated repository import modal html [fixes SCI-2235]
2018-03-30 09:47:27 +02:00
zmagod
fd88104fe2
adds manage repository link in repository actions dropdown
2018-03-29 17:10:57 +02:00
zmagod
56b0900619
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-03-29 16:42:10 +02:00
zmagod
7c1390ece2
implement sidebar toggle [fixes SCI-2232]
2018-03-28 14:12:11 +02:00
mlorb
22afa61b11
refactor colors
2018-03-28 13:54:01 +02:00
Oleksii Kriuchykhin
fac5875cfd
Add repository name to record info modal [SCI-2205]
2018-03-26 16:18:09 +02:00
Oleksii Kriuchykhin
e42fc3117b
Implement search in file repository cells and improve performance [SCI-2111]
2018-03-26 13:19:09 +02:00
zmagod
8f09e1f7a4
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
2018-03-26 13:08:31 +02:00
mlorb
b7a14215bc
Merge pull request #1050 from mlorb/ml-sci-2120-v2
...
Refactor project navigation [SCI-2120]
2018-03-26 12:56:19 +02:00
zmagod
3efe06a410
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
2018-03-26 12:02:24 +02:00
zmagod
9e1f285c9e
adds missing labels [fixes SCI-2219]
2018-03-26 11:28:14 +02:00
mlorb
1797afa718
Merge branch 'ux-release-1' into ml-sci-2238
2018-03-26 10:44:43 +02:00
mlorb
70e0d8bd1d
Merge pull request #1052 from mlorb/ml-sci-2125
...
Implement new Help dropup in navigation [SCI-2125]
2018-03-26 09:22:39 +02:00
mlorb
83741358d1
fix locales
2018-03-23 16:19:06 +01:00
zmagod
baf69461f5
adds edit/create modal and related actions
2018-03-23 16:00:33 +01:00
mlorb
eee597b315
fix naming
2018-03-23 15:56:38 +01:00
mlorb
5589b27883
improve message for deleting sample/report items
2018-03-23 14:39:09 +01:00
mlorb
faaecec2ff
implement new Help dropup in navigation
2018-03-23 14:08:27 +01:00
mlorb
bc06542ed7
refactor project navigation
2018-03-22 11:41:33 +01:00
zmagod
3be3c00574
adds manage columns page [fixes SCI-2218]
2018-03-22 09:35:36 +01:00
Oleksii Kriuchykhin
36302ad6e8
Refactor existing columns management to control only Column visibility and order [SCI-2220]
2018-03-21 16:56:36 +01:00
zmagod
81df97f008
add library sidebar and create new library button [fixes SCI-2121]
2018-03-21 09:22:55 +01:00
zmagod
62858bc14f
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
2018-03-20 14:46:11 +01:00
zmagod
1ad8c259d1
add blank page for repositories [fixes SCI-2139]
2018-03-20 14:45:57 +01:00
mlorb
35afc06cbd
Merge pull request #1038 from mlorb/ml-sci-2118
...
Code left-side menu bar [SCI-2118]
2018-03-20 14:40:55 +01:00
Zmago Devetak
75d7ace8c7
Merge pull request #1017 from ZmagoD/zd_SCI_2068
...
Write server-side endpoints for custom repositories [SCI-2068]
2018-03-20 14:30:47 +01:00
mlorb
884eef9d07
Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118
2018-03-20 14:25:59 +01:00
okriuchykhin
935715a8c1
Merge pull request #1043 from okriuchykhin/ok_SCI_2193
...
Rename record to item in repository row info modal [SCI-2193]
2018-03-20 09:53:34 +01:00
Oleksii Kriuchykhin
acbd40e0d1
Remove Power Up button [SCI-2117]
2018-03-18 22:12:29 +01:00
Oleksii Kriuchykhin
79fd2fbb2f
Rename record to item in repository row info modal [SCI-2193]
2018-03-18 13:51:40 +01:00
Oleksii Kriuchykhin
a105e61d48
Remove tutorial [SCI-1860]
2018-03-18 13:18:05 +01:00
zmagod
ee03115361
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2095
2018-03-16 15:32:40 +01:00
zmagod
1cdba5e0d3
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068
2018-03-16 11:05:16 +01:00
zmagod
c2eb6d6900
fixes hound adds specs to repository_list_items controller
2018-03-16 10:53:05 +01:00
zmagod
d69754af04
implement search on list items dropdown, update, create actions [fixes SCI-2070]
2018-03-15 15:43:16 +01:00
mlorb
9de998e85c
code left-side menu bar
2018-03-14 14:33:34 +01:00
Zmago Devetak
d7679dcb99
Merge pull request #1032 from ZmagoD/zd_SCI_2141
...
refactor global activities in separate page [fixes SCI-2141]
2018-03-13 15:20:14 +01:00
zmagod
dd2f7dd417
Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration
2018-03-13 13:24:36 +01:00
Oleksii Kriuchykhin
be1ead22e0
Implement importable selector for repository columns [SCI-2078]
2018-03-13 11:36:05 +01:00
zmagod
8fe173e831
re-structure top navigation bar
2018-03-12 16:27:35 +01:00
zmagod
e218cae453
refactor global activities in separate page [fixes SCI-2141]
2018-03-12 11:01:23 +01:00
mlorb
64e26e1c60
add file custom column type to db
2018-03-09 17:04:54 +01:00
zmagod
4f951f6679
adds unit specs for datatable service [fixes SCI-2068]
2018-03-09 14:22:00 +01:00
Oleksii Kriuchykhin
1765d83cd1
Refactor search to support repository list items [SCI-2108]
2018-03-09 11:05:43 +01:00
zmagod
fb66131e29
setup endpoint for repository_rows paging/search
2018-03-06 16:32:39 +01:00
mz3944
bb21f6543c
Merge pull request #1004 from mz3944/mz-SCI-2011
...
Wrapping up the permissions [SCI-2011]
2018-03-06 07:10:40 +01:00
mlorb
5e44859ce0
Merge pull request #1010 from mlorb/ml-sci-1826
...
Sign up with linkedIn account [SCI-1826]
2018-03-05 13:24:36 +01:00
Zmago Devetak
50ccec5007
Merge pull request #1009 from ZmagoD/zd_SCI_2066
...
add info modal for repository items [fixes SCI-2066]
2018-03-05 12:49:29 +01:00
mz3944
f40b0bd095
Merge pull request #1006 from mz3944/mz-SCI-2065
...
Extend description for adding files to step/result [SCI-2065]
2018-03-04 13:34:37 +01:00
zmagod
2b55cd7090
rename variables
2018-03-02 14:14:27 +01:00
mlorb
f5949e9d10
refactor
2018-03-01 17:52:24 +01:00
Luka Murn
070450f813
Merge branch 'release-1.12.11'
...
Conflicts:
config/initializers/extends.rb
2018-03-01 14:04:57 +01:00
mlorb
e66eab7f57
fix typo
2018-03-01 09:45:52 +01:00
mlorb
9199f287ba
fix hound
2018-03-01 09:18:36 +01:00
mlorb
08439e7f58
sign up with linkedIn account
2018-02-28 18:12:21 +01:00
zmagod
e3ca782996
add info modal for repository items [fixes SCI-2066]
2018-02-27 16:21:46 +01:00
Oleksii Kriuchykhin
aa933ad1f4
Add extendable file types mappings for icons [PIP-46]
2018-02-26 14:23:02 +01:00
Matej Zrimšek
48bdd84163
Updated file upload text, to notify user of another approach to uploading files.
2018-02-22 14:18:53 +01:00
okriuchykhin
0503aa054d
Merge pull request #999 from okriuchykhin/smtp_auth_method
...
Allow setting of SMTP auth method through ENV variable
2018-02-15 13:40:20 +01:00
Oleksii Kriuchykhin
00fcf5404b
Allow setting of SMTP auth method through ENV variable
2018-02-14 17:02:28 +01:00
Matej Zrimšek
68206cb591
Added missing checks for whether task/experiment/project is active for experiment level permissions. Minor code refactoring and restyling.
2018-02-14 14:39:08 +01:00
Zmago Devetak
027297d46a
Merge pull request #985 from ZmagoD/zd_SCI_2008
...
fixes bug with assets upload on task result page,
2018-02-12 11:40:44 +01:00
okriuchykhin
5a94b40d9c
Merge pull request #978 from okriuchykhin/ok_SCI_2003
...
Improve files handling in protocol cloning [SCI-2003]
2018-02-12 11:01:59 +01:00
zmagod
6b7ff11bcf
setup models for repository list column [fixes SCI-2015]
2018-02-07 15:28:28 +01:00
Luka Murn
b5ac4494d5
Uncommit load_addons_specs.rb
2018-02-06 16:58:15 +01:00
zmagod
bd1345d560
fixes bug with assets upload on task result page,
...
adds ctrl+v listener to upload images from clipboard, adds image preview modal
2018-02-06 15:39:19 +01:00
Luka Murn
5281d0792e
Comment load_addons_specs.rb out
2018-02-06 08:48:33 +01:00
Luka Murn
4ddc7dfa85
Comment react-hijack code
2018-02-06 08:00:29 +01:00
Oleksii Kriuchykhin
16e1d072b9
Improve files handling in protocol clonning [SCI-2003]
2018-02-01 15:44:08 +01:00
zmagod
2684d2b515
fix typo
2018-02-01 15:34:40 +01:00
zmagod
952173fbd6
escape if no feature folder present
2018-02-01 14:03:36 +01:00
zmagod
c6d585bc57
adds spec/features loader [fixes SCI-1998]
2018-02-01 13:37:52 +01:00
Zmago Devetak
ccab688728
Merge pull request #975 from ZmagoD/zd_SCI_2001
...
Zd sci 2001
2018-01-31 14:42:41 +01:00
okriuchykhin
df66a3b410
Merge pull request #973 from okriuchykhin/ok_SCI_1975
...
Allow optional tagging for logs [SCI-1975]
2018-01-31 13:31:01 +01:00
Luka Murn
d4183aa253
Fix a typo
2018-01-31 08:20:42 +01:00
Oleksii Kriuchykhin
bdc60b9d53
Allow optional tagging for logs [SCI-1975]
2018-01-30 18:24:01 +01:00
zmagod
029d69b033
revert to old setting [fixes SCI-1967]
2018-01-29 15:42:22 +01:00
Luka Murn
f752f82658
Fix canaid initializer so it only uses required Gems' permissions
...
This should make sure that other addons that are located in
/addons folder, but not actually required by the core,
do not cause trouble.
2018-01-26 16:24:28 +01:00
Zanz2
e484f0569b
Merge pull request #960 from Zanz2/fixed_styling_after_merge
...
Fixed some styling bugs that happened after the merge
2018-01-26 08:19:29 +01:00
okriuchykhin
0b1f43c1c5
Merge pull request #954 from okriuchykhin/ok_SCI_1970
...
Add health check endpoint to API controller [SCI-1970]
2018-01-25 14:33:37 +01:00
zanzdebian
8bd8c34c4d
Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button)
2018-01-25 13:45:35 +01:00
mlorb
ab2955c9bb
Merge pull request #956 from mlorb/ml-sci-1491
...
Add notification for previous task has been completed [SCI-1491]
2018-01-25 11:35:19 +01:00
Zmago Devetak
4716fc7752
Merge pull request #955 from biosistemika/decoupling
...
Decoupling
2018-01-25 11:33:06 +01:00
Mojca Lorber
ac8b1769be
add notification for previous task has been completed
2018-01-23 15:53:33 +01:00
okriuchykhin
a2896031ab
Merge pull request #951 from okriuchykhin/ok_SCI_1949
...
Allow first user seeding from env variables [SCI-1949]
2018-01-23 14:02:54 +01:00
zmagod
f8a3fca2db
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin
28be7c4fc4
Add health check endpoint to API controller [SCI-1970]
2018-01-22 16:52:48 +01:00
zmagod
246146c71e
adds Delayed::Worker initializer [fixes SCI_1948]
2018-01-19 16:30:29 +01:00
Oleksii Kriuchykhin
d1a515da90
Allow first user seeding from env variables [SCI-1949]
2018-01-18 16:23:33 +01:00
Adrian Oprea
6d84790bdb
Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader
...
* 'decoupling' of github.com:biosistemika/scinote-web: (21 commits)
fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
Remove Addons info test from core [SCI-1875]
Remove skip_on_import from repository_cell [SCI-1939]
fixes bug with comment actions dropdown [fixes SCI-1938]
fixes first element in global activities logs[fixes SCI-1866]
Fix task repository row selector [SCI-1940]
Fix repository item export [SCI-1945]
Fix samples import [SCI-1946]
adds first date to _list.html.erb view
Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]
Fix repository records import [SCI-1939]
Fix export samples button [SCI-1936]
refactor
adds additional tests for permissions controller
fix HOC to recive objects
fixes flow, and before_action in permissions_controller
fixes per @duco 's request
remove unneeded import
add permissions endpoint on the API
fix request
...
2018-01-17 18:14:41 +02:00
Adrian Oprea
a5ecc1a36e
refactor(addons_loader): Extract paths to variables / build mega-config file
...
- Create variables for the paths the script impacts
- Create a file to host the configuration, import each add-on config and re-export them through a single object
2018-01-16 17:22:00 +02:00
zmagod
3e95503017
adds(addon_loader) a generator that creates a js file with available addons
...
Signed-off-by: zmagod <zmago_devetak@yahoo.com>
2018-01-16 14:18:31 +01:00
zmagod
fc5daabb73
fix(addon_loader): make symlink to target addon/client
...
Signed-off-by: zmagod <zmago_devetak@yahoo.com>
2018-01-16 10:54:11 +01:00
zmagod
ed44762ff2
adds rescue
2018-01-15 08:44:59 +01:00
zmagod
0bfa92046d
add an initializer that creates symlinks to react components in core [fixes SCI-1902]
2018-01-12 17:14:27 +01:00
okriuchykhin
b6e3774d0b
Merge pull request #931 from okriuchykhin/ok_SCI_1916
...
Add allowed zip file type to Powerpoin and Word files [SCI-1916]
2018-01-12 14:28:26 +01:00
Zmago Devetak
ebd354e4d5
Merge pull request #900 from ZmagoD/zd_SCI_1854
...
adds premissions service to FE
2018-01-12 14:24:28 +01:00
Zanz2
b105920d4e
Merge pull request #901 from Zanz2/code_refactor
...
Protocols.io code beautification and refactoring [SCI-1929]
2018-01-12 12:34:00 +01:00
Oleksii Kriuchykhin
8b11427780
Add allowed zip file type to Powerpoin and Word files [SCI-1916]
2018-01-11 15:17:30 +01:00
mlorb
6c4514f550
add create_teams permission checks
2018-01-09 15:28:27 +01:00
zmagod
c07f54a0c7
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854
2018-01-08 08:38:14 +01:00
Luka Murn
cf291bf887
Merge branch 'gilson-iot-rails4'
...
Conflicts:
Gemfile.lock
2017-12-19 10:56:39 +01:00
mlorb
a3a494c3a2
fix banana: remove dead code which strangely reappeared, probably with some rebasing
2017-12-14 14:18:15 +01:00
mlorb
11a3cd196c
add create, update team permission and refactor 422 respond handling in controllers
2017-12-14 14:18:14 +01:00
mlorb
8893fd668d
add create, update, delete user_team permission
2017-12-14 14:18:14 +01:00
zmagod
b106545d31
fixes per @duco 's request
2017-12-13 08:57:50 +01:00
Zmago Devetak
00be4460cc
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step
...
Fixes bug with embedded images [SCI-1624]
2017-12-12 09:53:24 +01:00
okriuchykhin
b3b0e367e8
Merge pull request #889 from okriuchykhin/ok_SCI_1747
...
Improve server side assets validation display for steps [SCI-1747]
2017-12-04 14:12:43 +01:00
Zanz2
fcbd956d6e
Finished code beautification
2017-12-03 01:17:49 +01:00
zmagod
b6a5ab5e6c
fix request
2017-12-01 17:29:46 +01:00
zmagod
52b278fe78
adds premissions service to FE
2017-12-01 17:15:15 +01:00
zmagod
e69e9f6794
remove unneeded comment and add tiny_mce_asset regex in a constant
2017-11-24 17:04:01 +01:00
zmagod
930e3a86dc
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1762
2017-11-23 13:56:17 +01:00
Luka Murn
c51a85a161
Merge pull request #888 from biosistemika/lm-sci-1795
...
Setup main architecture for permissions refactoring [SCI-1795]
2017-11-23 12:32:49 +01:00
Zmago Devetak
2f66c1df25
adds travis config file ( #873 )
...
* adds travis config file
* add dist to travis
* adds script section
* test env
* remove globals
* adds hashed variables
* add matrix
* removed matrix
* test env
* testing
* test
* update Gemfile
* test travis
* test
* test
* test travis
* test
* build with docker
* test
* test
* ads
* add devise secre
* test travis
* test
* test
* test
* adds travis db configurations
* make travis happy
* test
* test
* test
* test
* test
* test
* testing devise
* test
* test
* teset
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* edit env
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* test
* final commit
* test
* cleanup
* cleanup
2017-11-23 09:55:57 +01:00
Zanz2
f577bf93b5
Fixed pull request review
2017-11-21 19:20:15 +01:00
Oleksii Kriuchykhin
fe8b7d26c1
Improve server side assets validation display for steps [SCI-1747]
2017-11-21 13:48:06 +01:00
Zanz2
d8c809ffd0
Reviewed pull request
2017-11-20 23:19:34 +01:00
zmagod
70db34090d
fixes rspec tests
2017-11-20 09:41:14 +01:00
Zanz2
cf66d94d45
Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields
2017-11-20 00:59:32 +01:00
Zanz2
fa25a6785b
Made the propper files and functionality for the text truncation to function
2017-11-17 02:43:32 +01:00
Zanz2
c44465817d
Added the functions and put in limitations from my validations files, changed controller name, added some locals
2017-11-16 20:03:44 +01:00
Luka Murn
d715eb06ef
Add team & project role-related helper functions to User model
...
This will be required later once we start using Canaid.
2017-11-16 15:50:30 +01:00
Luka Murn
ccef5571f1
Add dependency to Canaid, the permission helper library
2017-11-16 15:49:13 +01:00
mlorb
6c80c338e4
Merge pull request #880 from mlorb/ml-sci-1316
...
Change text for avatar size on my profile page [SCI-1316]
2017-11-16 10:43:23 +01:00
Oleksii Kriuchykhin
84f4aba213
Pull latest master into gilson-iot-rails4
2017-11-15 15:15:26 +01:00
Mojca Lorber
cd006c2640
change text for expiry of a link for an exported file
2017-11-15 14:32:19 +01:00
Mojca Lorber
ff998a6c98
change text for avatar size on my profile page
2017-11-15 14:21:04 +01:00
mlorb
47784e09a8
Merge pull request #867 from mlorb/ml-sci-1434
...
Add explanation when copying custom repositories [SCI-1434]
2017-11-15 11:34:02 +01:00
Zanz2
9bd198eaf6
Merge pull request #875 from Zanz2/removed_txt_1793
...
Removed the .txt text from translations file [SCI-1793]
2017-11-14 19:12:32 +01:00
Zanz2
6b9a10ffe4
Made validations for JSON format and .txt and .json files
2017-11-14 12:02:17 +01:00
Zanz2
3e964da241
Removed the .txt text from translations file
2017-11-14 11:42:10 +01:00
Mojca Lorber
be74338d9f
add explanation when copying custom repositories
2017-11-13 16:30:42 +01:00
mlorb
cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import
...
Protocols io import
2017-11-13 11:53:28 +01:00
Zanz2
b265beb386
Merge pull request #864 from Zanz2/move_desc
...
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
2017-11-13 10:07:01 +01:00
Zanz2
23d3ffa5a4
Fixed PR
2017-11-12 15:48:45 +01:00
Zanz2
fa2c0fe556
merging
2017-11-09 18:55:17 +01:00
Zanz2
812fa3f1d5
Hopefully this will resolve my merge problems
2017-11-09 17:42:17 +01:00
zmagod
327e27e123
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576
2017-11-09 15:55:10 +01:00
Zanz2
9086cd8b6b
Jira branch code
2017-11-09 10:49:44 +01:00
zmagod
9eac014f1a
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731
2017-11-09 09:05:22 +01:00
zmagod
e2af987b80
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1568
2017-11-09 08:35:39 +01:00
zmagod
b3a8f8b5e2
refactor dev env
2017-11-08 17:31:21 +01:00
zmagod
33ebe1f748
integration tests for forgot_password [fixes SCI-1576]
2017-11-08 16:23:52 +01:00
zmagod
b036452d8c
adds background worker to cucumber tests
2017-11-08 11:59:01 +01:00
zmagod
f43492adff
trigger an alert to on canvas save if page reload [fixes SCI-1610]
2017-11-07 15:08:26 +01:00
Zmago Devetak
a9bba07c74
Merge pull request #847 from ZmagoD/zd_SCI_1683
...
add whacamole configuration [fixes SCI-1683]
2017-11-06 15:56:29 +01:00
zmagod
54e360bb52
fixes team switch
2017-11-06 15:14:17 +01:00
mlorb
126f278308
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json
...
Scinote protocols IO base branch
2017-11-06 14:53:01 +01:00
okriuchykhin
80405800ca
Merge pull request #818 from okriuchykhin/ok_SCI_1626
...
Enable :preserve_files in paperclip config [SCI-1626]
2017-11-03 11:56:57 +01:00
zmagod
2118b31762
adds about sciNote modal
2017-11-02 13:23:57 +01:00
Zanz2
de9a3a1d0d
Preview tables are now functional but with inline javascript , ugly styling and a few major bugs (they dont display fully until you click on them, and i dug deep on the handson table wiki and hot table wiki for issues like this, and while they exist, idk how to implement the solutions because they use angular js mostly
2017-10-28 23:57:29 +02:00
zmagod
e5a01f7a57
adds integration tests for about sciNote modal
2017-10-27 16:37:42 +02:00
okriuchykhin
2e0bf91467
Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675
...
Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2
2017-10-27 11:14:39 +02:00
Zanz2
a732c8afa7
Code for protocol repository scinote table elements view
2017-10-26 17:28:27 +02:00
zmagod
5e6a4bb69a
adds environment variable that disables/enables the creation of new team when user sign up
2017-10-25 15:29:04 +02:00
zmagod
c36fcb1fa4
fixes user invitation button [fixes SCI-1726]
2017-10-25 11:31:32 +02:00
zmagod
4de335d189
add whacamole configuration [fixes SCI-1683]
2017-10-25 09:47:26 +02:00
Luka Murn
c026b60790
Update Profile page to use validation
2017-10-23 18:04:20 +02:00
Luka Murn
8cda449738
Update en.yml
...
Remove unneccesary my_module_groups localization Strings.
2017-10-23 17:49:55 +02:00
Luka Murn
82f982e983
Merge branch 'rails-5.1' into decoupling-settings-page
...
Conflicts:
Gemfile
Gemfile.lock
2017-10-23 10:59:10 +02:00
Luka Murn
e740e586e8
Additional fixes required by latest merge from master (nr. 2)
2017-10-23 10:43:32 +02:00
Luka Murn
6c2c5aff17
Additional fixes required by latest merge from master
2017-10-23 09:51:13 +02:00
Luka Murn
8254153bb9
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile
Gemfile.lock
app/models/connection.rb
app/models/experiment.rb
app/models/my_module.rb
2017-10-23 08:57:57 +02:00
Zanz2
03e40017e4
Updated local
2017-10-19 19:58:18 +02:00
Zanz2
6cf775a4b1
Refactored code, made html render on preview too
2017-10-17 19:27:20 +02:00
zmagod
30d091dc65
adds label under protocols keywords input [fixes SCI-1560]
2017-10-17 14:10:56 +02:00
Luka Murn
4e06b5c397
Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""
2017-10-17 13:17:49 +02:00
Luka Murn
4d8f2665d3
Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"
2017-10-17 13:10:02 +02:00
zmagod
6fe48a07ae
fix hound, add custom hook for webpacker:compile
2017-10-16 17:02:35 +02:00
zmagod
c5978f2d86
adds cucumber test for profile page [fixes SCI-1572]
2017-10-16 16:21:52 +02:00
Luka Murn
2fb2b90da3
Merge pull request #820 from Ducz0r/lm-sci-1675
...
Add Add-ons page to User -> Settings -> Account [SCI-1675]
2017-10-16 13:05:43 +02:00
Luka Murn
38bce08b5a
Minor wording change.
2017-10-13 09:27:18 +02:00
Luka Murn
fe89b942e7
Add Add-ons page to User -> Settings -> Account
...
Closes SCI-1675.
2017-10-11 14:15:37 +02:00
Zmago Devetak
d1c3d00c84
Merge pull request #807 from ZmagoD/zd_SCI_1629
...
adds bootstrap and font-awesome in webpacker build fixes the missing …
2017-10-10 14:09:52 +02:00
Oleksii Kriuchykhin
58c2487eb6
Enable :preserve_files in paperclip config [SCI-1626]
2017-10-10 13:32:14 +02:00
Oleksii Kriuchykhin
bd26052110
Remove GIOT sign-in button [GIOT-55]
2017-10-09 11:56:46 +02:00
zmagod
943339345a
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628
2017-10-09 10:41:36 +02:00
zmagod
2d1c849106
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629
2017-10-09 09:43:29 +02:00
zmagod
d85233cb2c
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566
2017-10-09 09:30:06 +02:00
zmagod
2a64d23a6e
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1567
2017-10-09 09:14:58 +02:00
Zanz2
183c93d21b
Refactoring to git review specifications
2017-10-07 22:13:31 +02:00
Zanz2
2b9563ec6d
Added preview text to en.yml
2017-10-07 17:45:23 +02:00
Zanz2
66e5004e60
Changed import text to be inside en.yml, as said in the code review, deleted some blank lines
2017-10-07 15:56:43 +02:00
zmagod
3321fc495c
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628
2017-10-06 15:54:52 +02:00
zmagod
5a31df7204
adds @Ducz0r suggestions
2017-10-06 10:45:22 +02:00
Oleksii Kriuchykhin
b26b963e54
Optimize update canvas SQL and remove module group name [SCI-1642]
2017-10-05 16:19:25 +02:00
zmagod
c20f0c2d8a
fixes user_controller specs, adds user model specs for settings
2017-10-05 15:53:05 +02:00
zmagod
754627efe7
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564
2017-10-05 11:08:31 +02:00
zmagod
524e8bffbf
fixes sign out action on settings page, clean the redux store, handles redirect to sign in page if session is terminated [fixes SCI-1567]
2017-10-05 10:07:50 +02:00
zmagod
84f279de22
setup flow
2017-10-04 09:16:17 +02:00
zmagod
55332e2957
adds bootstrap and font-awesome in webpacker build fixes the missing icons bug [fixes SCI-1629]
2017-10-03 16:01:33 +02:00
zmagod
edf4443995
added notification alert [fixes SCI-1566]
2017-10-02 14:51:54 +02:00
zmagod
cb4bacc372
refactor preferences page [fixes SCI-1564]
2017-09-28 16:53:51 +02:00
zmagod
e2aa0d7515
fixes user profile
2017-09-26 17:29:11 +02:00
Zanz2
11b2ef3112
Made code nicer, hopefully not unintentionally breaking something
2017-09-25 13:53:32 +02:00
Zanz2
deef790951
added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions
2017-09-22 11:56:50 +02:00
mlorb
9d96bf668a
fix error handeling, refactoring
2017-09-21 16:42:56 +02:00
zmagod
39025769ec
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564
2017-09-21 13:45:27 +02:00
zmagod
ed2beefc08
fixed profile info inputs
2017-09-21 13:42:49 +02:00
mlorb
48c8922604
adds invite users modal
2017-09-21 10:45:35 +02:00
Luka Murn
e078ae4f77
Merge branch 'rails-5.1' into decoupling-settings-page
2017-09-21 08:36:09 +02:00
Luka Murn
beae1b05d8
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile
Gemfile.lock
2017-09-21 08:27:38 +02:00
zmagod
c636ca4276
refactor user preferences and profile page
2017-09-20 11:17:59 +02:00
Luka Murn
80c05e50ec
Semi-working version of create new team form
2017-09-19 16:30:26 +02:00
Zanz2
7aba782639
optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show
2017-09-19 15:02:16 +02:00
zmagod
d1477179b2
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1499
2017-09-18 15:10:52 +02:00
Zanz2
f861b1fc52
Configured the controller,the main task ahead is to figure out how to import all of the data i have available
2017-09-15 15:52:55 +02:00
Toni Dezman
d38f4343f2
Decupling redux part 1
2017-09-14 11:46:49 +02:00
Zanz2
d6d1f9d490
changed second modal preview styling to fit its specifications
2017-09-14 11:46:41 +02:00
zmagod
705d07f60e
adds remove team action
2017-09-13 17:11:51 +02:00
Zanz2
b7432b336a
added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller
2017-09-13 15:15:08 +02:00
zmagod
1b3b3dfea9
adds team members update role functionality
2017-09-12 17:30:13 +02:00
Žan Žagar
fdbae19156
changed .json to .txt for clarity
2017-09-12 09:33:18 +02:00
Žan Žagar
2a7a2b8fa1
Changed some minor button text and fixed a local error
2017-09-12 09:26:22 +02:00
Žan Žagar
2c0a458aaf
dodav moj alternativni text za importanje (text na gumbu), za rails translate (t)
2017-09-11 15:21:35 +02:00
Toni Dezman
185039bc99
adds suggestions from code review
2017-09-04 15:00:26 +02:00
zmagod
91d2d8a935
adds team details view
2017-08-31 15:56:55 +02:00
Toni Dezman
c3f46d4877
adds hounds suggestions on improving the code
2017-08-31 13:24:57 +02:00
Toni Dezman
77a6a99513
fixes 404 request error
2017-08-31 13:03:15 +02:00
Toni Dezman
4034400c42
Merge branch 'decoupling-settings-page' into td_SCI_1565
2017-08-31 11:42:15 +02:00
Toni Dezman
8b61fe563c
user preferences APIs
2017-08-31 11:23:44 +02:00
zmagod
1325732b0c
adds specs for team controller actions
2017-08-30 16:18:21 +02:00
Toni Dezman
2e6a942152
api for timezone
2017-08-30 14:59:17 +02:00
Oleksii Kriuchykhin
c3fceb90df
Backport API to Rails-4 [SCI-1579]
2017-08-30 13:30:41 +02:00
zmagod
ee054f91b8
adds bullet gem [fixes SCI-1578]
2017-08-30 09:29:45 +02:00
zmagod
478bd491ff
added pagination and sorting to team tables
2017-08-28 17:05:09 +02:00
Toni Dezman
ea9a195f09
email and password action/redusers work
2017-08-26 14:07:31 +02:00
Toni Dezman
ccd14f6b50
adds apis for full_name and initials input fields
2017-08-25 14:45:02 +02:00
zmagod
782daabce1
first run
2017-08-25 08:54:32 +02:00
Toni Dezman
e4a704d063
namespaces client_api/users/user_controller.rb
2017-08-25 08:21:52 +02:00
Zmago Devetak
994b08fcfc
Merge pull request #752 from ZmagoD/testin-rails-5-addons
...
fix background worker bug
2017-08-25 08:05:21 +02:00
zmagod
afa05c8c14
fixed background worker in dev env
2017-08-23 17:10:45 +02:00
Toni Dezman
692df427b2
adds wildcard for settings/*all to show react 404 page
2017-08-22 10:35:18 +02:00
zmagod
c5e32c4ea0
Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch
2017-08-21 09:52:14 +02:00
Zmago Devetak
efd105c499
Merge pull request #759 from ZmagoD/zd_SCI_1471
...
fixes signup spec [fixes SCI-1471]
2017-08-09 16:16:50 +02:00
zmagod
bd352869a3
adds user account dropdown
2017-08-09 09:08:13 +02:00
zmagod
226458a3f0
adds recent notifications
2017-08-08 15:44:28 +02:00
Luka Murn
13eae287bb
Revert "Add core API using JWT authentication and tests for it [SCI-1507]"
2017-08-07 11:54:45 +02:00
Luka Murn
c6448264d0
Revert "Td sci 1492"
2017-08-07 11:47:21 +02:00
Luka Murn
ae5bccf709
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile.lock
app/datatables/repository_datatable.rb
app/models/repository_cell.rb
2017-08-07 08:45:53 +02:00
Oleksii Kriuchykhin
35b643f34e
Fix typo in config and code style improvements [SCI-1507]
2017-08-04 10:19:56 +02:00
Oleksii Kriuchykhin
e958410261
Add core API using JWT authentication and tests for it [SCI-1507]
2017-08-03 17:00:14 +02:00
zmagod
c314bae28d
add team switch js/controller
2017-08-03 16:03:15 +02:00
zmagod
6ef19725f1
adds redux
2017-08-02 17:27:05 +02:00
zmagod
caae1e2fe8
adds intl, router, bootstrap to npm modules
2017-07-31 10:42:40 +02:00
zmagod
a46e28a85a
fixes signup spec [fixes SCI-1471]
2017-07-28 15:37:28 +02:00
Luka Murn
03a7440136
Remove SkyLight stuff (we're not using it any more)
2017-07-27 14:26:44 +02:00
Toni Dezman
78f26525e9
Settings SPA works
2017-07-27 13:53:29 +02:00
zmagod
416ab8eee3
Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into zd_SCI_1400
2017-07-26 16:20:09 +02:00
zmagod
c34e4a0814
fix background worker bug
2017-07-26 13:31:36 +02:00
Oleksii Kriuchykhin
6c33b46f6a
Improve import of repository records plus tsv file import fixes [SCI-1487]
2017-07-20 11:44:10 +02:00
Zmago Devetak
7b898666da
Merge pull request #745 from ZmagoD/zd_SCI_1485
...
refactor repositories js files [fixes SCI-1485]
2017-07-19 11:17:52 +02:00
Oleksii Kriuchykhin
ece27b2652
Fix importing files with empty header cells and error messages improvements [SCI-1484]
2017-07-18 14:54:35 +02:00
zmagod
a2b7bcda4c
refactor repositories js files [fixes SCI-1485]
2017-07-17 15:05:28 +02:00
Oleksii Kriuchykhin
036ee390ed
Fix error messages in repository import and uploading files starting with hyphen[SCI-1484]
2017-07-14 16:19:03 +02:00
Oleksii Kriuchykhin
b8e93ee883
Add Webpacker and React [SCI-1461]
2017-07-12 16:41:55 +02:00
Luka Murn
1dc3e49367
Merge pull request #739 from Ducz0r/lm-sci-1432
...
Extend confirmation period of emails to 7 days [SCI-1432]
2017-07-11 10:57:16 +02:00
Luka Murn
19a8dfe116
Extend confirmation period of emails to 7 days
...
Closes SCI-1432.
2017-07-11 08:32:52 +02:00
Luka Murn
3e80f761b8
Add "about" modal, prepare hooks, VERSION system for addons
...
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
2017-07-10 15:27:50 +02:00
Luka Murn
16e672b9d8
Add VERSION file where the sciNote Core version is stored
2017-07-10 09:26:35 +02:00
Luka Murn
bc8d945101
Damn, I spent too much time on GeneIO. Fixing again >_<
2017-07-07 13:19:39 +02:00
Luka Murn
e9ef7b61ef
Fix WickedPdf bug on production
2017-07-07 13:05:18 +02:00
mz3944
f55861b373
Merge pull request #731 from mz3944/mz-SCI-1413
...
Fixed some RoR 5.1 default settings. [SCI-1413]
2017-07-06 17:17:27 +02:00
Luka Murn
4317da343b
Don't use listen gem in development mode
2017-07-06 16:49:50 +02:00
Luka Murn
9f60ece25f
Merge branch 'master' into rails-5.1
...
Conflicts:
app/models/repository.rb
app/models/repository_row.rb
app/views/projects/index.html.erb
app/views/shared/_secondary_navigation.html.erb
2017-07-06 15:12:15 +02:00
Matej Zrimšek
9d0fd4e76f
Reverted settings for WebSockets, because we might use redis subscription adapter. [SCI-1413]
2017-07-06 12:55:58 +02:00
zmagod
750c82a80f
setup testing tools [fixes SCI-1400]
2017-07-06 09:07:05 +02:00
Matej Zrimšek
843116f645
Fixed some RoR 5.1 default settings. [SCI-1413]
2017-07-04 14:42:53 +02:00
Luka Murn
9a19cb711f
Version bump to 1.12.1
2017-07-04 08:00:32 +02:00
zmagod
fd13921720
fixes repeat tutorial [fixes SCI-1410]
2017-06-29 11:00:50 +02:00
zmagod
525c9770ac
fixes experiment page [fixes SCI-1395]
2017-06-28 15:21:32 +02:00
zmagod
71aa05bb0e
refactor
2017-06-27 14:58:49 +02:00
mlorb
025050a7cd
Merge pull request #716 from mlorb/ml-sci-1420
...
Add tooltips to navigation bar [SCI-1420]
2017-06-27 14:52:07 +02:00
Mojca Lorber
d03be76f35
add tooltips to archive buttons
2017-06-27 14:48:45 +02:00
Mojca Lorber
6bfb5e125c
add tooltips to navigation bar
2017-06-27 13:46:49 +02:00
okriuchykhin
d126391940
Merge pull request #710 from okriuchykhin/ok_SCI_1356
...
Add global search in custom repositories [SCI-1356]
2017-06-27 13:41:53 +02:00
mz3944
ca59ac5e36
Merge pull request #714 from mz3944/mz-SCI-1402
...
Missing error message when not selecting name in case of import repository file [SCI-1402]
2017-06-27 11:54:26 +02:00
Matej Zrimšek
f847b44067
Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402]
2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin
84556cf744
Fix naming of repository items in modal and messages [SCI-1404]
2017-06-26 16:03:02 +02:00
Oleksii Kriuchykhin
e038bc58fa
Add global search in custom repositories [SCI-1356]
2017-06-23 16:12:56 +02:00
zmagod
819f47b450
setup sciNote for Rails 5.1
2017-06-23 15:19:08 +02:00
Zmago Devetak
d726c121bc
Version bump to 1.12.0
2017-06-23 12:37:19 +02:00
Matej Zrimšek
be855e98db
Changed repository records filter naming. [SCI-1398]
2017-06-23 10:16:50 +02:00
zmagod
bad52ceff1
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336
2017-06-21 15:56:07 +02:00
zmagod
f66fb49b56
adds import records to repositories [fixes SCI-1336]
2017-06-21 14:45:50 +02:00
zmagod
f64e1ac713
fix locales
2017-06-21 09:31:39 +02:00
mlorb
122ac7971f
Merge pull request #692 from mlorb/ml_sci_1348
...
Fix cog position on repositories page [SCI-1348]
2017-06-19 15:16:01 +02:00
Mojca Lorber
86530bbda0
fix flash text
2017-06-16 14:41:50 +02:00
Mojca Lorber
b6f146f177
fix cog position on repositories page
2017-06-16 11:54:31 +02:00
Mojca Lorber
4566fc7191
fix text in activity for assign/unassign records message
2017-06-15 10:06:12 +02:00
Mojca Lorber
77d922a5e8
change the name of add record/repository in repositories
2017-06-13 09:45:18 +02:00
zmagod
a865253a2e
first run
2017-06-13 08:10:10 +02:00
rekonder
ede744849b
Export repository [aj-SCI-1275]
2017-06-09 19:44:28 +02:00
Luka Murn
e26337d5ee
Merge pull request #671 from biosistemika/custom-repositories
...
Merge custom-repositories into master
2017-06-09 18:46:47 +02:00
Zmago Devetak
4873624cec
Merge pull request #658 from ZmagoD/zd_SCI_1011
...
Multiple file upload with drag & drop capability in steps and results
2017-06-09 10:03:33 +02:00
Mojca Lorber
71c523c406
load tabs with javascript
2017-06-08 13:47:30 +02:00
Luka Murn
810599bef2
Fix en.yml localization bug
2017-06-08 13:36:37 +02:00
Luka Murn
2ab31aba2f
Merge pull request #660 from Ducz0r/lm-sci-1270
...
Copy repository functionality [SCI-1270]
2017-06-08 11:45:57 +02:00
Luka Murn
27feb46d8f
Merge pull request #659 from Ducz0r/lm-sci-1279
...
Include repositories in reports [SCI-1279]
2017-06-08 11:24:21 +02:00
Luka Murn
e0828657b3
Somebody kill the Hound please
2017-06-08 11:23:24 +02:00
Luka Murn
9bfbf3b634
Minor fix #2
2017-06-08 11:22:27 +02:00
Luka Murn
b729c06f31
Minor fix
2017-06-08 11:20:11 +02:00
Luka Murn
61eb52f86f
Implement GUI for copying repositories
...
Closes SCI.1270.
2017-06-07 19:11:25 +02:00
Luka Murn
38361e4bb4
Setup initial GUI
2017-06-07 18:43:48 +02:00
Luka Murn
0aee11d6d8
Hound is love, Hound is life #2
2017-06-07 18:26:32 +02:00
Luka Murn
42f7b4f68d
Hound is love, Hound is life
2017-06-07 18:22:15 +02:00
Matej Zrimšek
77a225ec31
Added toggle between assigned and all repository records. [SCI-1276]
2017-06-07 18:13:25 +02:00
Luka Murn
02dd6636ba
Allow saving & editing of reports with repository elements
...
Closes SCI-1279.
2017-06-07 16:55:00 +02:00
Luka Murn
b5f6d1da94
Allow custom repositories to be added to reports
2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin
c18bba9fbe
Fix rebase errors [SCI-1274]
2017-06-07 15:50:22 +02:00
Oleksii Kriuchykhin
8b1190060e
Add custom repository table [SCI-1274]
2017-06-07 15:23:25 +02:00
Zmago Devetak
fcec42ae31
Merge pull request #645 from ZmagoD/zd_SCI_1278
...
generates samples csv file in background job [fixes SCI-1278]
2017-06-07 15:04:24 +02:00
zmagod
c6bb20039b
adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]
2017-06-07 13:29:39 +02:00
Mojca Lorber
51c4eeb106
renaming
2017-06-06 15:50:43 +02:00
ajugo
887d9a4f52
Samples - show all/show assigned [SCI-1277] ( #644 )
...
* Samples - show all/show assigned [SCI-1277]
* Some fixes in code
* Some minor fixes in code
* Omit present
* Correct missed present
* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Mojca Lorber
acdea2198d
code changes after rebasing
2017-06-06 11:10:55 +02:00
Mojca Lorber
13bf4ad229
create new repository
2017-06-06 09:54:39 +02:00
Matej Zrimšek
2c6ad4aa05
Refactored modal popups for repositories to make them general. [fix 1269]
2017-06-05 14:13:24 +02:00
zmagod
67d902db52
refactor
2017-06-05 10:43:58 +02:00
Matej Zrimšek
d8d54232c3
After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269]
2017-06-02 19:08:51 +02:00
Matej Zrimšek
73aaef0949
Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269]
2017-06-02 17:52:04 +02:00
Matej Zrimšek
21a72da84f
Added rename logic and improved remove logic. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
cdaac6a01b
Added remove repository modal logic. [SCI-1269]
2017-06-02 17:50:33 +02:00
Matej Zrimšek
791bb934ca
Remove repository modal logic (WIP). [SCI-1269]
2017-06-02 17:50:33 +02:00
Matej Zrimšek
b92a760a5c
Added dropdown GUI for editing repository. [SCI-1269]
2017-06-02 17:47:28 +02:00
Luka Murn
fcc3995049
Merge pull request #647 from biosistemika/master
...
Bring latest master changes into custom-repositories
2017-05-30 14:18:14 +02:00
zmagod
b527afd12b
generates samples csv file in background job [fixes SCI-1278]
2017-05-29 14:42:55 +02:00
mz3944
689587c4fc
Merge pull request #643 from mz3944/mz-SCI-1305
...
Handled user removal from the team for user smart annotation [fixes SCI-1305]
2017-05-29 12:52:19 +02:00
Matej Zrimšek
e8f842c29f
Forgot to add the updated locales. [fixes SCI-1305]
2017-05-29 11:39:17 +02:00
Zmago Devetak
2224c6511d
Merge pull request #630 from ZmagoD/zd_SCI_1240_v2
...
fix label [fixes SCI-1240]
2017-05-29 09:01:30 +02:00
mlorb
872f712be8
Merge branch 'custom-repositories' into ml_sci_1266_v2
2017-05-23 11:05:25 +02:00
mz3944
6b8c8deb16
Merge pull request #634 from mz3944/mz-SCI-414
...
Uncompleted steps not added to Reports
2017-05-23 09:58:05 +02:00
mz3944
9fe3b717c8
Merge pull request #626 from mz3944/mz-SCI-487
...
Simplify "Add contents to report" popup
2017-05-23 09:57:39 +02:00
Mojca Lorber
9ae615264d
add global repositories screen - tab control
2017-05-22 17:54:30 +02:00
Oleksii Kriuchykhin
e99e3edb7b
Add repositories dropdown to task navigation [SCI-1273]
2017-05-18 14:21:00 +02:00
Luka Murn
4c5d7267ac
Version bump to 1.11.0
2017-05-18 13:48:02 +02:00
Matej Zrimšek
f78c80b148
Added possibility to add uncompleted steps to report. [closes SCI-414]
2017-05-17 13:25:21 +02:00
zmagod
b8b47542a6
fix label [fixes SCI-1240]
2017-05-16 16:08:29 +02:00
Oleksii Kriuchykhin
72a651c7de
Add migrations and models for custom repositories [SCI-1267]
2017-05-16 15:27:36 +02:00
zmagod
e0397f8a54
fix search label [fixes SCI-1285]
2017-05-16 14:58:39 +02:00
Matej Zrimšek
dbb79ebab1
Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
Matej Zrimšek
27cfd55ea5
Simplified popup modal for adding contents to report. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
zmagod
01972ab6a7
changes load protocol label [fixes SCI-1240]
2017-05-15 15:22:43 +02:00
okriuchykhin
a8bbc3c3ba
Merge pull request #615 from okriuchykhin/ok_SCI_1008
...
Fix task and step ordering in reports [SCI-1008]
2017-05-12 16:44:57 +02:00
Oleksii Kriuchykhin
bb8c7c342c
Add additional info to samples info modal [SCI-960]
2017-05-11 22:20:06 +02:00
Oleksii Kriuchykhin
5d55720aad
Fix steps ordering in reports [SCI-1008]
2017-05-11 15:56:33 +02:00
Zmago Devetak
9911c0d148
Merge pull request #613 from ZmagoD/zd_SCI_1241_v3
...
replace all ActionController::Base.helpers.sanitize calls with custom…
2017-05-11 14:30:26 +02:00
zmagod
80a0af8c9f
replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]
2017-05-11 11:36:47 +02:00
Oleksii Kriuchykhin
229693ec61
Fix root_url method unavailable in application_helper [SCI-1252]
2017-05-10 18:15:08 +02:00
ajugo
e7c970f287
Wording in activity for completion of checklist item [SCI-274] ( #601 )
2017-05-10 10:13:59 +02:00
okriuchykhin
ccc640f2bc
Merge pull request #593 from okriuchykhin/ok_SCI_1158
...
Add advanced search options [SCI-1158]
2017-05-09 10:23:34 +02:00
gazvoda
596b296c84
Merge pull request #597 from gazvoda/lg-SCI-1104
...
Added additional explanation text [fixes SCI-1104]
2017-05-09 08:41:52 +01:00
gazvoda
e98d6a4da6
Merge pull request #596 from gazvoda/lg-SCI-723
...
Added team icon on the first step of tutorial after the Team icon tex…
2017-05-08 14:57:56 +01:00
osboxes.org
c43eacdb98
Added additional explanation text [fixes SCI-1104]
2017-05-08 15:35:53 +02:00
gazvoda
e462482566
Merge pull request #595 from gazvoda/lg-SCI-1239
...
Corrected number of expiration days in message [fixes SCI-1239]
2017-05-08 13:52:23 +01:00
osboxes.org
ea0934a8cb
Added team icon on the first step of tutorial after the Team icon text [solves SCI-723]
2017-05-08 14:43:35 +02:00
osboxes.org
ddbd568166
Corrected number of expiration days in message [fixes SCI-1239]
2017-05-08 13:08:53 +02:00
Zmago Devetak
4b816f5322
Merge pull request #568 from ZmagoD/zd_SCI_1119
...
Add images to fields with rich text formatting
2017-05-08 13:06:58 +02:00
Oleksii Kriuchykhin
0ee7e11620
Add advanced search options [SCI-1158]
2017-05-05 16:41:23 +02:00
Zmago Devetak
de3d1172c1
Merge pull request #584 from ZmagoD/zd_SCI_1200
...
add popup for approval to complete the Task [fixes SCI-1200]
2017-05-05 14:57:27 +02:00
zmagod
b22350136f
adds label to step in report [fixes SCI-488]
2017-05-05 09:45:18 +02:00
zmagod
acc5594f1b
add popup for approval to complete the Task [fixes SCI-1200]
2017-05-04 12:41:22 +02:00
mz3944
37eef683eb
Merge pull request #575 from mz3944/mz-SCI-1205
...
Added date format constant. [Fixes SCI-1205]
2017-04-26 14:30:23 +02:00
Matej Zrimšek
2c76ba9471
Added date format constant. [Fixes SCI-1205]
2017-04-25 16:37:09 +02:00
Matej Zrimšek
8ad52354eb
Used locales instead of hardcoded values for intro.js tutorial popup.
2017-04-25 16:03:50 +02:00
Luka Murn
92159b734f
Merge pull request #559 from Ducz0r/lm-sci-1175-fix
...
Fix encoding when cloning tables [SCI-1175]
2017-04-25 14:38:34 +02:00
zmagod
66f43803c0
refactor, fix user annotation bug
2017-04-24 16:22:25 +02:00
zmagod
550f563666
working version for steps first run
2017-04-21 16:09:04 +02:00
Mojca Lorber
0bae4657f6
add experiment level to user smart annotation notification
2017-04-20 13:21:02 +02:00
Luka Murn
61af70668c
Bump version to 1.10.0
2017-04-19 09:31:40 +02:00
zmagod
c25df63a14
add tinymce img importer and refactor input sanitize helper
2017-04-19 09:11:52 +02:00
mz3944
0ebf294844
Merge pull request #562 from mz3944/mz-SCI-1187
...
Added general locale for cases when a name is optional and is not spe…
2017-04-18 15:26:35 +02:00
mlorb
aab6a9b7a4
Merge pull request #561 from mlorb/ml_sci_1198
...
Change mentions for user smart annotations in notifications [SCI-1198]
2017-04-18 09:42:38 +02:00
mlorb
39f0ec9d24
Merge pull request #557 from mlorb/ml_sci_1118
...
Rename cloning text [SCI-1118]
2017-04-18 09:42:05 +02:00
Matej Zrimšek
c8ba234023
Added general locale for cases when a name is optional and is not specified. [fixes SCI-1187]
2017-04-14 17:20:34 +02:00
Mojca Lorber
34cfe01152
change mentions for user smart annotations in notifications
2017-04-14 16:23:49 +02:00
Mojca Lorber
56efb8086f
rename the rest of cloning text
2017-04-13 17:52:32 +02:00
Luka Murn
9c28608fbf
Fix encoding when cloning tables
...
Closes SCI-1175.
2017-04-13 17:00:27 +02:00
Mojca Lorber
5f02376da3
rename cloning text
2017-04-13 15:09:17 +02:00
zmagod
53e828566a
change system notification description
2017-04-13 14:01:52 +02:00
zmagod
f104444a0c
adds additional explanations [fixes SCI-1103]
2017-04-12 16:56:47 +02:00
Zmago Devetak
9c31239318
Merge pull request #552 from biosistemika/release-1.9.0
...
Release 1.9.1
2017-04-12 13:08:37 +02:00
Luka Murn
3d9323c8d7
Merge pull request #547 from Ducz0r/lm-sci-1107
...
Silence Wicked PDF generation [SCI-1107]
2017-04-11 11:22:49 +02:00
Luka Murn
d8c00401cd
Update constants.rb
...
Bump version to 1.9.1
2017-04-11 09:10:55 +02:00
Zmago Devetak
91793c295a
Merge pull request #542 from ZmagoD/zd_SCI_825
...
Smart annotations and Notifications
2017-04-10 15:10:17 +02:00
Luka Murn
a30c7a77e8
Silence Wicked PDF generation
...
Closes SCI-1107.
2017-04-10 14:00:31 +02:00
zmagod
d2eb7be426
removed faq label
2017-04-10 11:23:50 +02:00
zmagod
90faeec410
fixes typos and protocol step links
2017-04-10 11:21:28 +02:00
zmagod
9610c5f5a0
fix info dropdown links [fixes SCI-1141]
2017-04-07 11:31:09 +02:00
zmagod
9a17648eee
Adds new relic in sciNote [fixes SCI-1183]
2017-04-07 11:23:45 +02:00
zmagod
439cd0cd89
add notification to experiments
2017-04-06 14:55:18 +02:00
zmagod
046b608018
add notification for my_module/project comments
2017-04-06 14:07:22 +02:00
zmagod
f16607579f
refactor steps annotation
2017-04-06 13:03:13 +02:00
zmagod
bb437bd8c5
adds notification to results annotation
2017-04-06 09:33:49 +02:00
zmagod
d331911ffe
completed step annotations
2017-04-06 08:42:16 +02:00
okriuchykhin
b781ebd6fe
Merge pull request #536 from okriuchykhin/ok_SCI_1166
...
Whitelist application/zip file type in paperclip for some .xlsx files [SCI-1166]
2017-04-05 09:55:39 +02:00
Oleksii Kriuchykhin
ba4dbe49f8
Whitelist application/zip file type in paperclip for some .xlsx files [SCI-1166]
2017-04-04 10:51:54 +02:00
zmagod
e016bda9d2
adds expired days in constant
2017-04-04 10:16:54 +02:00
zmagod
99c116f257
first run
2017-04-04 09:19:43 +02:00
mlorb
317739af1e
Merge pull request #530 from biosistemika/ml_sci_1044
...
Add data-hook and yadcf-filter plug-in [SCI-1044]
2017-03-31 14:00:23 +02:00
Mojca Lorber
6a4faf8765
add color constants
2017-03-31 13:24:08 +02:00
okriuchykhin
d39940efea
Merge pull request #526 from okriuchykhin/ok_SCI_1096
...
Add docker files for running in production mode [SCI-1096]
2017-03-30 10:40:50 +02:00
zmagod
0096f9dc14
refactor
2017-03-29 09:32:23 +02:00
Oleksii Kriuchykhin
a7be37ef67
Add docker files for running in production mode [SCI-1096]
2017-03-27 14:36:20 +02:00
zmagod
0996c14449
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765
2017-03-27 10:41:58 +02:00
zmagod
2235fd3fb7
adds view if download expires
2017-03-27 10:38:28 +02:00
mlorb
3beb179f87
Merge pull request #514 from biosistemika/ml_sci_1089
...
Add error messages to sample group/type edit/delete actions [SCI-1089]
2017-03-27 09:57:32 +02:00
zmagod
4635a3320d
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-24 16:09:28 +01:00
zmagod
f380e08ab0
fixed hound
2017-03-24 12:42:50 +01:00
zmagod
023b3213e8
fixes email link [fixes SCI-765]
2017-03-24 12:10:07 +01:00
zmagod
94732c6d18
adds delayed zip generator
2017-03-23 15:45:02 +01:00
Luka Murn
541998bde6
Bump version to 1.9.0
2017-03-23 14:37:47 +01:00
zmagod
4385c68f5f
adds zip_export utility first run
2017-03-21 16:15:11 +01:00
Oleksii Kriuchykhin
8a8720fcfe
Add missing translation for protocol load [SCI-1125]
2017-03-21 15:07:59 +01:00
Mojca Lorber
83fa8570d7
refactoring
2017-03-17 17:52:15 +01:00
Oleksii Kriuchykhin
d17eb2b3f7
Add missing translations for samples assign/unassign activities [SCI-1114]
2017-03-17 14:15:50 +01:00
zmagod
856a4611c6
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-14 15:58:08 +01:00
zmagod
0c2523beca
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-03-10 16:21:43 +01:00
zmagod
1d42d46c02
fixes bug with step comments
2017-03-09 16:02:52 +01:00
zmagod
3057965940
fix bug with filenames
2017-03-09 11:48:50 +01:00
zmagod
9939d8df06
refactor
2017-03-09 10:51:54 +01:00
Luka Murn
1026700b40
Merge pull request #509 from biosistemika/lm-sci-1052-fix
...
Allow upload of .dot, .pot, .rtf files [SCI-1052]
2017-03-09 10:47:19 +01:00
zmagod
49f91184da
fixes locals
2017-03-09 09:55:15 +01:00
zmagod
5c2e9a4b04
adds extends and fixes report methods
2017-03-08 14:14:03 +01:00
Luka Murn
0916e7e40d
Allow upload of .dot, .pot, .rtf files
...
Closes SCI-1052.
2017-03-06 15:01:32 +01:00
Luka Murn
473487faec
Add HTML <head><title> to edit, view file pages
...
Closes SCI-1049.
2017-03-06 13:55:07 +01:00
zmagod
e1b3dcc2ba
adds enum extends to report element part of SCI-1003
2017-02-27 13:53:46 +01:00
Luka Murn
634336e1a4
Merge pull request #499 from biosistemika/lm-test-deface
...
Add Deface checking of environmental variables
2017-02-27 13:17:46 +01:00
Luka Murn
8e09e86a0e
Change Deface config so it defaults to 'true'
2017-02-27 12:54:51 +01:00
Luka Murn
de8034c5b9
Update environment settings
2017-02-27 09:40:01 +01:00
Luka Murn
fecfc9e41d
Merge pull request #498 from biosistemika/release-1.8.1
...
Release 1.8.1
2017-02-23 14:57:30 +01:00
Luka Murn
98e2a56670
Bump version to 1.8.1
2017-02-23 14:00:46 +01:00
Luka Murn
cb12bfddc0
Merge pull request #497 from biosistemika/release-1.8.0
...
Version bump to 1.8.0
2017-02-23 11:36:24 +01:00
Luka Murn
52ab6d096f
Version bump to 1.8.0
2017-02-23 11:15:26 +01:00
Luka Murn
0a271843a4
Also (temporarily) add this to development.rb
2017-02-23 10:39:34 +01:00
Luka Murn
5a35ab9677
Test Deface change
2017-02-23 09:46:04 +01:00
okriuchykhin
75792cde14
Merge pull request #492 from okriuchykhin/ok_SCI_759
...
Add more extensive explanation when project name is already taken [SCI-759]
2017-02-22 16:25:16 +01:00
Oleksii Kriuchykhin
95953e9269
Fix tutorial step 26 wording [SCI-734]
2017-02-22 14:46:38 +01:00
Oleksii Kriuchykhin
35b0b33ddf
Add more extensive explanation when project name is already taken [SCI-759]
2017-02-22 14:18:48 +01:00
Mojca Lorber
0fd41e8a6d
remove changes on user has no teams view
2017-02-21 15:12:58 +01:00
Mojca Lorber
90864a45a0
fix user has no teams view
2017-02-21 13:08:06 +01:00
okriuchykhin
8e18ff44a6
Merge pull request #479 from okriuchykhin/ok_SCI_999
...
Add task complete/uncomplete functionality [SCI-999]
2017-02-20 15:19:00 +01:00
Luka Murn
d097f0dd15
Merge pull request #477 from Ducz0r/lm-sci-928
...
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
2017-02-13 16:42:57 +01:00
Oleksii Kriuchykhin
f97c20e9b5
Fix hound warnings [SCI-999]
2017-02-13 15:42:28 +01:00
Oleksii Kriuchykhin
cf8566df33
Add task complete/uncomplete functionality [SCI-999]
2017-02-10 14:27:20 +01:00
Luka Murn
3eb4faa44b
Fix task restore action
...
Closes SCI-991.
2017-02-10 14:08:56 +01:00
Luka Murn
280b7a0e75
Minor fix
2017-02-09 15:10:45 +01:00
Luka Murn
f7bd62547e
Refactor teams settings into its own controllers
2017-02-09 14:37:59 +01:00
Luka Murn
7bee3a4ea0
Move user profile to settings
2017-02-09 11:34:52 +01:00
Luka Murn
5cb3eb5e09
Refactor preferences -> move them to subcontroller, subroute
2017-02-09 11:07:16 +01:00
okriuchykhin
c2a69982aa
Merge pull request #471 from okriuchykhin/ok_SCI_936
...
Adds datatable to all teams page [SCI-936]
2017-02-07 10:33:33 +01:00
Oleksii Kriuchykhin
62535a01bd
Move teams datatable js code into separate file [SCI-936]
2017-02-03 10:44:42 +01:00
Oleksii Kriuchykhin
db90c5d63b
Add datatable to all teams page [SCI-936]
2017-02-02 09:53:59 +01:00
Mojca Lorber
d3e0eca44e
redesign individual team page
2017-02-01 14:44:47 +01:00
Zmago Devetak
5c9954bb89
Merge pull request #450 from ZmagoD/zd_SCI_939
...
Refactor "organizations" to "teams"
2017-02-01 13:12:02 +01:00
okriuchykhin
067b9452a4
Merge pull request #464 from okriuchykhin/ok_SCI_935
...
Add config option to enable/disable users registration [SCI-935]
2017-02-01 09:36:36 +01:00
Luka Murn
ec799520d4
Forgot to add en.yml
2017-01-31 16:05:13 +01:00
Luka Murn
50b8588cbf
Version bump to 1.7.2
2017-01-31 15:49:58 +01:00
Luka Murn
db75231617
Update URLs to sciNote support pages
...
Closes SCI-978.
2017-01-31 15:48:56 +01:00
Oleksii Kriuchykhin
b35e7e70ba
Enable user registration by default [SCI-935]
2017-01-31 11:10:46 +01:00
Oleksii Kriuchykhin
d1e69438de
Add config option to enable/disable users registration [SCI-935]
2017-01-30 15:04:02 +01:00
zmagod
e59b2e039a
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939
2017-01-27 11:15:31 +01:00
Luka Murn
b2d2f56bdd
Version bump to 1.7.1
2017-01-26 17:00:54 +01:00
Luka Murn
042a85af45
Bump version to 1.7.0
2017-01-25 18:22:11 +01:00
Mojca Lorber
d669f006b1
fix tables in reports
2017-01-25 15:15:26 +01:00
zmagod
1220466035
fixing hound
2017-01-25 15:00:14 +01:00
zmagod
f04a2f663a
renamed organizations in config/
2017-01-25 12:30:11 +01:00
Luka Murn
53699193a2
Merge branch 'smart-annotations'
...
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
2017-01-24 14:33:23 +01:00
zmagod
6e7fa21dd3
adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]
2017-01-24 10:51:12 +01:00
Zmago Devetak
7bd368e002
Merge pull request #431 from ZmagoD/zd_add_code_highlight
...
Fixes code highlight and smart annotations experiments bug
2017-01-20 12:59:21 +01:00
zmagod
9550c6dd35
fixes highlight.js
2017-01-19 17:09:25 +01:00
Mojca Lorber
6653f0d4c1
small fixes
2017-01-19 16:42:14 +01:00
Oleksii Kriuchykhin
890c5e3c3d
Add “no results found” message in smart annotation [SCI-886]
2017-01-19 13:42:58 +01:00
Mojca Lorber
dde9854bf1
update protocol import/export and clone
2017-01-18 14:22:19 +01:00
Mojca Lorber
3b92ab9f36
add names to tables from protocol steps in reports
2017-01-18 14:22:19 +01:00
Mojca Lorber
b3c423c582
add table name in protocol step
2017-01-18 14:22:18 +01:00
Luka Murn
cf72da5635
Merge branch 'improved-files-handling' into 'master'
...
Conflicts:
app/assets/javascripts/protocols/steps.js.erb
app/helpers/assets_helper.rb
db/schema.rb
2017-01-18 11:29:40 +01:00
okriuchykhin
02bfd19d1c
Merge pull request #385 from okriuchykhin/ok_SCI_102
...
Fix XSS on activites and throghout the rest of app [SCI-102]
2017-01-16 11:41:38 +01:00
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
Matej Zrimšek
93a8e0bdae
Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848]
2017-01-12 14:08:29 +01:00
Oleksii Kriuchykhin
0546716a0b
Improve user input sanitization, fix bugs [SCI-102]
2017-01-11 15:50:11 +01:00
zmagod
a4aa933151
refactor smart annotation parser helper
2017-01-11 10:34:14 +01:00
zmagod
fc76a4ae6d
Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834
2017-01-10 14:22:04 +01:00
zmagod
6efcf49927
working version of dropdown filter
2017-01-10 14:14:21 +01:00
zmagod
53d20df449
added xregexp
2017-01-10 14:14:21 +01:00
zmagod
94262b56ef
prepare data for atwho
2017-01-10 14:14:21 +01:00