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
2926 commits 70 branches 179 tags 165 MiB
Commit graph

727 commits

Author SHA1 Message Date
Oleksii Kriuchykhin bb8c7c342c Add additional info to samples info modal [SCI-960] 2017-05-11 22:20:06 +02:00
Oleksii Kriuchykhin 0ef9c7eff6 Fix task ordering in reports [SCI-1008] 2017-05-11 15:30:19 +02:00
okriuchykhin ab0d882be1 Merge pull request #614 from okriuchykhin/ok_SCI_1254 
Fix step actions in reports [SCI-1254]
 2017-05-11 14:44:36 +02:00
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
Oleksii Kriuchykhin fe134419a3 Fix step actions in reports [SCI-1254] 2017-05-11 13:51:43 +02:00
okriuchykhin 328c9292b1 Merge pull request #606 from okriuchykhin/ok_SCI_1235 
Fix error messages display during file upload in steps and results [SCI-1235]
 2017-05-11 13:00:36 +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
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
Oleksii Kriuchykhin 52ad5ecdc2 Fix error messages display during file upload in steps and results [SCI-1235] 2017-05-09 17:13:47 +02:00
zmagod 04ee24d553 refactor 2017-05-09 14:05:21 +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
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 7a61f5813c Add comments to the code [SCI-152] 2017-05-09 10:22:01 +02:00
Oleksii Kriuchykhin bd5a48b9c8 Improve code style [SCI-1158] 2017-05-08 18:00:14 +02:00
Oleksii Kriuchykhin 344b9c290a Add counters for users and comments on canvas [SCI-152] 2017-05-08 17:32:55 +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
zmagod d6f303581f refactor 2017-05-08 12:56:33 +02:00
ajugo 2973ead765 Missing files, comments, checklist in steps [fixes SCI-1224] (#591) 
* Missing files, comments, checklist in steps [fixes SCI-1224]

* Code fixes
 2017-05-08 10:44:15 +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
Zmago Devetak f3415abe3e Merge pull request #587 from ZmagoD/zd_SCI_1233 
fixes bug with empty checklist item [fixes SCI-1233]
 2017-05-05 10:11:52 +02:00
zmagod f784844472 fixes bug with empty checklist item [fixes SCI-1233] 2017-05-04 16:15:00 +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
zmagod 5b58824ec0 refactor 2017-05-03 15:30:08 +02:00
Zmago Devetak cc6c2942c2 Merge pull request #574 from ZmagoD/zd_SCI_1194_v2 
prevent to get nil as a param in checklist_item_annotation method [fi…
 2017-05-03 10:56:21 +02:00
zmagod d5abb52909 refactor 2017-05-03 10:55:11 +02:00
Oleksii Kriuchykhin cf7d0ea248 Fix dowloand of export zip files from local storage [SCI-1128] 2017-04-26 13:23:30 +02:00
zmagod 0456393317 prevent to get nil as a param in checklist_item_annotation method [fixes SCI-1194] 2017-04-25 16:22:10 +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
mlorb 54f1c7b3e8 Merge pull request #566 from mlorb/ml_sci_365 
New experiment redirection [SCI-365]
 2017-04-24 08:55:55 +02:00
zmagod 550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
Mojca Lorber cf00ecd62e new experiment redirection 2017-04-20 17:55:28 +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
zmagod 0757563d02 adds step tiny_mce asset relation 2017-04-19 17:22:57 +02:00
mz3944 a0b5a94d67 Merge pull request #564 from mz3944/mz-SCI-856 
Case insensitive email invitation
 2017-04-19 09:36:46 +02:00
zmagod 37be04c09c add tiny_mce controller 2017-04-19 09:13:16 +02:00
Matej Zrimšek bafdbf4082 Email is now case insensitive when inviting users by it. [fixes SCI-856] 2017-04-18 18:01:29 +02:00
mz3944 0ebf294844 Merge pull request #562 from mz3944/mz-SCI-1187 
Added general locale for cases when a name is optional and is not spe…
 2017-04-18 15:26:35 +02:00
Matej Zrimšek a889174938 Name of result tables should be nil, as it can't be specified. [fixes SCI-1187] 2017-04-18 15:08:13 +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
zmagod 8af3858209 fix hound 2017-04-14 11:13:58 +02:00
zmagod 9ee971c24b fixes broken users search method for smart annotation [fixes SCI-1192] 2017-04-13 16:14:12 +02:00
Mojca Lorber 27c661d7c4 fix bug with changing user own role from admin to normal user 2017-04-12 16:56:10 +02:00
zmagod 90faeec410 fixes typos and protocol step links 2017-04-10 11:21:28 +02:00
zmagod e77df92017 fix samples_controller 2017-04-06 15:26:24 +02:00
zmagod 9bb1bb3f9b refactor [fixes SCI-825] 2017-04-06 15:08:03 +02:00
zmagod 439cd0cd89 add notification to experiments 2017-04-06 14:55:18 +02:00
zmagod 046b608018 add notification for my_module/project comments 2017-04-06 14:07:22 +02:00
zmagod b398bb7516 add step annotations methods in steps_action concerns 2017-04-06 13:06:20 +02:00
zmagod f16607579f refactor steps annotation 2017-04-06 13:03:13 +02:00
zmagod bb437bd8c5 adds notification to results annotation 2017-04-06 09:33:49 +02:00
zmagod d331911ffe completed step annotations 2017-04-06 08:42:16 +02:00
zmagod 99c116f257 first run 2017-04-04 09:19:43 +02:00
Oleksii Kriuchykhin 42ccefe2ce Remove logs table and old unused logging code [SCI-1127] 2017-03-30 11:47:57 +02:00
Zmago Devetak 2b35b34eb8 Merge pull request #529 from ZmagoD/zd_SCI_1135 
fixes alert messages in samples [fixes SCI-1135]
 2017-03-29 14:57:11 +02:00
zmagod 0096f9dc14 refactor 2017-03-29 09:32:23 +02:00
zmagod 9ce95470b3 fixes alert messages in samples [fixes SCI-1135] 2017-03-28 15:14:05 +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 2235fd3fb7 adds view if download expires 2017-03-27 10:38:28 +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
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 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 d8955d1a78 fixes breadcrumbs in office file [fixes SCI-1111] 2017-03-20 13:48:45 +01:00
Mojca Lorber 83fa8570d7 refactoring 2017-03-17 17:52:15 +01:00
zmagod 5cc6cd094e refactor 2017-03-17 16:47:58 +01:00
zmagod 307fef17d8 fixes owner id if empty 2017-03-15 18:01:15 +01:00
Zmago Devetak 1afb4c9a42 Merge pull request #515 from ZmagoD/file_owner_id_bug 
fixes bug with wopi contorller
 2017-03-15 17:40:07 +01:00
zmagod c5156f5ca3 fixes bug with wopi contorller 2017-03-15 17:33:36 +01:00
Mojca Lorber 4792bd87b9 fix error message when editing custom column on locked task 2017-03-15 14:09:44 +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 15b1712a3d fixes bug with organization 2017-03-14 13:29:59 +01:00
zmagod df2abe5d17 fixed typo 2017-03-13 13:51:31 +01:00
zmagod 7b16e5643e fix assets preprocesor for wopi files 2017-03-13 13:20:49 +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
Oleksii Kriuchykhin 456934464a Remove unneeded validation calls [SCI-1090] 2017-03-09 17:20:27 +01:00
zmagod 1d42d46c02 fixes bug with step comments 2017-03-09 16:02:52 +01:00
zmagod 3057965940 fix bug with filenames 2017-03-09 11:48:50 +01:00
zmagod 9939d8df06 refactor 2017-03-09 10:51:54 +01:00
zmagod 49f91184da fixes locals 2017-03-09 09:55:15 +01:00
zmagod 5c2e9a4b04 adds extends and fixes report methods 2017-03-08 14:14:03 +01:00
Luka Murn 800df7a26b Also make button icons work when rendering them via JS 
Closes SCI-1073.
 2017-03-08 13:55:10 +01:00
Oleksii Kriuchykhin 0f8336e5a5 Refactoring of the comments using STI [SCI-1090] 2017-03-08 13:18:20 +01:00
Oleksii Kriuchykhin 4868ec5331 Remove task completion duplicated code [SCI-1075] 2017-02-28 17:07:59 +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 4fb5fa79af Move task completion activity and notification creation to separate methods [SCI-999] 2017-02-16 13:36:05 +01:00
Oleksii Kriuchykhin 218e96b1f0 Code style fixes [SCI-999] 2017-02-16 11:45:07 +01:00
zmagod 836baa7412 fixes bug with user teams table [fixes SCI-987] 2017-02-15 10:06:21 +01:00
Luka Murn d097f0dd15 Merge pull request #477 from Ducz0r/lm-sci-928 
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
 2017-02-13 16:42:57 +01:00
Luka Murn 1b6f50647c Please Hound 2017-02-13 16:40:27 +01:00
Oleksii Kriuchykhin f97c20e9b5 Fix hound warnings [SCI-999] 2017-02-13 15:42:28 +01:00
Oleksii Kriuchykhin 78d5cbb223 Add links to task completion notification [SCI-999] 2017-02-13 14:51:21 +01:00
Oleksii Kriuchykhin cf8566df33 Add task complete/uncomplete functionality [SCI-999] 2017-02-10 14:27:20 +01:00
Luka Murn 3eb4faa44b Fix task restore action 
Closes SCI-991.
 2017-02-10 14:08:56 +01:00
Luka Murn 280b7a0e75 Minor fix 2017-02-09 15:10:45 +01:00
Luka Murn 2a9f975c13 Some minor fixes 2017-02-09 14:58:11 +01:00
Luka Murn f7bd62547e Refactor teams settings into its own controllers 2017-02-09 14:37:59 +01:00
Luka Murn 5cb3eb5e09 Refactor preferences -> move them to subcontroller, subroute 2017-02-09 11:07:16 +01:00
okriuchykhin c2a69982aa Merge pull request #471 from okriuchykhin/ok_SCI_936 
Adds datatable to all teams page [SCI-936]
 2017-02-07 10:33:33 +01:00
Oleksii Kriuchykhin cc6b518c7f Check that user is a member of a team when switching to it [SCI-984] 2017-02-03 16:10:37 +01:00
Oleksii Kriuchykhin db90c5d63b Add datatable to all teams page [SCI-936] 2017-02-02 09:53:59 +01:00
Oleksii Kriuchykhin 031741d122 Disable protocols link if user has no teams [SCI-934] 2017-02-01 14:26:51 +01:00
Oleksii Kriuchykhin c119b7c014 Make sciNote work for users without any teams [SCI_934] 2017-02-01 14:16:26 +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
Oleksii Kriuchykhin d1e69438de Add config option to enable/disable users registration [SCI-935] 2017-01-30 15:04:02 +01:00
zmagod e59b2e039a Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939 2017-01-27 11:15:31 +01:00
Mojca Lorber 5bed5f0f4a fix bug with avatar in smart annotations 2017-01-26 17:15:00 +01:00
Oleksii Kriuchykhin 310d8c1920 Refactor smart annotation/auto_link/simple_format rendering [SCI-940] 2017-01-25 17:18:19 +01:00
zmagod c2c5616078 rename Organization to Team in controllers 2017-01-24 17:06:51 +01:00
Oleksii Kriuchykhin fe6d6842c2 Add sanitization of group/type to sample edit [SCI-902] 2017-01-24 16:58:03 +01:00
zmagod 21c2f82582 rename controllers where org/organization 2017-01-24 16:57:14 +01:00
Oleksii Kriuchykhin a04f05eeb3 Add sanitization to sample groups/types [SCI-902] 2017-01-24 14:39:54 +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
Oleksii Kriuchykhin d555ba7905 Add export to protocol management page and code style improvements [SCI-742] 2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin 14a6705b55 Implemented protocol export through Zip::OutputStream [SCI-742] 2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin 1abd7fc574 Added xml schemas and zip gem [SCI-742] 2017-01-23 17:34:02 +01:00
Mojca Lorber 44de927cf4 display smart annotations in reports - without rich text fields 2017-01-19 14:22:54 +01:00
Mojca Lorber b3c423c582 add table name in protocol step 2017-01-18 14:22:18 +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
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
Luka Murn a0e9e5afa8 Merge pull request #402 from mz3944/mz-sci-848-v2 
Unable to delete samples [SCI-848]
 2017-01-16 10:47:13 +01:00
zmagod 1b2fa78e42 adds user preview to user smart annotation [fixes SCI-832] 2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin f567d0307e Fix includes [SCI-102] 2017-01-12 17:02:01 +01:00
Luka Murn 8b01f912a0 Fix new year problems with activities 
Closes SCI-876.
 2017-01-12 14:47:15 +01:00
Matej Zrimšek 93a8e0bdae Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848] 2017-01-12 14:08:29 +01:00
Oleksii Kriuchykhin d05c16b0ba Added auto_link wrapper with custom sanitization [SCI-102] 2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin 0546716a0b Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +01:00
zmagod 3a1ec0eb5e refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +01:00
zmagod fc76a4ae6d Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834 2017-01-10 14:22:04 +01:00
zmagod 6efcf49927 working version of dropdown filter 2017-01-10 14:14:21 +01:00
zmagod 53d20df449 added xregexp 2017-01-10 14:14:21 +01:00
zmagod 94262b56ef prepare data for atwho 2017-01-10 14:14:21 +01:00
Luka Murn 5873eea994 We serve to please the Hound 2017-01-10 10:42:52 +01:00
mz3944 ef431da2db Merge pull request #389 from mz3944/mz-sci-848 
Unable to delete samples [SCI-848]
 2017-01-09 11:57:48 +01:00
okriuchykhin 3c47d17019 Merge pull request #386 from okriuchykhin/ok_SCI_815 
Improve error message when importing CSV files with incorrect character encoding [SCI-815]
 2017-01-09 11:54:28 +01:00
zmagod 226d5d8247 added blank string to wopi-lock header param 2017-01-09 11:51:18 +01:00
Oleksii Kriuchykhin 89710d8782 Enable image preview for newly uploaded images [SCI-694] 2017-01-06 16:41:24 +01:00
Oleksii Kriuchykhin aa2b573278 Enable image preview while editing steps and code style improvements [SCI-694] 2017-01-06 15:58:23 +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
Matej Zrimšek 5d104981fd Fixed sample deletion on experiments level. Minor refactoring. [SCI-848] 2017-01-06 14:23:20 +01:00
Luka Murn 3cdd375a2d Merge pull request #388 from biosistemika/hotfix-1.6.1 
Hotfix 1.6.1
 2017-01-06 11:23:16 +01:00
Oleksii Kriuchykhin cba064dfcc Improve error message whan importing CSV files with incorrect character encoding [SCI-815] 2017-01-05 17:00:21 +01:00
Luka Murn ef688feb4e Hotfix 1.6.1 
Set confirmed_at to created_at when using no
email confirmations and users sign up by themselves.
 2017-01-05 15:27:18 +01:00
Oleksii Kriuchykhin 835e982292 SAnitize AJAX calls in controllers and datatables [SCI-102] 2017-01-05 13:12:22 +01:00
Oleksii Kriuchykhin cd3924afd3 Sanitize .html_safe marked strings which contain tags [SCI-102] 2017-01-05 13:04:19 +01:00
Luka Murn a78bb79618 Temp commit 2017-01-05 12:07:17 +01:00
mlorb 59751ec41e Merge pull request #373 from mlorb/ml_sci_709 
Add Protocol Preview to Protocol repository [SCI-709]
 2017-01-04 11:28:55 +01:00
Luka Murn 3bee9d2e12 Save an (yet unworking) version of user smart annotations 
Used so other devs can start working on smart annotations.
 2017-01-04 10:54:02 +01:00
Luka Murn cedc6c5074 Merge pull request #382 from Ducz0r/lm-sci-166-fix 
Re-add tags index controller action to render tags [SCI-166]
 2017-01-04 10:48:09 +01:00
Luka Murn 6402acc102 Merge pull request #377 from Ducz0r/lm-sci-820-fix 
Fix 2 bugs with comments editing [SCI-820]
 2017-01-04 10:47:29 +01:00
zmagod 87ffa7f03b fixes X-WOPI-ServerVersion bug 2017-01-04 10:02:08 +01:00
zmagod a434649f42 Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-01-03 16:35:25 +01:00
Mojca Lorber c476faca30 fix hound 2017-01-03 11:04:09 +01:00
Mojca Lorber e555535dfb add edit button to protocol preview modal 2017-01-03 10:04:14 +01:00
Luka Murn af9e272b2a Re-add tags index controller action to render tags 
Closes SCI-166.
 2017-01-03 09:39:41 +01:00
Zmago Devetak 5d0e80a5e1 Merge pull request #369 from ZmagoD/zd_SCI_812 
fixes bug with samples sorting [fixes SCI-812]
 2017-01-03 08:56:59 +01:00
okriuchykhin cce57d066c Merge pull request #370 from okriuchykhin/ok_SCI_817 
Fix issue with long samples column names in import modal [SCI-817]
 2016-12-30 15:29:32 +01:00
okriuchykhin e8955b0304 Merge pull request #375 from okriuchykhin/ok_SCI_361 
Add sorting to Project's experiments overview [SCI-361]
 2016-12-30 15:28:53 +01:00
Oleksii Kriuchykhin d798f1b120 Fix XSS vulnerability in protocol keywords [SCI-632] 2016-12-29 15:15:29 +01:00
Luka Murn b931b20f02 Fix 2 bugs with comments editing 
Closes SCI-820.
 2016-12-23 20:41:23 +01:00
Oleksii Kriuchykhin 4d3e002c81 Add sorting to Project's experiments overview [SCI-361] 2016-12-23 15:40:01 +01:00
Mojca Lorber 40e3240a99 add content to preview modal 2016-12-22 11:43:11 +01:00
zmagod e554fdf805 code refactor 2016-12-21 16:52:15 +01:00
Oleksii Kriuchykhin 53ea09c3de Fix issue with long samples column names in import modal [SCI-817] 2016-12-21 14:34:53 +01:00
zmagod e2723a288c fixes bug with samples sorting [fixes SCI-812] 2016-12-21 14:32:28 +01:00
Oleksii Kriuchykhin 00ea3a027c Fix generation of preview url for new steps and results [SCI-694] 2016-12-20 16:10:53 +01:00
Oleksii Kriuchykhin cbef971d85 Fix timeouts when fetching images from S3 [SCI-694] 2016-12-20 15:36:07 +01:00
Oleksii Kriuchykhin d2b76d8385 Improved image preview modal [SCI-694] 2016-12-19 17:36:18 +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 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
okriuchykhin c4ff12be51 Merge pull request #349 from okriuchykhin/ok_SCI_783 
Fix columns ordering when deleting custom fields [SCI-783]
 2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin de8eed0a19 Fix hound warning [SCI-783] 2016-12-14 15:27:24 +01:00
Oleksii Kriuchykhin fa1cf1f04d Better handling of columns deleting with fixing columns ordering [SCI-783] 2016-12-14 15:23:00 +01:00
zmagod 3c1a275510 fixes invited user samples table [fixes SCI-790] 2016-12-13 10:56:13 +01:00
Mojca Lorber 2cfcba0ceb add protocol preview modal 2016-12-13 10:39:18 +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 8bb452e4f7 trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775] 2016-12-12 10:30:03 +01:00
zmagod de3099e4d1 removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository 2016-12-09 13:59:49 +01:00
Luka Murn 1a8b141b95 Add delete custom field functionality 2016-12-09 13:49:19 +01:00
Luka Murn 754c90b612 Edit functionality now works 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
zmagod 40fdfef67f setup delayed_paperclip gem 2016-12-08 15:24:14 +01:00
zmagod ac52e643be cleanup direct upload 2016-12-08 11:26:13 +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 f6dd64772a Add columns to samples table without page reload [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
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 7725374c42 refactor sample types/groups [fixes SCI-700] 2016-12-02 09:58:35 +01:00
zmagod 83aae59eed adds sample groups index page 2016-12-02 09:33:09 +01:00
Luka Murn 372b455d7d Merge pull request #332 from Ducz0r/lm-sci-750-751 
Fix inviting users not working
 2016-12-01 15:52:40 +01:00
Luka Murn 6a770f6a7e Fix inviting users not working 
Closes SCI-750, SCI-751.

Probably reopens parts of SCI-746.
 2016-12-01 15:46:37 +01:00
Matej Zrimšek 3bdaa4bcef Some token authentication refactoring and error handilng fixes. [closes SCI-689] 2016-12-01 15:38:56 +01:00
Matej Zrimšek 46465060d0 Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689] 2016-11-30 16:56:56 +01:00
Nejc Bernot cb03ed8384 Users can now have multiple tokens 
A new token is generated whenever an edit or view file is called. Tokens have a TTL of one day.
Also enabled the toggling of both wopi and wopi test mode, using environmental variables.
 2016-11-30 16:48:42 +01:00
Luka Murn 76ec77fce4 Merge pull request #329 from biosistemika/simplify-signup 
Merge simplify-signup into master
 2016-11-30 09:41:20 +01:00
zmagod 4e4a48620c adds validation to input fields 2016-11-29 18:08:29 +01:00
zmagod 12848f15fa adds sample_type index view with all crud actions 2016-11-29 17:15:54 +01:00
Luka Murn b5d0a39827 Fix some recaptcha form submit errors for signup pages 
Closes SCI-746.
 2016-11-29 15:53:58 +01:00
zmagod 5c0b2d7b24 init sample_types page 2016-11-29 08:57:12 +01:00
okriuchykhin f9c8223fe5 Merge pull request #321 from okriuchykhin/ok_SCI_736 
Improve regexp for image whitelisting [SCI-736]
 2016-11-28 15:46:54 +01:00
Oleksii Kriuchykhin cc0aab2e59 Improve regexp for image whitelisting [SCI-736] 2016-11-28 10:08:54 +01:00
okriuchykhin 31f6379866 Merge pull request #318 from okriuchykhin/ok_SCI_736 
Add whitelisting of supported image types [SCI-736]
 2016-11-28 09:32:49 +01:00
okriuchykhin 5981d1a48e Merge pull request #316 from okriuchykhin/ok_SCI_738 
Add full name field to accept invitation form [SCI-738]
 2016-11-25 16:15:23 +01:00
Oleksii Kriuchykhin 74f6455a8f Add whitelisting of supported image types [SCI-736] 2016-11-25 16:12:43 +01:00
Oleksii Kriuchykhin 3fdb20b92c Add full name field to accept invitation form [SCI-738] 2016-11-25 11:15:10 +01:00
Luka Murn 87d3280847 Refactor registrations_controller code slightly 2016-11-25 09:56:07 +01:00
Oleksii Kriuchykhin 698e07a3b5 Enable reCaptcha and auto log in on confirm invitation form [SCI-706] 2016-11-24 14:11:02 +01:00
Luka Murn 198febfd94 Fix user projects not working 2016-11-23 13:19:10 +01:00
Luka Murn fba646bfba Fix Hound errors 2016-11-22 15:19:12 +01:00
Luka Murn 7cbe44d1f2 Refactor user projects & user my modules code 2016-11-22 15:16:26 +01:00
Luka Murn 201b1a48d5 Refactor user my modules code 2016-11-22 15:07:18 +01:00
Luka Murn e0607f7891 Refactor step comments code 2016-11-22 15:01:48 +01:00
Luka Murn 0c96036de8 Refactor some sample types code 2016-11-22 14:59:57 +01:00
Mojca Lorber 60f23b109b integrate reCaptcha into sciNote 2016-11-22 14:57:41 +01:00
Luka Murn 8ff5285179 Refactor some sample groups code 2016-11-22 14:57:01 +01:00
Luka Murn f5e286b1f6 Remove unused code for some more comments 2016-11-22 14:52:43 +01:00
Luka Murn 1f7a8712fb Update task comments & task tags controllers & localized Strings 
(Remove a lot of unused code)
 2016-11-22 14:26:35 +01:00
Luka Murn 59eb1c1d18 Remove unused new, edit user_projects views 2016-11-19 17:01:10 +01:00
Luka Murn 911b7ba72f Remove unused new user_my_module view 2016-11-19 16:59:24 +01:00
Luka Murn 6999105e51 Remove tags 2016-11-19 16:57:08 +01:00
Luka Murn 008b31df0c Finish removing new comment forms 2016-11-19 16:54:55 +01:00
Luka Murn 595b213b1a Changes up to samples in views folder 2016-11-19 16:51:40 +01:00
Luka Murn 3be30c0e7a Re-introduce fix for SCI-650 that was lost during merge 
Closes SCI-650.
 2016-11-18 10:57:03 +01:00
Luka Murn 26d04b1f3c Merge branch 'rich-text-formatting' into 'master' 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/themes/scinote.scss
 2016-11-17 16:39:33 +01:00
Luka Murn 9d3685f872 Merge branch 'gamification' into 'master' 
Conflicts:
	app/controllers/users/invitations_controller.rb
	app/controllers/users/settings_controller.rb
 2016-11-17 16:30:18 +01:00
Luka Murn 04749c3b2c Allow inviting of existing, unconfirmed users 
Closes SCI-676.
 2016-11-15 15:04:31 +01:00
Luka Murn 861e7cf72d Update invited user form so it works if user inputs empty team name 
Closes SCI-650
 2016-11-11 17:27:32 +01:00
Luka Murn 564274a588 Set invited_by field to invited users 2016-11-10 14:45:24 +01:00
Mojca Lorber d2ae11f1af fix hound 2016-11-10 14:16:54 +01:00
Mojca Lorber 3e162b3a93 remove redcarpet gem - markdown 2016-11-10 14:11:32 +01:00
mlorb 0793fb9f11 Merge pull request #260 from mlorb/ml_sci_614 
Add notification for removing user from team and removing user from project [SCI-614]
 2016-11-08 11:30:49 +01:00
Mojca Lorber 27c83992b4 refactoring notification method 2016-11-07 15:31:06 +01:00
Luka Murn ce7733e9e9 Also add notification when UserOrganization is created 2016-11-07 09:47:30 +01:00
Luka Murn 0ab62576a2 Add new modal to organization page, remove old modal code 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
Oleksii Kriuchykhin fe6724431e Futher improvement of samples assign/unassign logging [SCI-605] 2016-11-07 09:29:56 +01:00
Oleksii Kriuchykhin a1bfacef86 Improved samples assign/unassign logging [SCI-605] 2016-11-03 17:59:32 +01:00
Oleksii Kriuchykhin 3d25da5db7 Fixed bug with protocol loading from file [SCI-605] 2016-11-03 14:15:22 +01:00
Mojca Lorber 749b108928 fix hound 2016-11-02 13:32:15 +01:00
Mojca Lorber a2213e23b3 add notification for removing user from team and removing user from project 2016-11-02 11:52:41 +01:00
Oleksii Kriuchykhin e8d20dfc01 Added additional activities [SCI-605] 2016-11-02 10:43:36 +01:00
Luka Murn eec6b1403d Merge pull request #247 from Ducz0r/lm-hotfix-blank-current-org 
Add check in application controller to always set current org if nil
 2016-10-25 11:53:05 +02:00
Zmago Devetak 266d1415d0 Merge pull request #246 from ZmagoD/zd_SCI_599 
fixes error when removing user from team [SCI-599]
 2016-10-25 11:52:44 +02:00
Luka Murn 7885fd0f39 Add check in application controller to always set current org if nil 2016-10-25 11:39:57 +02:00
zmagod 6a328969f0 reset current_user if the user leaves the team [fixes SCI-599] 2016-10-25 09:53:02 +02: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
zmagod e02132578a first run 2016-10-24 20:07:20 +02:00
Zmago Devetak 4f5b7ad8ad Merge pull request #228 from ZmagoD/zd_SCI_585 
Removes archived projects from index page [fixes SCI-585]
 2016-10-21 11:33:01 +02:00
Oleksii Kriuchykhin 5be7904f5a Fix hound warnings [SCI-557] 2016-10-21 09:37:24 +02:00
zmagod db806f3c10 hide private projects 2016-10-21 09:06:19 +02:00
Oleksii Kriuchykhin 0c1ff06f21 Fixes issue with new comments and date separator SCI-557 2016-10-20 22:33:15 +02:00
zmagod 4c086a6fc1 removes archived projects from index page [fixes SCI-585] 2016-10-20 13:13:44 +02:00
zmagod 557957c857 fixed issue with mozilla browsers 2016-10-17 15:21:19 +02:00
zmagod 1614cbc2b2 fixes repeat tutorial button and localization typos 2016-10-17 15:16:22 +02:00
zmagod 931cba2666 fixes hound [fixes SCI-512] 2016-10-17 15:10:26 +02:00
zmagod fa36488397 fixed new project form 2016-10-17 15:10:26 +02:00
zmagod 8f24d0d80c fixed new user registration 2016-10-17 15:10:26 +02:00
zmagod 3117a464f0 fixed controllers 2016-10-17 15:10:26 +02:00
zmagod bb9c03df24 fixes controllers 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 a6a2a237aa Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +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 5966911b92 Fixed Hound alerts. 2016-10-17 11:57:46 +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 bdaeb4db13 Add notification mailer preview 2016-10-13 08:56:04 +02:00
mlorb 78f7879c04 Merge pull request #216 from mlorb/ml_sci_555 
Adding update notifications in settings [SCI-555]
 2016-10-13 08:53:55 +02:00
Mojca Lorber 42f6b679f8 Adding system notifications email function in settings 2016-10-12 11:50:26 +02:00
Luka Murn cccabcdd7b Remove invitation_to_organization email 
This email is no longer needed, because if user enables
assignment notifications, he/she will already receive an
email whenever he/she is added to a new organization/team (via
notifications email).
 2016-10-12 10:54:36 +02:00
Oleksii Kriuchykhin 5399033fce Added user settings for email notifications [SCI-443] 2016-10-11 16:43:17 +02:00
Jure Grabnar 1f67aec258 Prevent destroying protocols when file is edited 
SCI-552 #close
 2016-10-06 16:13:42 +02:00
Jure Grabnar b52e596209 Update protocol timestamp on put_file 
SCI-551 #close
 2016-10-06 14:37:42 +02:00
Oleksii Kriuchykhin c783e9a03d Code fix after rebase with latest master [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin 868ffd03d6 JS code improvement [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin 246dae4f46 Code style improvements according to hound [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin 8907e54b49 Global notifications index page added [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin 8b5b0723d1 Initial code commit 2016-10-05 15:51:11 +02:00
zmagod 9c7a690944 fixed type, fixed settings controller, fixes setting view on mobile devices 2016-10-05 14:33:22 +02:00
Jure Grabnar 85d2370d28 Change some values to string in CheckFileInfo 2016-10-04 18:19:36 +02:00
Jure Grabnar 3e74c96085 Add wd* params to iframe action url 2016-10-04 18:00:08 +02:00
zmagod a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
Luka Murn 61cb9651c7 Merge pull request #188 from biosistemika/global-notifications 
Global notifications
 2016-10-04 08:30:50 +02:00
zmagod c9bbab1004 added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users 2016-10-03 20:31:00 +02:00
Jure Grabnar 72c5824e67 Remove navbar for viewing WOPI files 2016-10-03 20:02:13 +02:00
Jure Grabnar ec82f64df2 Add WOPI breadcrumbs 2016-10-03 19:45:39 +02:00