Commit graph

1419 commits

Author SHA1 Message Date
Jure Grabnar
c00b08b101 Add sw_package and dataset component for PIO 2018-11-23 19:44:10 +01:00
Jure Grabnar
2c8a7f8eca Add last_modified evaluation for PIO import 2018-11-23 17:51:47 +01:00
Jure Grabnar
87d5e5029a Fix publish_date in PIO import 2018-11-23 17:37:26 +01:00
Jure Grabnar
76c2da4bae Add uniq tables 2018-11-23 16:30:29 +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
Alex Kriuchykhin
324069c071
Merge pull request #1370 from okriuchykhin/ok_SCI_2853
Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]
2018-11-14 13:51:43 +01:00
Oleksii Kriuchykhin
3fd687161f Remove unused variables from activities controller [SCI-2778] 2018-11-14 13:17:38 +01:00
Oleksii Kriuchykhin
537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
Oleksii Kriuchykhin
c44109958a Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853] 2018-11-14 12:56:04 +01:00
Luka Murn
98a39ecd72 Fix visual bug (everything bold) on projects index page
Bug was introduced in projects absent section, there was no
closing </strong> tag.
2018-11-14 11:33:27 +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
98d1ea8542 Improve Export All button behaviour [SCI-2839] 2018-11-12 15:51:03 +01:00
Oleksii Kriuchykhin
e89d60785f Fix dates on activities and experiments [SCI-2778] 2018-11-12 10:26:48 +01:00
Oleksii Kriuchykhin
8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
mlorb
4d156080ac fix empty projects page bug and projects tree bug 2018-11-07 13:45:46 +01:00
mlorb
63e039e235 fix bug with new project button not working 2018-11-06 11:38:31 +01:00
Alex Kriuchykhin
c1d853f7bd
Merge pull request #1344 from okriuchykhin/ok_SCI_2783
Fix issue with project dropdown caching [SCI-2783]
2018-10-29 10:56:02 +01:00
Oleksii Kriuchykhin
641d74829a Fix issue with project dropdown caching [SCI-2783] 2018-10-24 17:52:40 +02:00
Luka Murn
42793d25b7 Add bottom padding to sign in/up/forgot password pages
Closes SCI-2764.
2018-10-24 13:57:58 +02:00
Luka Murn
95340bcf36 Update team name placeholder & sublabel on sign up pages 2018-10-24 13:43:56 +02:00
Matej Zrimšek
c89488e105 Fix displaying projects when all are archived [SCI-2787] 2018-10-24 03:34:13 +02:00
Matej Zrimšek
43fdab561f Fix project archiving and restoring edge case [SCI-2787] 2018-10-24 01:37:57 +02:00
Oleksii Kriuchykhin
02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Jure Grabnar
ed16e8d479 Fix reviewers errors 2018-10-16 11:00:38 +02:00
Jure Grabnar
26df1e5a98 Add export project modal
Closes [SCI-2645]
2018-10-16 11:00:38 +02:00
Matej Zrimšek
48a6a64502 Move PDF generation and export logic of export all PDF to the model 2018-10-14 22:52:54 +02:00
Matej Zrimšek
69f3a919db Some specification and syntax fixes [SCI-2641] 2018-10-12 07:42:17 +02:00
Matej Zrimšek
d970576d60 Switch between generating report PDF and export all PDF [SCI-2641] 2018-10-12 07:40:21 +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
6f77c4772c Minor fix for assets & tables naming in export all PDF 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
Zanz2
4dc1320988
Merge pull request #1326 from Zanz2/zz_pio_upload_button_sci2760
Disabled turbolinks in left navigation bar protocols button [SCI-2760]
2018-10-10 17:14:15 +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
Oleksii Kriuchykhin
7a591273a3 Remove unused variables [SCI-2731] 2018-10-08 13:45:26 +02:00
Zanz2
cfe5801856 Disabled turbolinks in left navigation bar protocols button, i think it fixes the issue 2018-10-06 12:56:13 +02:00
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
ba58eec2e2 Merge latest features/export-all [SCI-2731] 2018-10-03 11:04:44 +02:00
Luka Murn
21a24dc98b Fix invite users modal to display tooltips in all variants
Closes SCI-2759.
2018-10-02 17:55:39 +02:00
Oleksii Kriuchykhin
7d995189bd Fixies after code review [SCI-2730] 2018-10-02 14:24:44 +02:00
Luka Murn
d71be76657 Fix minor styling & text on settings - preferences page 2018-10-02 13:59:19 +02:00
Luka Murn
c079f16d58 Fix the tooltips positioning on canvas 2018-10-02 13:50:26 +02:00
Oleksii Kriuchykhin
492a5de19e Add Projects view - list/table view [SCI-2731] 2018-10-01 15:39:42 +02:00
Jure Grabnar
553ac4c360 Refactor code according to PR review
PR review: https://github.com/biosistemika/scinote-web/pull/1304

Closes: [SCI-2640], [SCI-2642], [SCI-2643], [SCI-2644].
2018-09-30 16:37:18 +02:00
Oleksii Kriuchykhin
2508394924 Refactor Projects view - cards view [SCI-2730] 2018-09-27 10:43:44 +02:00