scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-10 17:39:38 +08:00
Code Issues Projects Releases Packages Wiki Activity
4479 commits 40 branches 184 tags 168 MiB
Commit graph

4479 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luka Murn
5e797c5dae
Remove double 'kaminari' Gem inclusion in Gemfile 2018-09-28 10:47:33 +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
Zanz2
1e12de90f5
Merge pull request #1231 from Zanz2/tables_sum_error_sci2587 
Tables sum error (tables now use big.js for +-/* calculations) [SCI-2587]
 2018-09-26 13:03:01 +02:00
Zanz2
1a512698e8
Merge pull request #1286 from Zanz2/zz_search_page_update_bug_sci2684_v2 
( better solution ) Search page results from different teams than active not switching active team on click [SCI-2684]
 2018-09-26 12:04:09 +02:00
Zanz2
89e9cb86e2 fixed according to pull request review 2018-09-26 12:01:36 +02:00
Alex Kriuchykhin
112343e65d
Merge pull request #1311 from okriuchykhin/ok_SCI_2738 
Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]
 2018-09-25 11:49:19 +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
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
Luka Murn
2396149c57
Merge pull request #1273 from Zanz2/zz_tooltip_settings_enable_sci2663 
Added toggle checkbox for tooltips help in prefferences [SCI-2663]
 2018-09-24 16:23:28 +02:00
Zanz2
87d2b0db14 fixed accordign to pr review 2018-09-24 15:57:31 +02:00
Luka Murn
00c714be07
Merge pull request #1299 from Ducz0r/lm-fix-rubocop 
Update rubocop to 0.59.0, fix the config to be compliant
 2018-09-24 10:27:19 +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
Zanz2
b536aa6f3e
Merge pull request #1287 from Zanz2/zz_dropdown_blue_sci2672 
Fixed blue block in dropdown, now its a full line [SCI-2672]
 2018-09-23 11:27:00 +02:00
Jure Grabnar
64a6ed7ffe Format according to houndbot 2018-09-23 11:14:59 +02:00
Oleksii Kriuchykhin
7f7ece2be0 Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738] 2018-09-21 17:46:18 +02:00
Oleksii Kriuchykhin
84428b37c2 Add project view JSON endpoints [SCI-2728] 2018-09-21 10:39:20 +02:00
Luka Murn
5d6881bae1
Merge pull request #1309 from biosistemika/release-1.14.5 
Merge release-1.14.5 into master
 2018-09-20 08:53:51 +02:00
Luka Murn
32e068f298
Merge pull request #1307 from biosistemika/release-1.14.4 
Merge release-1.14.4 into release-1.14.5
 2018-09-19 15:29:57 +02:00
Luka Murn
90caad3c85
Update VERSION to 1.14.5 2018-09-19 14:37:43 +02:00
Alex Kriuchykhin
adf31581f1
Merge pull request #1306 from okriuchykhin/ok_SCI_2739 
Improve search speed on files and inventories [SCI-2739]
 2018-09-18 15:16:36 +02:00
Oleksii Kriuchykhin
872a48082a Remove Samples from search controller [SCI-2739] 2018-09-18 15:03:19 +02:00
Alex Kriuchykhin
105d34f2ae
Merge pull request #1305 from okriuchykhin/ok_SCI_2739 
Improve search speed on files and inventories [SCI-2739]
 2018-09-18 10:25:08 +02:00
Oleksii Kriuchykhin
4ee9eb3134 Improve search speed on files and inventories [SCI-2739] 2018-09-17 17:06:47 +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
Zanz2
5b955da74c makes tooltip behaviour more reliable and less erratic 2018-09-16 21:34:36 +02:00
Jure Grabnar
06eaafd118 Suffix should append to basename first and then extension 2018-09-16 20:57:37 +02:00
Jure Grabnar
449aa12070 Refactor TeamZipExport code (move it into special file) 2018-09-16 20:28:26 +02:00
Zanz2
07757e382a fixed hound 2018-09-14 13:43:31 +02:00
Zanz2
22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
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
0a2be5072a Update rubocop to 0.59.0, fix the config to be compliant 2018-09-12 17:17:55 +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
Zanz2
2a50c3d736 Merge branch 'zz_in_app_tooltips_help_sci2662' of https://github.com/Zanz2/scinote-web into zz_in_app_tooltips_help_sci2662 2018-09-07 15:35:49 +02:00