scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-29 19:36:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
5126 commits 69 branches 179 tags 165 MiB
Commit graph

468 commits

Author SHA1 Message Date
mlorb 7bda68b9f4
Merge pull request #1146 from mlorb/ml-sci-2336-v3 
Add locales [SCI-2336]
 2018-05-17 13:29:47 +02:00
zmagod b125863baf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 11:25:33 +02:00
mlorb 933a98c1f6 fix smart anotation color 2018-05-17 11:01:15 +02:00
okriuchykhin e9d6b26ec6
Merge pull request #1141 from okriuchykhin/ok_SCI_2403 
Add clear file selector button to repository edit [SCI-2403]
 2018-05-16 14:55:53 +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
zmagod 98baa77846 fixes cursor icon 2018-05-16 12:02:46 +02:00
Oleksii Kriuchykhin c8094f196c Add margin to clear button and fix case with new file in the cell [SCI-2403] 2018-05-16 11:25:43 +02:00
zmagod 7e3dbcd92f hound 2018-05-16 10:43:25 +02:00
zmagod 712a3c7ff6 fixes css, changes spinner in preview modal 2018-05-16 10:40:49 +02:00
Oleksii Kriuchykhin be5d481cdc Add clear file selector button to repository edit [SCI-2403] 2018-05-16 10:32:50 +02:00
zmagod 4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +02:00
mlorb cea7f5a3f7 some extra style unification 2018-05-15 17:10:31 +02:00
mlorb 5f462165b5 change font and alerts colors 2018-05-15 14:16:34 +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 38869ec037 adds title on disabled download file link 2018-05-10 09:47:10 +02:00
mlorb 13f9ec30b8 fix hound 2018-05-09 13:56:32 +02:00
mlorb 7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
Zmago Devetak ee307886df
Merge pull request #1124 from ZmagoD/zd_SCI_2347 
fix the missing icons on task card [fixes SCI-2347]
 2018-05-04 09:34:49 +02:00
zmagod 0177dc811b fixes per @mojca 's request 2018-05-03 16:21:29 +02:00
zmagod abbc0995f2 fix css 2018-05-03 14:51:49 +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
zmagod f04677600b fix the missing icons on task card [fixes SCI-2347] 2018-05-03 10:05:40 +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
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 c2d19fee52 fixes images preview in repository/library [fixes SCI-2321] 2018-04-24 13:11:55 +02:00
zmagod e96b690a5b removes reports link from secondary navigation, fix bug with turbolinks 2018-04-20 11:57:52 +02:00
mlorb 3249d5db0d
Merge pull request #1100 from mlorb/ml-sci-2303 
Update reports show page to work with new navigation [SCI-2303]
 2018-04-20 09:50:35 +02:00
Zmago Devetak 487fb1fb48
Merge pull request #1106 from ZmagoD/zd_SCI_2239_v2 
Zd sci 2239 v2
 2018-04-19 18:00:19 +02:00
mlorb 72c79013de fix file preview background 2018-04-19 17:40:24 +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
zmagod a948710576 fixes alert label [fixes SCI-2239] 2018-04-19 15:51:36 +02:00
mlorb 8753df7ce3
Merge pull request #1103 from mlorb/ml-sci-2309 
Fix top navigation style [SCI-2309]
 2018-04-19 15:16:27 +02:00
mlorb c1832969b4 fix top navigation style 2018-04-19 13:26:10 +02:00
mlorb 4f0c2a8122 fix screen responsiveness 2018-04-18 17:06:47 +02:00
mlorb cc34376253 update reports show page to work with new navigation 2018-04-18 14:40:53 +02:00
mlorb c08d72be36 remove breadcrumbs throughout application 2018-04-17 17:00:04 +02:00
mlorb 04a20ab7ec change links 2018-04-16 17:05:22 +02:00
zmagod a2d8285f35 fixes archive button but [fixes SCI-2300] 2018-04-16 09:22:10 +02:00
Luka Murn 09c60d2468 Fixes per @Ducz0r's request 2018-04-12 14:38:22 +02:00
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +02:00
Zmago Devetak bdb6554870
Merge pull request #1049 from ZmagoD/zd_SCI_2218_2219 
adds manage columns page
 2018-04-06 17:06:28 +02:00
zmagod cf7761daaa Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223 2018-04-06 12:56:39 +02:00
zmagod c0cc6c293a fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279] 2018-04-05 13:15:32 +02:00
zmagod a8a19df06d Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-04-05 08:51:58 +02:00
Oleksii Kriuchykhin 9720063fb3 Fix tests [SCI-2217] 2018-04-05 00:06:11 +02:00
zmagod 525a1c15ca fixes hound 2018-04-04 16:40:07 +02:00
zmagod 0c05c60ebf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-04-04 16:06:38 +02:00
Oleksii Kriuchykhin 3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
zmagod 5eb007f4d2 fixes per @mlorb 's request 2018-04-04 13:22:14 +02:00
zmagod 38b84edfb0 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-04-04 12:59:41 +02:00
mlorb 11c0f5e5a1
Merge pull request #1067 from mlorb/ml-sci-2243 
Style Guide - refactor colors, typography and buttons [SCI-2243]
 2018-04-03 11:30:02 +02:00
Oleksii Kriuchykhin 51860652c1 Refactor smart annotations modal [SCI-2223] 2018-04-02 20:38:56 +02:00
mlorb 6a20c37449 fix travis againnnnn 2018-03-30 17:16:18 +02:00
mlorb 5f0d33d75e fix travis again 2018-03-30 16:47:23 +02:00
Oleksii Kriuchykhin cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
mlorb 10b5e1de84 refactor typography 2018-03-30 09:54:57 +02:00
zmagod 56b0900619 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-03-29 16:42:10 +02:00
mlorb 4bf9369bc5 refactor buttons 2018-03-29 13:58:14 +02:00
mlorb 22afa61b11 refactor colors 2018-03-28 13:54:01 +02:00
Oleksii Kriuchykhin fac5875cfd Add repository name to record info modal [SCI-2205] 2018-03-26 16:18:09 +02:00
zmagod 8f09e1f7a4 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 13:08:31 +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
zmagod 3efe06a410 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 12:02:24 +02: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
zmagod 3be3c00574 adds manage columns page [fixes SCI-2218] 2018-03-22 09:35:36 +01:00
zmagod 81df97f008 add library sidebar and create new library button [fixes SCI-2121] 2018-03-21 09:22:55 +01:00
mlorb 35afc06cbd
Merge pull request #1038 from mlorb/ml-sci-2118 
Code left-side menu bar [SCI-2118]
 2018-03-20 14:40:55 +01:00
Zmago Devetak 75d7ace8c7
Merge pull request #1017 from ZmagoD/zd_SCI_2068 
Write server-side endpoints for custom repositories [SCI-2068]
 2018-03-20 14:30:47 +01:00
mlorb 9cf9bf94c0 fix merge conflict 2018-03-20 14:30:07 +01:00
mlorb 884eef9d07 Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118 2018-03-20 14:25:59 +01:00
mlorb e0926ddc3c code refactoring 2018-03-20 13:53:11 +01:00
Oleksii Kriuchykhin acbd40e0d1 Remove Power Up button [SCI-2117] 2018-03-18 22:12:29 +01:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
Oleksii Kriuchykhin 37f675b32a Use larger LinkedIn sign-in button [SCI-2201] 2018-03-18 12:18:33 +01:00
zmagod a9dfcd9681 refactor 2018-03-16 16:38:59 +01:00
zmagod 311b2dac5a Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2142 2018-03-16 16:21:47 +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
zmagod 1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
zmagod d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00
mlorb 9de998e85c code left-side menu bar 2018-03-14 14:33:34 +01:00
zmagod a6a25bbe08 add floating alert message 2018-03-13 16:33:48 +01:00
zmagod 51af74071c remove comments and activity modal 2018-03-13 10:52:53 +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
Zanz2 1fc8b2a2b2 quick fix un-needed styling 2017-12-10 01:45:47 +01:00
Zanz2 d0a9198408 Fixed the styling 2017-12-10 01:20:08 +01:00
mlorb cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import 
Protocols io import
 2017-11-13 11:53:28 +01:00
Zanz2 4354363215 rubocop refactor css 2017-11-03 16:46:03 +01:00
Zanz2 ac26b17ddf Rubocop refactor 2017-11-03 16:45:15 +01:00
Oleksii Kriuchykhin 631b41cdaa Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551] 2017-10-19 11:38:23 +02:00
Zanz2 4051c0b06b Deleted old unused files i spotted on github 2017-09-22 13:28:38 +02:00
Zanz2 d85e02730d Addes steps, basic functionality is working, still need to style and fix bugs and upload to database etc 2017-09-15 12:19:58 +02:00
Zanz2 b7432b336a added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller 2017-09-13 15:15:08 +02:00
Žan Žagar 62350d0d42 Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later 2017-09-11 16:03:33 +02:00
Žan Žagar f668f60237 dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni 2017-09-11 15:22:22 +02:00
Oleksii Kriuchykhin fc72453a5b Fix hound warning [SCI-1356] 2017-06-23 16:19:59 +02:00
Oleksii Kriuchykhin e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00
Zmago Devetak cffac82e88 Merge pull request #704 from ZmagoD/zd_SCI_1392 
fixes bug with long text in parse records modal [fixes SCI-1392]
 2017-06-22 17:47:15 +02:00
zmagod a2e1aa5b36 fixes bug with long text in parse records modal [fixes SCI-1392] 2017-06-22 14:43:01 +02:00
Mojca Lorber 1ba32e19cb allign no. of pages and showing entries per page 2017-06-22 14:23:03 +02:00
mlorb 14429a270c Merge pull request #689 from mlorb/ml_sci_1354 
Truncate and display text in tooltip in custom repository fields [SCI-1354]
 2017-06-19 15:50:38 +02:00
mlorb 122ac7971f Merge pull request #692 from mlorb/ml_sci_1348 
Fix cog position on repositories page [SCI-1348]
 2017-06-19 15:16:01 +02:00
Mojca Lorber f77b1aa4e8 retain the same word case in repositories dropdown 2017-06-19 10:32:12 +02:00
Mojca Lorber b6f146f177 fix cog position on repositories page 2017-06-16 11:54:31 +02:00
Mojca Lorber a195c9a5af truncate and display text in tooltip in custom repository fields 2017-06-15 15:08:33 +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 33b996ffee refactor 2017-06-09 09:49:57 +02:00
Luka Murn 0aee11d6d8 Hound is love, Hound is life #2 2017-06-07 18:26:32 +02:00
Luka Murn b5f6d1da94 Allow custom repositories to be added to reports 2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin 8b1190060e Add custom repository table [SCI-1274] 2017-06-07 15:23:25 +02:00
zmagod 1c021b11db adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +02:00
Luka Murn fcc3995049 Merge pull request #647 from biosistemika/master 
Bring latest master changes into custom-repositories
 2017-05-30 14:18:14 +02:00
Oleksii Kriuchykhin e99e3edb7b Add repositories dropdown to task navigation [SCI-1273] 2017-05-18 14:21:00 +02:00
Matej Zrimšek 20265ddd69 Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487] 2017-05-17 18:18:57 +02:00
Matej Zrimšek ba693c65a8 Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek b97cb91840 Refactoring of modal for adding content to report. [fixes SCI-487] 2017-05-15 17:43:12 +02:00
Matej Zrimšek 27cfd55ea5 Simplified popup modal for adding contents to report. [fixes SCI-487] 2017-05-15 17:43:12 +02:00
Oleksii Kriuchykhin 620a989a2f Improve view of badges on experiment canvas [SCI-152] 2017-05-09 14:07:23 +02:00
okriuchykhin bd0b930382 Merge pull request #598 from okriuchykhin/ok_SCI_152 
Add counters for users and comments on canvas [SCI-152]
 2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin 344b9c290a Add counters for users and comments on canvas [SCI-152] 2017-05-08 17:32:55 +02:00
Oleksii Kriuchykhin 3f60439948 Change color of loading animation in reports [SCI-1029] 2017-05-08 11:02:51 +02:00
Oleksii Kriuchykhin d3fb688fce Change color of turbolinks progress bar [SCI-1029] 2017-04-26 15:04:29 +02:00
Matej Zrimšek 57b6b9402d Experiment description is inside of box for every supported browser. [fixes SCI-860] 2017-04-18 16:44:01 +02:00
okriuchykhin 3d805d529d Merge pull request #554 from okriuchykhin/ok_SCI_877 
Add image preview to protocol repository [SCI-877]
 2017-04-18 08:58:39 +02:00
Zmago Devetak cb1ad9e0be Merge pull request #555 from ZmagoD/zd_SCI_1103 
adds additional explanations [fixes SCI-1103]
 2017-04-13 15:15:08 +02:00
zmagod 0987cf8abc fixes hound alerts 2017-04-13 14:55:18 +02:00
zmagod f104444a0c adds additional explanations [fixes SCI-1103] 2017-04-12 16:56:47 +02:00
Oleksii Kriuchykhin 181d981a51 Add image preview to protocol repository [SCI-877] 2017-04-12 16:05:38 +02:00
Mojca Lorber b09c18a9bc fix overlaping text in audit trail table 2017-04-11 14:29:31 +02:00
Mojca Lorber b222a34a97 fix hound 2017-04-04 15:38:16 +02:00
Mojca Lorber 715fafe58c fix bug with constants 2017-04-03 17:07:58 +02:00
mlorb 317739af1e Merge pull request #530 from biosistemika/ml_sci_1044 
Add data-hook and yadcf-filter plug-in [SCI-1044]
 2017-03-31 14:00:23 +02:00
Mojca Lorber a2c1ed6994 fix constants 2017-03-31 13:53:18 +02:00
zmagod 023b3213e8 fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +01:00
Luka Murn 4ddb139911 Fix padding of state buttons 
Closes SCI-1073.
 2017-03-03 16:36:52 +01:00
okriuchykhin 986ad051a1 Merge pull request #496 from okriuchykhin/ok_SCI_873 
Improve image scaling in image preview [SCI-873]
 2017-02-23 09:30:56 +01:00
Oleksii Kriuchykhin cb588ed378 Improve image scaling in image preview [SCI-873] 2017-02-22 16:55:57 +01:00
Oleksii Kriuchykhin a326fa374f Lower z-index value for notification count icon [SCI-739] 2017-02-22 14:35:07 +01:00
Mojca Lorber 6b30f097f0 fix visual bug in edit avatar mode 2017-02-21 14:02:42 +01:00
Oleksii Kriuchykhin cf8566df33 Add task complete/uncomplete functionality [SCI-999] 2017-02-10 14:27:20 +01:00
Oleksii Kriuchykhin db90c5d63b Add datatable to all teams page [SCI-936] 2017-02-02 09:53:59 +01:00
zmagod 8c035a1981 renames organization in assets 2017-01-25 12:12:27 +01:00