scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 23:21:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
13954 commits 31 branches 181 tags 166 MiB
Commit graph

669 commits

Author SHA1 Message Date
Alex Kriuchykhin
b530cea771
Merge pull request #1438 from okriuchykhin/ok_SCI_2776 
Add counters to task inventories dropdown [SCI-2776]
 2019-01-11 16:27:22 +01:00
Oleksii Kriuchykhin
132f46b136 Improve error handling in task inventories dropdown [SCI-2776] 2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin
534866467b Add counters to task inventories dropdown [SCI-2776] 2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin
2769add4d9 Disable edit button for unsupported WOPI formats [SCI-2904] 2018-12-31 18:10:12 +01:00
mlorb
4040b31143 Fix behavior when user has no teams 2018-12-10 15:42:05 +01:00
Oleksii Kriuchykhin
d2b1fd8ef2 Remove unneeded check [SCI-2757] 2018-12-03 13:03:22 +01:00
Oleksii Kriuchykhin
60a19734b2 Enable caching for navigation sidebar [SCI-2757] 2018-11-29 11:28:36 +01:00
mlorb
8bf1056bf5 fix teams switch not working at navigating from task 2018-11-21 10:12:21 +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
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
Zanz2
cfe5801856 Disabled turbolinks in left navigation bar protocols button, i think it fixes the issue 2018-10-06 12:56:13 +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
492a5de19e Add Projects view - list/table view [SCI-2731] 2018-10-01 15:39:42 +02:00
Oleksii Kriuchykhin
80e73bfb97 Implement Projects view - navigation bar (tabs) [SCI-2729] 2018-09-24 16:25:04 +02:00
Zanz2
22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662 2018-08-21 11:27:01 +02:00
Zanz2
1159a32ce2 Implemented all except 2 tooltips, debbugging why they dont work now 2018-08-20 13:03:30 +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
Zanz2
e1cadfc75e saving work, removed testing buttons 2018-08-17 11:52:10 +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
a09834db6a testing, made new popover designs 2018-08-16 16:10:19 +02:00
Zanz2
d2373980d4 Testing out new popover 2018-08-16 15:07:59 +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
Zmago Devetak
6cab1746cd
Merge pull request #1202 from ZmagoD/zd_SCI_2392 
prevents asset preview modal to close on click [fixes SCI-2392]
 2018-06-13 08:41:41 +02:00
zmagod
32a09f9780 prevents asset preview modal to close on click [fixes SCI-2392] 2018-06-11 13:03:11 +02:00
Luka Murn
eb29c50379 Fix asset link preview, fix inventory item modal window styling 2018-06-08 09:01:59 +02:00
Luka Murn
dbceac7aa4 Style inventories secondary navigation section 2018-06-08 08:31:22 +02:00
okriuchykhin
5ba60d9f8f
Merge pull request #1188 from okriuchykhin/ok_SCI_2478 
Improve sidebar rendering performance [SCI-2478]
 2018-06-01 15:17:34 +02:00
Oleksii Kriuchykhin
58d8414f92 Code fixes for sidebar [SCI-2478] 2018-06-01 15:05:12 +02:00
Oleksii Kriuchykhin
2ddc0fb561 Improve sidebar rendering performance [SCI-2478] 2018-06-01 13:49:02 +02:00
mlorb
0a8bfdb860 Reposition the arrow for opening/closing of Navigation 2018-06-01 13:18:49 +02:00
Luka Murn
e611e76fae Fix Hound errors 2018-05-28 11:53:49 +02:00
Luka Murn
b3ae1d8fa6 Remove some dead code, make sidebar toggle animated 2018-05-27 16:24:47 +02:00
Luka Murn
8b527d8a5b Restyle left side menu bar so it also works with lower heights 2018-05-27 15:24:49 +02:00
Luka Murn
fe3ddb7c65 Update code so it works 2018-05-25 08:50:27 +02:00
Luka Murn
c9f3de9f27 Improve toggle 2018-05-24 13:39:04 +02:00
mlorb
3368e3b963
Merge branch 'ux-release-1' into ml-sci-2271 2018-05-23 14:06:54 +02:00
mlorb
79f1a1c0ad fix padding and change label colors 2018-05-23 11:13:28 +02:00
mlorb
7b5ec4ae3f move the open/close arrow to the bottom of left menu 2018-05-23 09:44:46 +02:00
mlorb
c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
mlorb
64cbddb9a0 UI/UX restyle - update colours for navigation 2018-05-18 10:41:32 +02:00
Zmago Devetak
c3d247faae
Merge pull request #1128 from ZmagoD/zd_SCI_2331 
adds deface hook in support dropdown [fixes SCI-2331]
 2018-05-18 09:31:02 +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
dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +02:00
mlorb
f01cfc2968 fix hound 2018-05-14 12:08:45 +02:00
mlorb
ed27a7a62a some extra restyling/unifying off app 2018-05-11 18:02:17 +02:00
zmagod
e5c3fb6af2 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-05-10 10:38:56 +02:00
zmagod
4bc01c44e9 add file name to loading image 2018-05-10 10:37:48 +02:00
mlorb
7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
zmagod
ed6098ece6 adds deface hook in support dropdown [fixes SCI-2331] 2018-05-07 13:09:33 +02:00
zmagod
60e5aa8716 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2142_v2 2018-05-03 14:49:06 +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
zmagod
66b676b5ce Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-04-26 17:04:36 +02:00
zmagod
0afe461962 fixes download link 2018-04-26 17:00:51 +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
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
zmagod
4d6e995481 add dismiss buttons back 2018-04-25 10:43:16 +02:00
zmagod
c026044322 fixes flash message [fixes SCI-2142] 2018-04-25 07:32:49 +02:00
zmagod
503ad1ba20 removes samples from views [fixes SCI-2304] 2018-04-24 08:26:55 +02:00
Zmago Devetak
096167c125
Merge pull request #1101 from ZmagoD/zd_SCI_2124 
adds new reports index page [fixes SCI-2124]
 2018-04-23 12:42:24 +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
zmagod
2a5c4daa9d fix file preview [SCI-2313] 2018-04-20 09:29:08 +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
mlorb
c149b3cc2a refactoring 2018-04-19 15:12:26 +02:00
mlorb
56e00740c1 fix blocked buttons edit and eye icon 2018-04-19 14:40:46 +02:00
zmagod
9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
mlorb
c08d72be36 remove breadcrumbs throughout application 2018-04-17 17:00:04 +02:00
mlorb
600ec99c82 fix project navigation to work with archived pages and correct current team 2018-04-17 13:52:43 +02:00
zmagod
b4deb232c0 rename variable: not_in_repository => display_image_tag 2018-04-12 13:40:17 +02:00
zmagod
233e73c709 adds asset preview link to repository row modal and to table row item [fixes SCI-2110] 2018-04-10 17:06:53 +02:00
Oleksii Kriuchykhin
3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin
f656ad1561 Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
Oleksii Kriuchykhin
cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
zmagod
7c1390ece2 implement sidebar toggle [fixes SCI-2232] 2018-03-28 14:12:11 +02:00
Oleksii Kriuchykhin
31aed55ffc Disable turbolinks on tasks navigation [SCI-2251] 2018-03-26 17:55:51 +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
mlorb
0092be08cc refactor links 2018-03-26 12:11:59 +02:00
mlorb
1797afa718
Merge branch 'ux-release-1' into ml-sci-2238 2018-03-26 10:44:43 +02:00
Oleksii Kriuchykhin
aa69624f9f Fix sample assign permissions [SCI-2249] 2018-03-25 20:10:32 +02:00
mlorb
83741358d1 fix locales 2018-03-23 16:19:06 +01:00
mlorb
eee597b315 fix naming 2018-03-23 15:56:38 +01:00
mlorb
2e81359ebb re-implement About sciNote modal 2018-03-23 15:14:49 +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
mlorb
884eef9d07 Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118 2018-03-20 14:25:59 +01:00
Oleksii Kriuchykhin
acbd40e0d1 Remove Power Up button [SCI-2117] 2018-03-18 22:12:29 +01:00
zmagod
86a8afd907 refactor 2018-03-16 15:56:12 +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
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
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
Matej Zrimšek
5bda53eebf Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
Matej Zrimšek
6b1fee4d30 Added/joined repository record assignment to task with sample assignmment to task. 2018-02-14 14:39:10 +01:00
Matej Zrimšek
f21c794a95 Fixed permission error when accessing samples page. 2018-02-14 14:39:09 +01:00
Matej Zrimšek
8ef6c8f91f Refactored remaining experiment level permissions (and everything below it). 2018-02-14 14:39:07 +01:00
Matej Zrimšek
7938c2e036 Minor code style changes. 2018-02-14 14:19:22 +01:00
Matej Zrimšek
854333b0e6 Grouped permissions for experiment with canaid gem (WIP). 2018-02-14 14:19:00 +01:00
Matej Zrimšek
13e9a2a132 Corrected some project level permissions; minor refactoring. 2018-02-14 13:16:32 +01:00
Matej Zrimšek
321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
zmagod
695e9d90d2 fixes user dropdown [fixes SCI-2033] 2018-02-07 08:43:42 +01:00
zmagod
25dcfe66ae Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960 2018-02-01 16:04:05 +01:00
zmagod
366b67ca1c fixes per @mojca 's request 2018-01-31 15:18:18 +01:00
zmagod
b1684dbd5b removed unneeded hook 2018-01-31 14:40:19 +01:00
zmagod
34f5076b04 fixes failin specs [fixes SCI-2001] 2018-01-31 12:05:45 +01:00
zmagod
029d69b033 revert to old setting [fixes SCI-1967] 2018-01-29 15:42:22 +01:00
zmagod
76b08e6ac9 add permissions in views 2018-01-24 13:59:57 +01:00
okriuchykhin
8394055fba
Merge pull request #938 from okriuchykhin/ok_SCI_1875_v2 
Remove Addons caption if no addons in info modal and fix linter packages
 2018-01-17 15:33:43 +01:00
Oleksii Kriuchykhin
b59815c611 Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875] 2018-01-16 11:11:50 +01:00
Oleksii Kriuchykhin
79e1eaf145 Fix export samples button [SCI-1936] 2018-01-15 13:54:08 +01:00
mlorb
99185871c4 fix naming things 2018-01-05 15:15:50 +01:00
mlorb
0c519b8f03 refactor manage sample elements permissions again because of addons 2018-01-03 16:37:02 +01:00
mlorb
0774b6f7e6 refactor manage samples permissions again, so that addons permissions can be added 2017-12-20 16:05:05 +01:00
mlorb
740ecc674b refactor view repositories permission 2017-12-14 14:18:18 +01:00
mlorb
3ca51f097f refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions 2017-12-14 14:18:17 +01:00
mlorb
72023c7dfe refactor update/delete sample permissions 2017-12-14 14:18:17 +01:00
mlorb
f801ed8eb6 refactor view/export samples permission 2017-12-14 14:18:16 +01:00
mlorb
ccc2451494 refactor create sample permissions 2017-12-14 14:18:15 +01:00
mlorb
a0b2d3f5ef refactor read_team permission 2017-12-14 14:18:14 +01:00
zmagod
f71ff8589d changes testing image 2017-10-11 09:51:20 +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
zmagod
a2b7bcda4c refactor repositories js files [fixes SCI-1485] 2017-07-17 15:05:28 +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
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
okriuchykhin
2e24e6b73a Merge pull request #725 from okriuchykhin/ok_SCI_1409 
Fix datatables [SCI-1409]
 2017-07-03 15:47:19 +02:00
Oleksii Kriuchykhin
b234c07c13 Fix datatables [SCI-1409] 2017-07-03 15:33:50 +02:00
Mojca Lorber
a3514bdaf0 fix restore action from archives pages 2017-06-29 16:14:25 +02:00
Matej Zrimšek
4dbf5b0f53 Fixed sample types page load error, when viewing them on a task level. [SCI-1419] 2017-06-27 16:28:25 +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
0160956377 put all titles on links 2017-06-27 14:21:06 +02:00
Mojca Lorber
6bfb5e125c add tooltips to navigation bar 2017-06-27 13:46:49 +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
Matej Zrimšek
d49524a26f Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378] 2017-06-20 16:10:50 +02:00
Mojca Lorber
4c3036af87 fix ordering of repositoris on task 2017-06-19 10:53:18 +02:00
Oleksii Kriuchykhin
2d693a3fb7 Fix repository view permissions for team guests [SCI-1345] 2017-06-13 10:33:08 +02:00
Zmago Devetak
19adddbfdb Merge pull request #666 from ZmagoD/zd_SCI_1337 
truncate long repository names [fixes SCI-1337]
 2017-06-13 09:32:43 +02:00
Mojca Lorber
faa6456e28 change custom repositories icon 2017-06-12 18:00: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
zmagod
ee9eaea47c truncate long repository names [fixes SCI-1337] 2017-06-09 11:20:57 +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
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
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
zmagod
ab4961ddb1 adds overlay partial 2017-06-05 11:31:05 +02:00
zmagod
6e1f93dd11 minor fix 2017-05-29 14:47:05 +02:00
zmagod
b527afd12b generates samples csv file in background job [fixes SCI-1278] 2017-05-29 14:42:55 +02:00
mlorb
872f712be8 Merge branch 'custom-repositories' into ml_sci_1266_v2 2017-05-23 11:05:25 +02:00
Oleksii Kriuchykhin
b223646f07 Small improvements [SCI-1273] 2017-05-23 08:53:53 +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
Matej Zrimšek
a5cffd06f3 Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719] 2017-04-25 16:03:50 +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
zmagod
9610c5f5a0 fix info dropdown links [fixes SCI-1141] 2017-04-07 11:31:09 +02:00
zmagod
f16607579f refactor steps annotation 2017-04-06 13:03:13 +02:00
Oleksii Kriuchykhin
391c5af267 Fix secondary navigation on Mac [SCI-1133] 2017-03-28 14:36:52 +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
Mojca Lorber
83fa8570d7 refactoring 2017-03-17 17:52:15 +01:00
zmagod
70f17a924e adds hooks in team switch [fixes SCI-1092] 2017-03-17 16:10:22 +01:00
mlorb
01d9f306a5 change div to span 2017-02-21 14:22:28 +01:00
Mojca Lorber
cb2127ee7f add data-hook for E-signature manifestation/display 2017-02-20 18:03:55 +01:00
Luka Murn
7bee3a4ea0 Move user profile to settings 2017-02-09 11:34:52 +01:00
Oleksii Kriuchykhin
031741d122 Disable protocols link if user has no teams [SCI-934] 2017-02-01 14:26:51 +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
Luka Murn
db75231617 Update URLs to sciNote support pages 
Closes SCI-978.
 2017-01-31 15:48:56 +01:00
zmagod
72e13beee3 renamed organizations in views 2017-01-25 12:01:23 +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
Oleksii Kriuchykhin
4c9c9037ed Enable image preview after editing protocol and disable preview modal animation [SCI-868] 2017-01-09 17:19:46 +01:00
Matej Zrimšek
ec7a1cb4c0 Replaced remaining related hard-coded names with constants and generalized delete samples name fetching. Minor refactoring. [SCI-848] 2017-01-06 14:23:20 +01:00
zmagod
efe41817f2 removes sample group/type link in new sample form [fixes SCI-809] 2016-12-19 10:49:21 +01:00
Oleksii Kriuchykhin
0541253ffa Added modal for images preview [SCI-694] 2016-12-16 15:53:16 +01:00
Zmago Devetak
c8631077df Merge pull request #361 from biosistemika/improved-sample-table 
Improved sample table
 2016-12-16 15:37:54 +01:00
zmagod
ba58ac2a77 Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_781_796 2016-12-15 09:26:12 +01:00
zmagod
b07f9fae59 fixes new sample group/type link in sample row [fixes SCI-796] 2016-12-15 09:23:38 +01:00
zmagod
6d2fb3b02c Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790 2016-12-14 17:05:00 +01:00
zmagod
1ff98bb6df adds tooltip to samples dropdown and column names 2016-12-14 13:36:10 +01:00
zmagod
9037ab3f48 fixed navigation link 2016-12-14 10:35:48 +01:00
zmagod
4b0e2baa3f fixes breadcrumbs in secondary nav 2016-12-12 16:03:14 +01:00
zmagod
8dd8a7e7cd Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777 2016-12-12 15:52:25 +01:00
zmagod
5176f8b459 clean unneeded code [fixes SCI-778] refactor js 2016-12-12 15:40:13 +01:00
zmagod
8bb452e4f7 trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775] 2016-12-12 10:30:03 +01:00
Luka Murn
1a8b141b95 Add delete custom field functionality 2016-12-09 13:49:19 +01:00
Luka Murn
da630ac2cb Make edit, delete buttons clickable & hide them if neccesary 2016-12-09 13:18:59 +01:00
Mojca Lorber
0e3526c9ad Merge branch 'mlorb-ml-sci-696' into improved-sample-table 
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
 2016-12-08 15:44:50 +01:00
okriuchykhin
cb2abfa7a9 Merge pull request #325 from okriuchykhin/ok_SCI_712 
Added form for adding new columns to samples table into dropdown [SCI-712]
 2016-12-06 15:00:01 +01:00
Oleksii Kriuchykhin
da7e86c7c2 Fix save/delete buttons after updating datatable and added permissions check [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
f6dd64772a Add columns to samples table without page reload [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
40db8310fd Move code to sample_datatable.js and removed unused modal [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
22dabd2177 Added form for adding new columns to samples table into dropdown [SCI-712] 2016-12-06 13:17:05 +01:00
Oleksii Kriuchykhin
94866e8994 Initial code commit for samples columns dropdown [SCI-712] 2016-12-06 13:16:05 +01:00
Mojca Lorber
849f78b4df implement reordering of columns in the samples table and change from local to database storage 2016-12-05 11:34:36 +01:00
zmagod
83aae59eed adds sample groups index page 2016-12-02 09:33:09 +01:00
Luka Murn
84d0cf4620 Use rails helpers as per @ZmagoD's request 2016-11-30 09:48:57 +01:00
zmagod
a2e13441e5 removes create_sample_type modal and related js actions 2016-11-30 09:02:34 +01:00
zmagod
5c0b2d7b24 init sample_types page 2016-11-29 08:57:12 +01:00
Luka Murn
9f998d6fed Add an environmental variable to toggle version display in navbar 
The variable is called NAVBAR_SHOW_VERSION. If not specified,
it defaults to the current behavior (version is hidden on
production, but visible on development & test environments).
 2016-11-28 10:52:17 +01:00
zmagod
9d91d2ce28 adds new samples columns dropdown [fixes SCI-698] 2016-11-25 17:29:30 +01:00
Matej Zrimšek
c8eb82cc85 Fixed tutorial step numbers and changed getting next page reference on protocols page. 2016-11-17 14:46:04 +01:00
Luka Murn
04749c3b2c Allow inviting of existing, unconfirmed users 
Closes SCI-676.
 2016-11-15 15:04:31 +01:00
Luka Murn
b246853117 Code styling (use link_to, %w) 2016-11-08 16:43:25 +01:00
Luka Murn
9438ba7e10 Fix a bug 2016-11-08 09:00:00 +01:00
Luka Murn
9260ed31f3 Add Deface hooks to main navbar 2016-11-07 16:57:18 +01:00
Luka Murn
a188984ede Allow strings of modal to be replaced 2016-11-07 09:43:10 +01:00
Luka Murn
6fe0d6b3df A working invite modal! 2016-11-07 09:43:10 +01:00
Luka Murn
ccf8932611 Add first version of invite users modal 2016-11-07 09:43:09 +01:00
zmagod
24b81c96f6 sets current_organization_id if no current_organization is available for current_user, hides separator if only one team present [fixes SCI-608] 2016-10-24 21:20:41 +02:00
Luka Murn
b13fd22408 Add back the release notes URL to navbar 
Closes SCI-604
 2016-10-24 16:59:32 +02:00
zmagod
49d3879642 fixes padding on mobile, added separator on team switch dropdown, focus search input 2016-10-21 11:46:59 +02:00
zmagod
c642e208dd styled global team switch and search [fixes SCI-593] 2016-10-21 09:33:18 +02:00
zmagod
f21c9e394f adds new team button to team switch dropdown [fixes SCI-586] 2016-10-20 13:47:41 +02:00
zmagod
8a6899aeea restyled team switch dropdown 2016-10-17 15:21:19 +02:00
zmagod
a116feac9c fixed typos and added truncation to org name 2016-10-17 15:21:19 +02:00
zmagod
8f24d0d80c fixed new user registration 2016-10-17 15:10:26 +02:00
zmagod
d7f514db09 fixes search 2016-10-17 15:10:26 +02:00
zmagod
efe031d766 setup current_organization in all controllers 2016-10-17 15:10:26 +02:00
zmagod
d86a4dd311 setup global team switch view and controller action 2016-10-17 15:10:26 +02:00
Matej Zrimšek
ece89da391 Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
0780bd2416 Ruby constants are now automatically available in JS. Refactoring was needed. 2016-10-17 11:57:37 +02:00
Matej Zrimšek
a3dfb59558 Added remaining constants. 2016-10-17 11:30:05 +02:00
Matej Zrimšek
21ec05d541 Refactored searches (user and globals earch) and used constants. 2016-10-17 11:17:59 +02:00
Luka Murn
5c80c8a817 Add "no notifications" to dropdown & notifications index page 2016-10-05 16:58:21 +02:00
Luka Murn
877574e853 Add link to settings from both notification lists 2016-10-05 16:26:26 +02:00
Oleksii Kriuchykhin
083a09c2f7 Add link to notifications index page 2016-10-05 16:13:05 +02:00
zmagod
5bf278298b fixed navbar on sceens smaller than 1000px 2016-10-05 12:22:27 +02:00
Luka Murn
61cb9651c7 Merge pull request #188 from biosistemika/global-notifications 
Global notifications
 2016-10-04 08:30:50 +02:00
zmagod
e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
Matej Zrimšek
a6324d61c5 Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab. 2016-09-29 14:27:26 +02:00
zmagod
cab1e9b521 start implement toolbar view 2016-09-28 16:03:52 +02:00
Matej Zrimšek
fc86b7b1fd Added help dropdown. [SCI-13] 2016-09-23 12:52:38 +02:00
mlorb
587369e7a6 Merge pull request #152 from mlorb/ml_sci_428 
fixes responsiveness on mobile phone for sample view [SCI-428]
 2016-09-15 12:11:48 +02:00
Mojca Lorber
a9029e0928 fixes responsiveness on mobile phone for sample view 2016-09-14 11:08:40 +02:00
zmagod
65383f1824 fixes sidebar expanded elements when adding new experiments [fixes SCI-342] 2016-09-13 13:09:57 +02:00
zmagod
ac7ac95da8 [fixes SCI-332] 2016-09-01 10:38:20 +02:00
zmagod
e8f971829a added project to session storage 2016-08-31 15:13:17 +02:00
zmagod
b05c3df4d3 adds toggle id only to elements with modules 2016-08-31 10:25:40 +02:00
Mojca Lorber
4a5d720724 change position of overview and samples 2016-08-25 11:19:53 +02:00
jbargu
180efac87b Merge pull request #92 from jbargu/jg_exp_overview_navbar_sci_353 
Show whole tree structure for experiment in sidebar
 2016-08-24 11:50:39 +02:00
Jure Grabnar
e60533af57 Add whole tree structure for experiment 
SCI-353 #close
 2016-08-24 10:47:30 +02:00
Jure Grabnar
a41d851830 Fix secondary navigation for experiment level (overview) 2016-08-24 08:54:02 +02:00
Zmago Devetak
4897e2da0c Merge pull request #68 from ZmagoD/zd_SCI_330 
Zd sci 330
 2016-08-18 08:10:20 +02:00
zmagod
ca0ba1403d set flask icon to experiment [fixes SCI-330] 2016-08-17 14:17:29 +02:00
zmagod
8d69ca0b88 adds active class to experiment name in sidebar [fixes SCI-331] 2016-08-17 11:21:48 +02:00
Zmago Devetak
4bd489d29c Merge pull request #46 from ZmagoD/zd_SCI_303 
update sidebar v2 [fixes SCI-303]
 2016-08-08 08:56:01 +02:00
zmagod
9c5c4f0a3a Merge branch 'zd_SCI_44' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_44 2016-08-05 15:23:01 +02:00
zmagod
45dac782ca update sidebar [fixes SCI-303] 2016-08-03 16:09:45 +02:00
zmagod
caa80642c0 [fixes SCI-304], [fixes SCI-37] 2016-08-03 09:34:10 +02:00
zmagod
9581e2751f fixes samples page for experiment level [fixes SCI-44] 2016-08-02 08:44:07 +02:00
Luka Murn
4d57479cf9 Remove comment 
Closes SCI-38.
 2016-07-29 16:40:42 +02:00
Luka Murn
8a2b54819a More fixes on secondary navigation 2016-07-29 16:20:35 +02:00
Luka Murn
bed8687dbd Remove some unused commented code 2016-07-29 16:08:30 +02:00
Luka Murn
b085aa1db3 Remove uneccesary project_activities HTML pages 2016-07-29 16:06:35 +02:00
Luka Murn
ed2226c14b Refactor sidebar 2016-07-29 15:58:47 +02:00
Luka Murn
34af50a9d0 Fix breadcrumbs & sidebar so it works 2016-07-29 15:47:41 +02:00
Luka Murn
edafcaeed6 Move route module_archive_project -> module_archive_experiment 
Also add some new routes, move some templates.
 2016-07-29 10:25:02 +02:00
Luka Murn
1ad265835b Move route canvas_project -> canvas_experiment 2016-07-29 10:08:28 +02:00
zmagod
352944fc33 added new/edit experiment modals 2016-07-28 14:44:44 +02:00
zmagod
9d23cfd940 fixed experiment routes 2016-07-28 11:30:34 +02:00
zmagod
c11932b45b fixed layout 2016-07-28 11:00:56 +02:00
zmagod
d16c0fe706 fixed edit canvas 2016-07-28 10:09:05 +02:00
zmagod
54c4051906 added canvas under experiments 2016-07-28 09:01:44 +02:00
zmagod
a17106b883 added experiments controller and fixed sidebar 2016-07-27 16:18:26 +02:00
Luka Murn
076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Luka Murn
055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00