scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 15:05:26 +08:00
Code Issues Projects Releases Packages Wiki Activity
4304 commits 43 branches 185 tags 169 MiB
Commit graph

3432 commits

Author SHA1 Message Date
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
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
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
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
Alex Kriuchykhin
422baaf64a
Merge pull request #1258 from okriuchykhin/ok_SCI_2619 
Add team deletion service [SCI-2619]
 2018-08-17 10:56:11 +02:00
Zanz2
dfcaa40f1a
Merge branch 'master' into zz_refactor_icons_sci_2445_v2 2018-08-14 13:33:43 +02:00
Zanz2
45a4c1c598 changed the icons as per last comment in jira issue 2018-08-14 13:26:48 +02:00
Oleksii Kriuchykhin
ca6fc84ae2 Remove duplicated task outputs deletion [SCI-2619] 2018-08-10 16:43:40 +02:00
Zanz2
27e0d27862
Merge pull request #1248 from Zanz2/zz_checklist_duplicates_bug_sci_1621 
Fixes duplicate checkbox entries in activity log [SCI-1621]
 2018-08-09 11:50:34 +02:00
Alex Kriuchykhin
6004f8411b
Merge pull request #1260 from okriuchykhin/ok_SCI_2611 
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
 2018-08-08 16:59:42 +02:00
mlorb
a6dd577b4e fix time zone selector 2018-08-08 11:43:18 +02:00
Oleksii Kriuchykhin
298b866df4 Fix failing tests [SCI-2611][SCI-2612] 2018-08-07 14:58:02 +02:00
mlorb
f52ccfd606 fix editing of inventory items of hidden columns 2018-08-07 11:47:26 +02:00
okriuchykhin
29f0f2afeb
Merge pull request #1257 from okriuchykhin/ok_SCI_2609 
Refactor tasks tree API endpoint [SCI-2609]
 2018-08-02 17:10:55 +02:00
okriuchykhin
bb5d029c30
Merge pull request #1251 from okriuchykhin/ok_SCI_2253 
Upgrade to Turbolinks 5 [SCI-2253]
 2018-08-02 14:43:19 +02:00
Oleksii Kriuchykhin
8f5d30ad1f Fix load protocol modal [SCI-2253] 2018-08-02 14:35:19 +02:00
okriuchykhin
3503eb775b
Merge pull request #1254 from okriuchykhin/ok_SCI_2601 
Fix files search results display [SCI-2601]
 2018-08-02 11:53:02 +02:00
okriuchykhin
dd9090efef
Merge pull request #1253 from okriuchykhin/ok_SCI_2608 
Adds API authentication with Azure AD [SCI-2608]
 2018-08-02 11:28:18 +02:00
Oleksii Kriuchykhin
38c36ab798 Fix modals handling with Turbolinks [SCI-2253] 2018-08-02 11:25:14 +02:00
okriuchykhin
6c49ecfd4c
Merge pull request #1250 from okriuchykhin/team_migration_fix 
Fix team import service
 2018-08-01 15:01:43 +02:00
okriuchykhin
53c287224b
Merge pull request #1247 from ZmagoD/zd_SCI_2489 
move FirstTimeDataGenerator helper from applictaion controller [SCI-2489]
 2018-07-31 14:33:51 +02:00
Oleksii Kriuchykhin
1c3f1a1a6c Fix fontawesome package paths [SCI-2253] 2018-07-31 13:52:21 +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
5c999300b5 Fix avatar upload validators [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
812a3dcf7d Fix user profile edit form [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
10b86a9d05 Add data hook to settings/team page [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
Oleksii Kriuchykhin
bc1cd39229 Add team deletion service [SCI-2619] 2018-07-27 13:34:13 +02:00
Oleksii Kriuchykhin
563005cf89 Fix files search results display [SCI-2601] 2018-07-26 09:55:18 +02:00
Oleksii Kriuchykhin
0e372af729 Adds API authentication with Azure AD [SCI-2608] 2018-07-24 14:21:33 +02:00
Oleksii Kriuchykhin
3e7fc6720c Fix team import service 2018-07-20 16:10:45 +02:00
Zanz2
c6ef14290a Fixes too many events getting bound to a onclick event, by removing them before attaching the event listener again 2018-07-17 11:41:42 +02:00
Zanz2
887ddbfce3
Merge pull request #1229 from Zanz2/unify_match_case_sci1324 
Fix protocol names are case insensitive unique [SCI-1324]
 2018-07-17 08:22:03 +02:00
Luka Murn
f67b8d05c7
Merge pull request #1225 from okriuchykhin/ok_SCI_2534 
Fix rendering permissions of inventory annotations [SCI-2534]
 2018-07-13 15:18:59 +02:00
Luka Murn
f23cc36803
Merge pull request #1224 from ZmagoD/zd_SCI_2429 
fixes setting sidebar teams link[fixes SCI-2429]
 2018-07-13 14:55:24 +02:00
Luka Murn
de29ab1b11
Merge pull request #1234 from ZmagoD/zd_SCI_2581 
adds missing js in experiment canvas view [fixes SCI-2581]
 2018-07-13 14:54:59 +02:00
Luka Murn
752fb8dcd8
Merge pull request #1238 from ZmagoD/zd_SCI_2511 
fixes smart annotation serch queries/dropdown item picker [fixes SCI-…
 2018-07-13 14:54:42 +02:00
Luka Murn
13aab686b1
Merge pull request #1242 from ZmagoD/zd_SCI_2492 
adds the ability to scroll to the active element in the navigation si…
 2018-07-13 14:54:30 +02:00
Luka Murn
9b2f00cd5d
Merge pull request #1245 from ZmagoD/zd_SCI_2600 
sanitizes the report name on repors index page [fixes SCI-2600]
 2018-07-13 14:54:18 +02:00
zmagod
29e0ecbc89 move FirstTimeDataGenerator helper from applictaion controller 2018-07-11 11:19:39 +02:00
Zmago Devetak
5a1615825d
removes unneeded comment 2018-07-11 09:29:10 +02:00
zmagod
8fe1977ca8 adds skip_user_status parameter to popover_for_user_name function in order to keep the functionality more extendable [fixes SCI-1334] 2018-07-10 15:34:07 +02:00
zmagod
a7e47faa61 sanitizes the report name on repors index page [fixes SCI-2600] 2018-07-10 10:58:39 +02:00
zmagod
1491c61d51 trim long file names [fixes SCI-2593] 2018-07-09 17:00:47 +02:00
zmagod
62d4796741 adds the ability to scroll to the active element in the navigation sidebar on page load [fixes SCI-2492] 2018-07-09 15:40:52 +02:00
Zmago Devetak
a6a395e394
Merge pull request #1240 from ZmagoD/zd_SCI_2593 
fixes css for new repository item field field [fixes SCI-2593]
 2018-07-09 13:15:15 +02:00
zmagod
10d20a6555 fixes datatable header on add new item action 2018-07-09 13:12:48 +02:00
zmagod
6585eaa338 fixes hound 2018-07-09 12:55:25 +02:00
zmagod
14254fbde3 fixes per @mlorb 's request 2018-07-09 12:54:02 +02:00
zmagod
dd00de928c fixes css for new repository item field field [fixes SCI-2593] 2018-07-09 10:33:19 +02:00
Oleksii Kriuchykhin
3aceb12f03 Fix delete button in inventories [SCI-2594] 2018-07-08 21:59:02 +02:00
zmagod
e654725d9e fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511] 2018-07-06 14:26:20 +02:00
Zmago Devetak
00ed339520
Merge pull request #1233 from ZmagoD/zd_SCI_2589 
fixes bug with xslx files with numeric values [fixes SCI-2589]
 2018-07-06 11:08:27 +02:00
Zmago Devetak
db90736c62
Merge pull request #1237 from ZmagoD/zd_SCI_2512 
fixes list item height on columns management page [fixes SCI-2512]
 2018-07-06 10:47:29 +02:00
Zmago Devetak
6b4d5c1562
Merge pull request #1236 from ZmagoD/zd_SCI_2592 
fixes file name label in repository file field [fixes SCI-2592]
 2018-07-06 10:47:13 +02:00
Luka Murn
95b832800f
Merge pull request #1228 from okriuchykhin/ok_SCI_2585 
Fix inventory cell copy with file attached [SCI-2585]
 2018-07-06 10:45:44 +02:00
zmagod
f1833b9bc1 fixes list item height on columns management page [fixes SCI-2512] 2018-07-06 09:28:03 +02:00
zmagod
a55d0b9c85 fixes file name label in repository file field [fixes SCI-2592] 2018-07-05 16:59:59 +02:00
Oleksii Kriuchykhin
a169639b3c Fix uploaded file max size validation in JS [SCI-2590] 2018-07-05 15:23:26 +02:00
zmagod
185657c626 adds missing js in experiment canvas view [fixes SCI-2581] 2018-07-05 14:36:54 +02:00
zmagod
c0d276ebee fixes bug with xslx files with numeric values [fixes SCI-2589] 2018-07-05 14:08:03 +02:00
zmagod
fdedfec7d3 fixes bug with bootstrap-select 2018-07-04 17:38:16 +02:00
Zmago Devetak
eb61f728b4
Merge pull request #1227 from ZmagoD/zd_SCI_2546 
Refactor inline row editing in repository
 2018-07-04 15:28:08 +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
zmagod
3eef4f87bf fixes hound alerts 2018-07-03 16:18:44 +02:00
zmagod
8b86891177 fixes file destroy button [fixes SCI-2546] 2018-07-03 15:25:37 +02:00
zmagod
28bac14667 first working version of the edit form object 2018-07-03 12:57:39 +02:00
zmagod
c93e00b8c2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_2546 2018-07-03 09:13:54 +02:00
Zanz2
8e42dba7de Found the fix 2018-07-03 08:20:56 +02:00
ZmagoD
1e66d25578 refactor list item dropdown 2018-07-02 17:05:52 +02:00
Oleksii Kriuchykhin
42ce72170c Fix inventory cell copy with file attached [SCI-2585] 2018-07-02 12:58:49 +02:00
ZmagoD
23de3abd61 Fixes repository items edit action, adds additional event listener for file upload 2018-06-29 16:59:26 +02:00
nbernot
7aacc2b4a2 extract repository_item html form creation in to a separate 'class' 2018-06-29 14:28:06 +02:00
zmagod
0dbd2dc877 fixes typo 2018-06-29 10:29:39 +02:00