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

946 commits

Author SHA1 Message Date
zmagod 9abf50e7c5 Limits the max. amount of rows when importing into inventories [fixes SCI-2468] 2018-05-31 10:45:31 +02:00
zmagod 3da098cb60 fixes the issue with extraction of text from file [fixes SCI-2417] 2018-05-31 09:42:57 +02:00
zmagod e0908fb85f adds asset_text_data to global search options 2018-05-30 18:18:09 +02:00
zmagod 89046e9787 fixes items assign flash message [fixes SCI-2395] 2018-05-29 12:54:41 +02:00
Luka Murn 80323eaf67 Merge branch 'lm-improve-sidebar-toggle' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-improve-sidebar-toggle 
Conflicts:
	app/assets/javascripts/sidebar_toggle.js.erb
 2018-05-28 12:39:24 +02:00
mlorb 2bce62cab8
Merge branch 'ux-release-1' into ml-sci-2405 2018-05-28 11:43:14 +02:00
mlorb 58ba596a24
update locales 2018-05-28 09:38:24 +02:00
zmagod bcebc03416 adds missing locales 2018-05-28 09:17:29 +02:00
Luka Murn f8c8887d72 Forgot to remove the constant 2018-05-27 17:23:50 +02:00
Luka Murn b86edf20a5 Remove auto-toggling of navigation sidebar depending on width 2018-05-27 15:44:15 +02:00
mlorb f02363dfce fix error if user is not assigned to any teams 2018-05-25 17:14:22 +02:00
mlorb f972676f8d
Merge pull request #1158 from Ducz0r/lm-sci-2416-fix 
Update software with new logo & new brand [SCI-2416]
 2018-05-23 15:47:17 +02:00
mlorb c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
Luka Murn dac44acf2a Rename sciNote -> SciNote (config/ folder) 2018-05-21 15:11:12 +02:00
mlorb 0fccc71fc3 fix load protocol wording and UI-style 2018-05-18 16:57:18 +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
zmagod e019767e90 refactor save_pdf_to_inventory_item service 2018-05-17 13:17:19 +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
zmagod ca0c8cbb71 fixes typos, fixes pdf rendering 2018-05-17 11:21:34 +02:00
mlorb 06ce285ae2 add locales 2018-05-16 14:32:15 +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 f59ea8c7a6
Merge pull request #1137 from mlorb/ml-sci-2336-v2 
UI/UX restyle - fixes throughout application - part 2 [SCI-2336]
 2018-05-16 11:30:54 +02:00
zmagod 712a3c7ff6 fixes css, changes spinner in preview modal 2018-05-16 10:40:49 +02:00
okriuchykhin ac6c5de83c
Merge pull request #1134 from okriuchykhin/ok_SCI_2301 
Fix initialization of default value for repositories limit [SCI-2301]
 2018-05-16 10:24:56 +02:00
Oleksii Kriuchykhin beacdb934f Change default inventory limit to 6 [SCI-2301] 2018-05-16 10:23:36 +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
Luka Murn 10cd494936
Update WEBINARS_URL 2018-05-15 15:58:35 +02:00
mlorb dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +02:00
Oleksii Kriuchykhin 1e5f9519ca Fix initialization of default value for repositories limit [SCI-2301] 2018-05-11 10:34:32 +02:00
mlorb b5649f0574
Merge branch 'ux-release-1' into ml-sci-2336-v1 2018-05-10 13:59:57 +02:00
okriuchykhin 3b4d9fe744
Merge pull request #1132 from okriuchykhin/ok_SCI_2301 
Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]
 2018-05-10 10:46:25 +02:00
Zmago Devetak 0a4deeaa35
Merge pull request #1112 from ZmagoD/zd_SCI_2261 
propagate assigned repository items in workflow [fixes SCI-2261]
 2018-05-10 09:57:49 +02:00
Oleksii Kriuchykhin 8ec643c54b Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301] 2018-05-09 18:03:16 +02:00
mlorb 7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
Zmago Devetak a6275062b7
Merge pull request #1126 from ZmagoD/zd_SCI_2344 
adds new string truncation method [fixes SCI-2344]
 2018-05-07 16:30:12 +02:00
Zmago Devetak d744f24b85
Merge pull request #1118 from ZmagoD/zd_SCI_2323 
sign_out user after 7 days [fixes SCI-2323]
 2018-05-03 14:36:44 +02:00
zmagod 0b721d86b1 adds new string truncation method [fixes SCI-2344] 2018-05-03 14:24:23 +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
mlorb ca022fead7 rename inventories buttons 2018-05-03 10:39:50 +02:00
zmagod 0584453575 fixes per @okriuchykhin 's request 2018-04-26 17:18:03 +02:00
mlorb f97477f3f0 some extra button styling 2018-04-26 15:19:05 +02:00
mlorb 763d934aa7 fix buttons again 2018-04-26 15:02:24 +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
zmagod 8dac887f10 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261 2018-04-26 14:18:41 +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
Luka Murn cd04596c62
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix 
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
 2018-04-25 12:37:27 +02:00
Luka Murn bd6f97fabc Add initializer to include helpers in all assets (including .js) 2018-04-25 10:51:19 +02:00
zmagod 503ad1ba20 removes samples from views [fixes SCI-2304] 2018-04-24 08:26:55 +02:00
zmagod 824962c084 propagate assigned repository items in workflow [fixes SCI-2261] 2018-04-23 11:33:16 +02:00
Luka Murn 68caf56ec2 Add comment to constants 2018-04-20 12:31:22 +02:00
Luka Murn 21e7e7057e Refactor all the methods into two new services 2018-04-20 12:31:22 +02:00
Luka Murn 5e2622ecfc Change default repository state to Ruby representation 
Also remove some dead code from repositories datatables
 2018-04-20 12:31:22 +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
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 93fc1af12d
Merge pull request #1083 from ZmagoD/zd_SCI_2259 
set limit on maximum number of dropdown list items [fixes SCI-2259]
 2018-04-19 17:17:54 +02:00
Zmago Devetak 1290435372
Merge pull request #1086 from ZmagoD/zd_SCI_2207 
enables copying of repository items [fixes SCI-2207]
 2018-04-19 17:13:43 +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
Zmago Devetak 540dff25e7
Merge pull request #1091 from ZmagoD/zd_SCI_2254 
adds correct preview images to files [fixes SCI-2254]
 2018-04-19 14:04:24 +02:00
zmagod ce52eb851b add validation to dropdown items 2018-04-19 14:02:42 +02:00
zmagod 66cc76f640 add view label in locales 2018-04-19 12:49:32 +02:00
zmagod 9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
mlorb cc34376253 update reports show page to work with new navigation 2018-04-18 14:40:53 +02:00
Luka Murn 2290b75f8a
Merge pull request #1097 from biosistemika/lm-fix-production-compiling 
Change JS compressor from :uglifier to Uglifier.new(harmony: true)
 2018-04-17 17:46:01 +02:00
mlorb c08d72be36 remove breadcrumbs throughout application 2018-04-17 17:00:04 +02:00
Luka Murn a633861e1f Change JS compressor from :uglifier to Uglifier.new(harmony: true) 
This should fix the command rails assets:precompile for production
environment.
 2018-04-17 09:05:19 +02:00
mlorb 04a20ab7ec change links 2018-04-16 17:05:22 +02:00
zmagod bef166ff30 hides the create new inventory button for non admin users [fixes SCI-2296] 2018-04-13 13:39:58 +02:00
Zmago Devetak d466fdf8e8
Merge pull request #1089 from ZmagoD/zd_SCI_2292 
remove unneeded label in destroy repository record modal [fixes SCI-2…
 2018-04-12 16:58:28 +02:00
Zmago Devetak 09e5579f0f
Merge pull request #1087 from ZmagoD/zd_SCI_2240 
rename Repository/Library => Inventory [fixes SCI-2240]
 2018-04-12 16:58:08 +02:00
Zmago Devetak 9d58292dcf
fix 2018-04-12 16:44:38 +02:00
Zmago Devetak f83390e5ad
fix 2018-04-12 16:20:05 +02:00
zmagod d084998906 remove unneeded label in destroy repository record modal [fixes SCI-2292] 2018-04-12 15:00:41 +02:00
Luka Murn 09c60d2468 Fixes per @Ducz0r's request 2018-04-12 14:38:22 +02:00
zmagod 309bd04e61 rename Repository/Library => Inventory [fixes SCI-2240] 2018-04-12 14:11:26 +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
zmagod 6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +02:00
zmagod ea4bd8831f fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284] 2018-04-10 13:19:53 +02:00
mlorb a10f671184
Merge pull request #1081 from mlorb/ml-sci-2123 
Refactor settings into the new navigation bar [SCI-2123]
 2018-04-09 13:21:16 +02:00
zmagod b12f6f1b92 set limit on maximum number of dropdown list items [fixes SCI-2259] 2018-04-09 12:50:25 +02:00
mlorb 8a35ce5c58 add locales 2018-04-09 10:53:03 +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
mlorb 0c851f227c remove unused locals 2018-04-06 15:00:19 +02:00
mlorb 70dfe66b2d refactoring 2018-04-06 14:20:40 +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
mlorb b8e91e91a1 refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
Luka Murn 386ede0400 Add special middleware for handling of Rails 5.1 WOPI errors 
Closes SCI-2266.
 2018-04-05 13:26:08 +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
okriuchykhin e608d629c7
Merge pull request #1068 from okriuchykhin/ok_SCI_2217 
Refactor file preview modal [SCI-2217]
 2018-04-05 00:18:43 +02:00
Oleksii Kriuchykhin 9720063fb3 Fix tests [SCI-2217] 2018-04-05 00:06:11 +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
Zmago Devetak ab48e4f527
Merge pull request #1072 from ZmagoD/zd_SCI_2239 
change export model wording [fixes SCI-2239]
 2018-04-04 15:40:18 +02:00
Zmago Devetak d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206 
add ID column to repository [fixes SCI-2206]
 2018-04-04 15:39:59 +02:00
zmagod 77f80271dd fixes per @mojca 's request 2018-04-04 14:52:59 +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