scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-22 07:56:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
5874 commits 70 branches 179 tags 165 MiB
Commit graph

601 commits

Author SHA1 Message Date
Mojca Lorber 089ec64398 fix experiment card look on Matejs request 2019-01-28 16:59:40 +01:00
Urban Rotnik 16e9a56874 Add recaptcha to invitation modal 
SCI-2935
 2019-01-25 11:27:01 +01:00
mlorb a297ef2094
Merge pull request #1443 from mlorb/ml-sci-2914 
Allow org. administrators to invite them onto all projects [SCI-2914]
 2019-01-24 16:24:57 +01:00
mlorb d2108ac3ea fix hound 2019-01-18 16:16:00 +01:00
mlorb 7fdef4d3ec Change experiment cards look and feel 2019-01-18 15:57:44 +01:00
Oleksii Kriuchykhin ec28db6f4f Fix image URLs in export all document [SCI-2931] 2019-01-10 14:19:40 +01:00
mlorb 06b1e5cf20 Allow org. administrators to invite them onto all projects 2019-01-08 16:30:52 +01:00
Oleksii Kriuchykhin 97bde075b2 Change color of the selected element in the side navigation [SCI-2909] 2018-12-13 16:50:22 +01:00
Luka Murn 022d0d9512
Merge pull request #1419 from Ducz0r/lm-sci-2902-fix 
Change export all to use HTML instead of PDF [SCI-2902]
 2018-12-13 15:19:37 +01:00
Luka Murn 65adc7a556 Fix 2 minor visual bugs in reports 2018-12-12 11:15:32 +01:00
mlorb 4040b31143 Fix behavior when user has no teams 2018-12-10 15:42:05 +01:00
Alex Kriuchykhin 51ba74cbab
Merge pull request #1403 from okriuchykhin/ok_SCI_2757 
Enable caching for navigation sidebar [SCI-2757]
 2018-12-10 14:11:05 +01:00
mlorb 3031fb7a4b
Merge pull request #1398 from mlorb/ml-sci-2786 
Fix projects table css [SCI-2786]
 2018-12-06 09:15:51 +01:00
mlorb c7f5c17e7e change css again 2018-12-04 11:21:54 +01:00
Oleksii Kriuchykhin 60a19734b2 Enable caching for navigation sidebar [SCI-2757] 2018-11-29 11:28:36 +01:00
Luka Murn 8b1449b5a2 Add bottom margin to OAuth authorize page, for better mobile xp 2018-11-28 21:46:33 +01:00
mlorb 15ddd0ab91 fix projects table css 2018-11-27 12:37:10 +01:00
Oleksii Kriuchykhin 79544e789d Fix support menu for Safari [SCI-2885] 2018-11-26 18:47:21 +01:00
Alex Kriuchykhin 95e19e1229
Merge pull request #1381 from okriuchykhin/ok_SCI_2859 
Refactor & restyle the API authorization screen [SCI-2859]
 2018-11-22 13:06:13 +01:00
Oleksii Kriuchykhin 59fb971394 Change text color on project cards tabs [SCI-2872] 2018-11-20 17:31:27 +01:00
Oleksii Kriuchykhin d98f11abdc Refactor & restyle the API authorization screen [SCI-2859] 2018-11-20 17:02:45 +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
Luka Murn 42793d25b7 Add bottom padding to sign in/up/forgot password pages 
Closes SCI-2764.
 2018-10-24 13:57:58 +02:00
Matej Zrimšek 1575da6edb Make filenames and folder names in export all PDF compatible with filesystems (improved function should be used from another PR) [SCI-2641] 2018-10-12 07:40:22 +02:00
Matej Zrimšek c0dc4f6951 Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek 0ebce8e283 Add relative links (not working) to files and tables into the PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Oleksii Kriuchykhin ba58eec2e2 Merge latest features/export-all [SCI-2731] 2018-10-03 11:04:44 +02:00
Oleksii Kriuchykhin 53874c4680 Fix Hound config and CSS code styling [SCI-2730] 2018-10-03 10:39:22 +02:00
Oleksii Kriuchykhin 7d995189bd Fixies after code review [SCI-2730] 2018-10-02 14:24:44 +02:00
Luka Murn d71be76657 Fix minor styling & text on settings - preferences page 2018-10-02 13:59:19 +02:00
Oleksii Kriuchykhin 492a5de19e Add Projects view - list/table view [SCI-2731] 2018-10-01 15:39:42 +02:00
Oleksii Kriuchykhin 2508394924 Refactor Projects view - cards view [SCI-2730] 2018-09-27 10:43:44 +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
Zanz2 87d2b0db14 fixed accordign to pr review 2018-09-24 15:57:31 +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
Zanz2 db610f146f fixed hound 2018-08-29 11:41:07 +02:00
Zanz2 c84ff3d9fe Small oversight fix 2018-08-29 11:37:07 +02:00
Zanz2 ed5a5e7390 Fixed blue block in dropdown, now its a full line 2018-08-29 11:33:20 +02:00
Oleksii Kriuchykhin 6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +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
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
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
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
zmagod c9dd8b356a fixes locale, fixes custom file upload style 2018-07-04 13:43:45 +02:00
zmagod 8b86891177 fixes file destroy button [fixes SCI-2546] 2018-07-03 15:25:37 +02:00
zmagod 1a15ac7acf fixes setting sidebar teams link[fixes SCI-2429] 2018-06-26 13:09:56 +02:00
zmagod 4b81c2c4db fixes tagsinput text-area on long input [fixes SCI-2566] 2018-06-26 09:52:07 +02:00
mlorb 0792ce46af fix firefox bug with browse buttons position 2018-06-19 13:39:03 +02:00
Zmago Devetak 2eb6613c6a
Merge pull request #1206 from ZmagoD/zd_SCI_2442 
make manage columns page more responsive [fixes SCI-2442]
 2018-06-13 11:14:35 +02:00
Zmago Devetak 50c1a712d8
Merge pull request #1204 from ZmagoD/zd_SCI_2434 
fixes bug with repository items dropdown [fixes SCI-2434]
 2018-06-13 08:42:13 +02:00
Luka Murn 9a4fdd166e Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix 
Conflicts:
	app/views/projects/index.html.erb
 2018-06-12 17:44:42 +02:00
zmagod 1cff4a5060 make manage columns page more responsive [fixes SCI-2442] 2018-06-12 10:22:48 +02:00
zmagod 256e502982 fixes bug with repository items dropdown [fixes SCI-2434] 2018-06-11 14:57:27 +02:00
Luka Murn bfaedab4b4 Fix buttons style on tags modal 
Closes SCI-2397.
 2018-06-08 13:43:23 +02:00
Luka Murn dbceac7aa4 Style inventories secondary navigation section 2018-06-08 08:31:22 +02:00
Luka Murn 4cdfe67115 Fix protocol management filter display (css) 2018-06-07 15:57:59 +02:00
Luka Murn b324a2dab3 Restyle activities page 2018-06-07 09:29:47 +02:00
Luka Murn 4ba07fb082
Merge pull request #1186 from Ducz0r/lm-sci-2477-fix 
Move sign-in flow layout to core [SCI-2477]
 2018-06-01 15:08:44 +02:00
mlorb 0a8bfdb860 Reposition the arrow for opening/closing of Navigation 2018-06-01 13:18:49 +02:00
Luka Murn 20ffa57583 Move sign-in flow layout to core 
Closes SCI-2477.
 2018-06-01 09:11:48 +02:00
mlorb 858b95d851 fix align bullet with a file name 2018-05-30 13:58:16 +02:00
okriuchykhin 2e79af3412
Merge pull request #1174 from okriuchykhin/ok_SCI_2458 
Fix left menu word breaking [SCI-2458]
 2018-05-28 13:06:26 +02:00
Luka Murn e611e76fae Fix Hound errors 2018-05-28 11:53:49 +02:00
Oleksii Kriuchykhin f0362a0c02 Fix left menu word breaking [SCI-2458] 2018-05-28 10:42:07 +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
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 c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
mlorb e3fc0237c1
Merge pull request #1153 from mlorb/ml-sci-2440 
Final button colour changes [SCI-2440]
 2018-05-21 16:29:04 +02:00
okriuchykhin 6dbb5bc583
Merge pull request #1152 from okriuchykhin/ok_SCI_2403 
Change remove file button appearence [SCI-2403]
 2018-05-18 17:34:56 +02:00
mlorb 0fccc71fc3 fix load protocol wording and UI-style 2018-05-18 16:57:18 +02:00
mlorb 81392362ac Final button colour changes 2018-05-18 16:24:24 +02:00
Oleksii Kriuchykhin b79b0b79cf Change remove file button appearence [SCI-2403] 2018-05-18 14:51:45 +02:00
mlorb 876717e355 add pointer cursor to arrow 2018-05-18 13:34:52 +02:00
mlorb 64cbddb9a0 UI/UX restyle - update colours for navigation 2018-05-18 10:41:32 +02:00
zmagod cf4c33bf92 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 15:22:43 +02:00
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