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

382 commits

Author SHA1 Message Date
Zmago Devetak 9911c0d148 Merge pull request #613 from ZmagoD/zd_SCI_1241_v3 
replace all ActionController::Base.helpers.sanitize calls with custom…
 2017-05-11 14:30:26 +02:00
zmagod 80a0af8c9f replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241] 2017-05-11 11:36:47 +02:00
Oleksii Kriuchykhin a5926726ce Add notifications counter badge to project card [SCI-1253] 2017-05-10 17:28:37 +02:00
zmagod 2081e0a94b Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1 2017-05-10 15:14:17 +02:00
Zmago Devetak ff0f85fce8 Merge pull request #592 from ZmagoD/zd_SCI_160 
removes TempFile after 7 days [fixes SCI-160]
 2017-05-10 09:32:18 +02:00
zmagod 04ee24d553 refactor 2017-05-09 14:05:21 +02:00
zmagod 2d69896897 fixes pdf export and image size [fixes SCI-1247] 2017-05-09 13:59:59 +02:00
okriuchykhin ccc640f2bc Merge pull request #593 from okriuchykhin/ok_SCI_1158 
Add advanced search options [SCI-1158]
 2017-05-09 10:23:34 +02:00
Oleksii Kriuchykhin bd5a48b9c8 Improve code style [SCI-1158] 2017-05-08 18:00:14 +02:00
Zmago Devetak 4b816f5322 Merge pull request #568 from ZmagoD/zd_SCI_1119 
Add images to fields with rich text formatting
 2017-05-08 13:06:58 +02:00
Oleksii Kriuchykhin a3f847a232 Fix hound [SCI-1158] 2017-05-08 10:22:54 +02:00
Oleksii Kriuchykhin 0ee7e11620 Add advanced search options [SCI-1158] 2017-05-05 16:41:23 +02:00
zmagod f079a097c5 removes TempFile after 7 days [fixes SCI-160] 2017-05-05 14:54:22 +02:00
zmagod 8d0c22327b adds asc order to checklists [fixes SCI-1228] 2017-05-04 15:17:34 +02:00
zmagod acc5594f1b add popup for approval to complete the Task [fixes SCI-1200] 2017-05-04 12:41:22 +02:00
okriuchykhin 5ec41c0d0a Merge pull request #576 from okriuchykhin/ok_SCI_763 
Add additional sanitization to search parameters in datatables [SCI-763]
 2017-04-26 13:44:15 +02:00
zmagod 0e383109a1 refactor query 2017-04-26 13:32:03 +02:00
Oleksii Kriuchykhin 9055894d07 Add additional sanitization to search parameters in datatables [SCI-763] 2017-04-25 17:37:42 +02:00
zmagod 615bbb9967 make search for users case insensitive [fixes SCI-1192] 2017-04-25 15:33:51 +02:00
Luka Murn 92159b734f Merge pull request #559 from Ducz0r/lm-sci-1175-fix 
Fix encoding when cloning tables [SCI-1175]
 2017-04-25 14:38:34 +02:00
zmagod ed24448817 adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203] 2017-04-25 14:24:05 +02:00
zmagod 1fefeee3d1 adds team space related methods 2017-04-25 13:44:31 +02:00
zmagod 66f43803c0 refactor, fix user annotation bug 2017-04-24 16:22:25 +02:00
zmagod 55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
zmagod 550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
Mojca Lorber 3aa1225e16 fix hound 2017-04-20 18:14:12 +02:00
Mojca Lorber 0bae4657f6 add experiment level to user smart annotation notification 2017-04-20 13:21:02 +02:00
Mojca Lorber b1e939e715 add experiment to activities 2017-04-20 13:16:11 +02:00
Mojca Lorber c13b8ab270 styling 2017-04-20 13:16:11 +02:00
Mojca Lorber 1606e2163c add experiment level to notifications 2017-04-20 13:16:11 +02:00
Matej Zrimšek 314e8fcbd2 Added :inverse_of reference for all specific comment models. [fixes SCI-1207] 2017-04-19 23:38:23 +02:00
zmagod 0757563d02 adds step tiny_mce asset relation 2017-04-19 17:22:57 +02:00
Luka Murn 9479b65140 Hopefully fixes the encoding issues with audit trails 
Closes SCI-1175.
 2017-04-19 08:35:04 +02:00
Luka Murn 6a7e383316 Please the Hound 2017-04-18 15:38:11 +02:00
Zmago Devetak e1a30cc17c Merge pull request #558 from ZmagoD/zd_SCI_1192 
fixes broken users search method for smart annotation [fixes SCI-1192]
 2017-04-14 15:38:33 +02:00
Luka Murn 9c28608fbf Fix encoding when cloning tables 
Closes SCI-1175.
 2017-04-13 17:00:27 +02:00
zmagod 9ee971c24b fixes broken users search method for smart annotation [fixes SCI-1192] 2017-04-13 16:14:12 +02:00
Zmago Devetak 40af0df882 Merge pull request #551 from ZmagoD/zd_SCI_1189 
fixes the user_name field in csv export [fixes SCI-1189]
 2017-04-13 14:36:44 +02:00
zmagod a6183af63d fix method_missing again 2017-04-13 14:34:58 +02:00
zmagod 0534bce1ed adds super in method_missing 2017-04-13 14:03:56 +02:00
zmagod 241af0620a fixes hound alerts 2017-04-13 13:27:43 +02:00
zmagod b6daf2648b refactor zip_export 2017-04-13 13:01:05 +02:00
okriuchykhin 0fe84c4e24 Merge pull request #550 from okriuchykhin/ok_SCI_1157 
Improve speed of search [SCI-1157]
 2017-04-12 13:11:26 +02:00
zmagod f4fdb840d8 fixes the user_name field in csv export [fixes SCI-1189] 2017-04-12 09:05:54 +02:00
Oleksii Kriuchykhin 07d658ab82 Improve speed of search [SCI-1157] 2017-04-11 14:55:44 +02:00
Matej Zrimšek 1447a34dc7 Files didn't get deleted in previous commit. [fixes SCI-1150] 2017-04-06 16:59:34 +02:00
Matej Zrimšek e72184d10d Fixed so that file deletion callbacks are triggered (and hence audit trails for this is generated). [fixes SCI-1150] 2017-04-06 11:34:03 +02:00
zmagod e1ee53eeb5 generates query in background worker 2017-04-03 13:37:54 +02:00
Oleksii Kriuchykhin 42ccefe2ce Remove logs table and old unused logging code [SCI-1127] 2017-03-30 11:47:57 +02:00
zmagod 0996c14449 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765 2017-03-27 10:41:58 +02:00
zmagod 239a44c26b change send to public_send 2017-03-24 16:25:50 +01:00
zmagod 4635a3320d Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-24 16:09:28 +01:00
zmagod b352ef1600 removed unneeded method 2017-03-24 12:53:33 +01:00
zmagod 023b3213e8 fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +01:00
zmagod 94732c6d18 adds delayed zip generator 2017-03-23 15:45:02 +01:00
Oleksii Kriuchykhin 2edebb282a Add team_id field to assets and tables [SCI-1046] 2017-03-23 10:36:55 +01:00
zmagod 4385c68f5f adds zip_export utility first run 2017-03-21 16:15:11 +01:00
zmagod 856a4611c6 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-14 15:58:08 +01:00
zmagod 0c2523beca Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-03-10 16:21:43 +01:00
okriuchykhin 2a33391f4b Merge pull request #511 from okriuchykhin/ok_SCI_1090 
Refactoring of the comments using STI [SCI-1090]
 2017-03-10 10:50:43 +01:00
zmagod 1d42d46c02 fixes bug with step comments 2017-03-09 16:02:52 +01:00
zmagod 9939d8df06 refactor 2017-03-09 10:51:54 +01:00
zmagod 5c2e9a4b04 adds extends and fixes report methods 2017-03-08 14:14:03 +01:00
Oleksii Kriuchykhin 0f8336e5a5 Refactoring of the comments using STI [SCI-1090] 2017-03-08 13:18:20 +01:00
Luka Murn 043613782e Minor change 2017-03-02 13:04:13 +01:00
zmagod e1b3dcc2ba adds enum extends to report element part of SCI-1003 2017-02-27 13:53:46 +01:00
Oleksii Kriuchykhin 35b0b33ddf Add more extensive explanation when project name is already taken [SCI-759] 2017-02-22 14:18:48 +01:00
Oleksii Kriuchykhin 53ba9437b2 Fix circular dependency while loading Settings [SCI-1004] 2017-02-21 14:38:13 +01:00
okriuchykhin 95af5001ab Merge pull request #484 from okriuchykhin/ok_SCI_1004 
Add global settings base class [SCI-1004]
 2017-02-21 13:20:24 +01:00
Oleksii Kriuchykhin 7703db3386 Change implementation of the Settings base class [SCI-1004] 2017-02-21 13:07:10 +01:00
okriuchykhin 8e18ff44a6 Merge pull request #479 from okriuchykhin/ok_SCI_999 
Add task complete/uncomplete functionality [SCI-999]
 2017-02-20 15:19:00 +01:00
Oleksii Kriuchykhin 2aba0f46a6 Add global settings base class [SCI-1004] 2017-02-20 15:11:57 +01:00
Oleksii Kriuchykhin 218e96b1f0 Code style fixes [SCI-999] 2017-02-16 11:45:07 +01:00
Luka Murn 86be639a7c Please the Hound 2017-02-13 14:20:44 +01:00
Luka Murn 3313d14316 Fix search for administrators and projects 
Closes SCI-958.
 2017-02-13 14:15:53 +01:00
Luka Murn c6ed73bc82 Allow team admins to see all projects, even hidden ones 2017-02-13 13:42:53 +01:00
Oleksii Kriuchykhin cf8566df33 Add task complete/uncomplete functionality [SCI-999] 2017-02-10 14:27:20 +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
zmagod be5faad97c fixes hound 2017-01-31 13:33:55 +01:00
mlorb bc8c4c3c6c Merge pull request #463 from mlorb/ml_sci_965 
Fix step does not save if table is without content [SCI-965]
 2017-01-30 11:08:21 +01:00
Mojca Lorber b291553d01 fix hound 2017-01-27 16:36:03 +01:00
Mojca Lorber d5021fad2c fix step does not save if table is without content 2017-01-27 16:25:11 +01:00
Oleksii Kriuchykhin 08aa882155 Fix generation of image previews after protocol loading from repo [SCI-951] 2017-01-26 13:19:59 +01:00
zmagod 1220466035 fixing hound 2017-01-25 15:00:14 +01:00
zmagod f04a2f663a renamed organizations in config/ 2017-01-25 12:30:11 +01:00
zmagod 9d90b9b42a rename Organization to Team in models 2017-01-24 17:08:48 +01:00
zmagod a193850ae6 rename models where org/organization 2017-01-24 16:34:21 +01:00
Luka Murn 53699193a2 Merge branch 'smart-annotations' 
Conflicts:
	app/assets/javascripts/comments.js.erb
	app/assets/javascripts/protocols/index.js
	app/assets/javascripts/protocols/steps.js.erb
	app/assets/javascripts/samples/sample_datatable.js.erb
	app/controllers/my_module_comments_controller.rb
	app/controllers/project_comments_controller.rb
	app/controllers/result_comments_controller.rb
	app/controllers/step_comments_controller.rb
	app/datatables/sample_datatable.rb
	app/views/my_module_comments/_comment.html.erb
	app/views/project_comments/_comment.html.erb
	app/views/projects/show/_experiment.html.erb
	app/views/reports/elements/_experiment_element.html.erb
	app/views/reports/elements/_result_comments_element.html.erb
	app/views/reports/elements/_result_text_element.html.erb
	app/views/reports/elements/_step_checklist_element.html.erb
	app/views/reports/elements/_step_comments_element.html.erb
	app/views/reports/elements/_step_element.html.erb
	app/views/result_comments/_comment.html.erb
	app/views/results/_result_text.html.erb
	app/views/step_comments/_comment.html.erb
	app/views/steps/_step.html.erb
	db/schema.rb
 2017-01-24 14:33:23 +01:00
zmagod 20cde2654b fixed user without permissions bug [fixes SCI-922] 2017-01-23 10:53:42 +01:00
zmagod 9550c6dd35 fixes highlight.js 2017-01-19 17:09:25 +01:00
mz3944 b5e38afb64 Merge pull request #416 from mz3944/mz-sci-884 
Smart annotation bug fixes [SCI-884, SCI-889] [WIP]
 2017-01-18 16:13:19 +01:00
Mojca Lorber 6155a458e7 update search 2017-01-18 14:22:19 +01:00
Mojca Lorber dde9854bf1 update protocol import/export and clone 2017-01-18 14:22:19 +01:00
Mojca Lorber b3c423c582 add table name in protocol step 2017-01-18 14:22:18 +01:00
Oleksii Kriuchykhin 55d0e82fcd Change If statement to ternary operator [SCI-887] 2017-01-18 13:43:21 +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
Matej Zrimšek 3085452ec9 Fixed some hound alerts. [SCI-884] 2017-01-17 11:04:16 +01:00
Oleksii Kriuchykhin 50edaef4ff Do not show archived projects, experiments and tasks in smart annotations [SCI-887] 2017-01-16 16:55:10 +01:00
okriuchykhin 02bfd19d1c Merge pull request #385 from okriuchykhin/ok_SCI_102 
Fix XSS on activites and throghout the rest of app [SCI-102]
 2017-01-16 11:41:38 +01:00
Matej Zrimšek 15d7944302 Preventing splitting of the words in the lookup query for # smart annotations. Query on the # is now performed on every character input, before it sometimes just filtered out the old (results count limited) query. Some refactoring of samrt annotations JS. [SCI-884, SCI-889] 2017-01-13 18:51:05 +01:00