Commit graph

4373 commits

Author SHA1 Message Date
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
d0112bebb5 Merge branch 'features/export-all' into ok_SCI_2730 2018-09-27 13:29:18 +02:00
Alex Kriuchykhin
da55060f20
Merge pull request #1312 from okriuchykhin/ok_SCI_2729
Implement Projects view - navigation bar (tabs) [SCI-2729]
2018-09-27 13:28:13 +02:00
Oleksii Kriuchykhin
2508394924 Refactor Projects view - cards view [SCI-2730] 2018-09-27 10:43:44 +02:00
Oleksii Kriuchykhin
f8388d4bcd Merge branch 'ok_SCI_2729' into ok_SCI_2730 2018-09-25 10:26:46 +02:00
Oleksii Kriuchykhin
80e73bfb97 Implement Projects view - navigation bar (tabs) [SCI-2729] 2018-09-24 16:25:04 +02:00
Jure Grabnar
872a1211bb Format according to Houndbot #3 2018-09-23 18:58:56 +02:00
Jure Grabnar
d6f7ec2604 Format according to houndbot #2 2018-09-23 18:53:43 +02:00
Jure Grabnar
869967361c Fix according to Houndbot 2018-09-23 18:48:44 +02:00
Jure Grabnar
7877d559a3 Update email/notification, type: deliver
Closes [SCI-2643], [SCI-2644].
2018-09-23 18:45:13 +02:00
Jure Grabnar
59169f882d Add permission check for every project 2018-09-23 14:34:21 +02:00
Jure Grabnar
6106904460 Format according to Houndbot #5 2018-09-23 12:07:53 +02:00
Jure Grabnar
90b220ddda Format according to Houndbot #4 2018-09-23 12:06:06 +02:00
Jure Grabnar
970341e7d7 Format according to Houndbot #3 2018-09-23 11:56:23 +02:00
Jure Grabnar
a3d7d37081 Format according to Hound bot #2 2018-09-23 11:30:20 +02:00
Jure Grabnar
64a6ed7ffe Format according to houndbot 2018-09-23 11:14:59 +02:00
Oleksii Kriuchykhin
84428b37c2 Add project view JSON endpoints [SCI-2728] 2018-09-21 10:39:20 +02:00
Jure Grabnar
d783c34d33 Clean some minor artefacts 2018-09-16 23:52:36 +02:00
Jure Grabnar
d40096f663 Remove typo and add hyperlink to inventories 2018-09-16 23:45:38 +02:00
Jure Grabnar
f8b1db7f72 Fix repository export and relative hyperlinks 2018-09-16 23:01:44 +02:00
Jure Grabnar
06eaafd118 Suffix should append to basename first and then extension 2018-09-16 20:57:37 +02:00
Jure Grabnar
449aa12070 Refactor TeamZipExport code (move it into special file) 2018-09-16 20:28:26 +02:00
Luka Murn
f9d771d01a
Add minor comment 2018-09-13 14:50:00 +02:00
Luka Murn
0ddc3e0968
Merge pull request #1303 from biosistemika/release-1.14.4
Merge release-1.14.4 into master
2018-09-13 14:47:17 +02:00
Zanz2
a9c0201fcc
Merge pull request #1277 from Zanz2/zz_export_items_unselectable_sci2629
Fixed disabled export button after new inventory item save [SCI-2629]
2018-09-13 11:35:07 +02:00
Luka Murn
99c156de94 Fix (hopefully) the TinyMCE files from being cached
Closes SCI-2717.
2018-09-12 15:28:21 +02:00
Zanz2
7cb50145a0
Merge pull request #1275 from Zanz2/zz_adding_removing_table_sci2621
Fixed table add and remove crash [SCI-2621]
2018-09-11 09:37:07 +02:00
Zanz2
0efaf827b8
Merge pull request #1285 from Zanz2/zz_refactor_icons_sci_2445_v2
Replaced image icon with paperclip on scinote [SCI-2712]
2018-09-11 09:36:47 +02:00
Luka Murn
fcf947e29b
Update VERSION to 1.14.4 2018-08-29 11:02:44 +02:00
Jure Grabnar
93bd461a83 Generate table.csv 2018-08-29 00:31:11 +02:00
Jure Grabnar
01d48cf679 Add suffixes to all names 2018-08-29 00:21:17 +02:00
Jure Grabnar
4b0357b392 Add export of Inventories and their assets 2018-08-28 23:22:55 +02:00
Zanz2
15c124f3fd replaced image icon with paperclip, to represent files, removed all image icons 2018-08-27 13:07:18 +02:00
Luka Murn
50f6bd24e1
Merge pull request #1283 from Ducz0r/lm-sci-2707-fix
Fix bootstrap-select to work with turbolinks 5.x [SCI-2707]
2018-08-24 17:24:35 +02:00
Luka Murn
b71c5d14c6 Fix bootstrap-select to work with turbolinks 5.x
This was causing invite users modal, among other things, to not
function correctly after visiting another redirect within SciNote
using Turbolinks 5.x.

Closes SCI-2707.
2018-08-24 17:11:59 +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
Alex Kriuchykhin
10a650c3c5
Merge pull request #1281 from okriuchykhin/ok_SCI_2686
Make API V1 togglable [SCI-2686]
2018-08-24 14:22:29 +02:00
Oleksii Kriuchykhin
0322316d74 Make API V1 togglable [SCI-2686] 2018-08-24 12:11:28 +02:00
Alex Kriuchykhin
151d1cf44d
Merge pull request #1270 from okriuchykhin/ok_SCI_2651
Refactor invite users modal initialization [SCI-2651]
2018-08-23 14:34:42 +02:00
Alex Kriuchykhin
0ca9972905
Merge pull request #1271 from okriuchykhin/ok_SCI_2628
Fix error on activities page when user doesn't have any [SCI-2628]
2018-08-22 14:21:18 +02:00
Alex Kriuchykhin
75a48291e1
Merge pull request #1272 from okriuchykhin/ok_SCI_2654
Fix report elements sorting [SCI-2654]
2018-08-22 14:20:54 +02:00
Jure Grabnar
295c6a9432 Add export all functionality (basic skeleton) 2018-08-21 21:07:45 +02:00
Luka Murn
92eab25a07
Merge pull request #1261 from mlorb/ml-sci-2634
fix editing of inventory items of hidden columns [SCI-2634]
2018-08-21 16:59:37 +02:00
Luka Murn
92a4a54ae7 Slighty change the parameter parsing of removed file cells 2018-08-21 16:46:47 +02:00
Zanz2
6e4730619f Fixed the bug, disabled class in dropdown menu when there was no need 2018-08-21 14:29:34 +02:00
Zanz2
d8fb47ff4d
Merge pull request #1267 from Zanz2/zz_refactor_icons_sci_2445_v2
Changed some icons to fontawesome [SCI-2445]
2018-08-21 13:33:12 +02:00
Zanz2
ab3b15e13e Found the bug and fixed it 2018-08-21 13:26:16 +02:00
Zanz2
0ed62b7375 refactored according to PR review 2018-08-21 11:35:22 +02:00
Oleksii Kriuchykhin
62d99a4372 Fix report elements sorting [SCI-2654] 2018-08-20 14:46:23 +02:00
Oleksii Kriuchykhin
3a5238f6f3 Fix error on activities page when user doesn't have any [SCI-2628] 2018-08-20 14:26:42 +02:00