599 commits

Author	SHA1	Message	Date
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
Jure Grabnar	1949b1fe88	Add CloseUrl to WOPI	2016-10-03 18:25:01 +02:00
Jure Grabnar	03567d6208	Prevent archive of locked result asset	2016-10-03 17:07:57 +02:00
mlorb	153b692c0c	Merge pull request #181 from mlorb/ml_sci_321 ... Displaying more information for individual samples in Sample table [SCI-321]	2016-10-03 16:37:35 +02:00
zmagod	0d23f05698	Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440	2016-10-03 16:14:22 +02:00
Jure Grabnar	f727289935	Add lock check for editing result	2016-10-03 13:43:35 +02:00
zmagod	947096862d	fixed hound	2016-10-03 11:40:59 +02:00
zmagod	ea17182372	generate notifications [fixes SCI-440]	2016-10-03 11:37:29 +02:00
zmagod	2ee02ec472	mark all seen notifications	2016-10-03 08:20:23 +02:00
Jure Grabnar	1e14955ade	Prevent deleting asset on step update	2016-10-01 18:47:05 +02:00
Jure Grabnar	d9fa882d6a	Add check for locked files on step delete	2016-10-01 14:51:55 +02:00
Jure Grabnar	a2d6d9a29a	Add WOPI controlls to result	2016-10-01 11:23:32 +02:00
Jure Grabnar	ff47f29dc2	Add wopi file activity ... SCI-393 #close	2016-09-29 16:16:42 +02:00
zmagod	e1a1b93d44	fixed migrations	2016-09-29 14:49:58 +02:00
Jure Grabnar	ed8df3cc62	Add favicon url to iframe	2016-09-29 12:19:29 +02:00
Jure Grabnar	bc22697ebe	Take/release space in putfile	2016-09-28 18:02:47 +02:00
Jure Grabnar	5e5f4c5ed4	Add text extraction on unlock	2016-09-28 17:36:53 +02:00
Jure Grabnar	02ddd64aaa	Set last_modified_by on put_file	2016-09-28 17:00:19 +02:00
zmagod	cab1e9b521	start implement toolbar view	2016-09-28 16:03:52 +02:00
Jure Grabnar	e96e8486ea	Add check file permissions to assets controller ... SCI-502 #close	2016-09-28 09:33:44 +02:00
Jure Grabnar	25c9ec67b3	Check permissions in wopi_controller	2016-09-28 09:33:44 +02:00
Jure Grabnar	5aea0fbb19	Refactor the rest of WOPI logic from Nejc	2016-09-28 09:33:44 +02:00
Jure Grabnar	c1ae4360a3	Refactor WopiController	2016-09-28 09:33:44 +02:00
Jure Grabnar	0c9292e4fc	Catch GET_SHARE_URL post file action	2016-09-28 09:33:44 +02:00
Jure Grabnar	3600fbfe64	Fix UnlockUnlockedFile action ... The time was nigh!	2016-09-28 09:33:44 +02:00
Jure Grabnar	674326e761	Add timestamp WOPI checking ... Change status error code to 500.	2016-09-28 09:33:44 +02:00
Jure Grabnar	b51f2a3027	Add basic WOPI proof checking ... Still missing validation of timestamp. Remove web_console gem for testing. Add relevant tests from manual for WOPI proof.	2016-09-28 09:33:44 +02:00
Nejc Bernot	1b260785ec	First working version of office integration ... Only works on scinote-preview	2016-09-28 09:33:44 +02:00
Nejc Bernot	b2b1d5a8f5	Initial commit of WOPI integration	2016-09-28 09:33:44 +02:00
zmagod	dad0d3868b	fixing hound	2016-09-27 17:31:37 +02:00
zmagod	2235778110	fixed project and task comments + fixed date issue	2016-09-27 16:19:31 +02:00
Mojca Lorber	c2b742374f	adding popup sample info	2016-09-23 17:45:02 +02:00
Matej Zrimšek	13e886f7a9	Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408]	2016-09-22 17:35:23 +02:00
Matej Zrimšek	234918a76d	Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits.	2016-09-21 19:48:18 +02:00
Zmago Devetak	5fedcb4be2	Merge pull request #160 from ZmagoD/zd_SCI_464 ... Fixes restore experiment error [fixes SCI-464]	2016-09-21 19:24:33 +02:00
zmagod	06b1992e94	Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436	2016-09-21 19:20:55 +02:00
zmagod	8a8bf10f08	clean up flash label	2016-09-21 19:09:57 +02:00
zmagod	bf8e2a208f	fixes restore experiment error [fixes SCI-464]	2016-09-21 08:34:32 +02:00
zmagod	42bbc47f5f	first working version	2016-09-20 17:06:07 +02:00
zmagod	da86208441	styled step comments	2016-09-20 14:13:40 +02:00
zmagod	0ca65aeca5	fixed step comment sorting	2016-09-20 13:31:50 +02:00
Matej Zrimšek	c2f0106993	Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408]	2016-09-16 15:56:44 +02:00
Zmago Devetak	431227c0a4	Merge pull request #147 from maslick/resultCommentsError1000Chars ... Fixed: Comments in results have no error message if the text exceeds 1000 characters	2016-09-16 09:38:38 +02:00
Matej Zrimšek	76ff34a8a9	URL presigning is now used only when using S3 file uploading (caused error for local uploading) [fixes SCI-447], along with some refactoring.	2016-09-13 18:56:47 +02:00
zmagod	7c363d5ade	fixed security issue	2016-09-13 13:57:31 +02:00
zmagod	3d5a42cc27	refactor results controller	2016-09-13 13:26:04 +02:00
zmagod	222ddf7438	fixed houd error	2016-09-13 13:26:04 +02:00
zmagod	691ae94d2c	enabled to delete results in task archive [fixes SCI-370]	2016-09-13 13:26:04 +02:00
Pavel Maslov	15ea8fc0dc	Bug fixed: comments in results have no error message if the text exceeds 1000 characters.	2016-09-13 12:01:56 +02:00
Zmago Devetak	1368716aa0	Merge pull request #130 from ZmagoD/zd_SCI_348 ... project overview - updating (or creating new) experiment details	2016-09-08 12:49:35 +02:00
Matej Zrimšek	b0ad6d0753	Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407].	2016-09-06 23:26:00 +02:00
zmagod	b44a284b54	sets edit experiment validation	2016-09-06 11:46:28 +02:00
zmagod	9d469f9092	sets front end validation for new experiment modal [fixes SCI-348]	2016-09-06 11:44:03 +02:00
Zmago Devetak	9440371f3f	Merge pull request #131 from ZmagoD/zd_SCI_400 ... Sets front end validation for experiment move action [fixes SCI-400]	2016-09-06 11:39:38 +02:00
zmagod	c526cab498	removed commented code	2016-09-06 11:38:02 +02:00
zmagod	667fb67052	sets front end validation for experiment move action [fixes SCI-400]	2016-09-02 16:31:17 +02:00
zmagod	4afaa50ce0	fixed multiple tables check	2016-09-01 13:49:12 +02:00
zmagod	111cb81d08	clear tables from report [fixes SCI-247] again	2016-09-01 13:38:09 +02:00
Mojca Lorber	a35bf7182f	fixes troubles	2016-08-30 09:43:39 +02:00
Mojca Lorber	b07f1af90f	fixes hound again again	2016-08-29 17:08:00 +02:00
Mojca Lorber	7f8bb9be53	fixes hound again	2016-08-29 13:59:51 +02:00
Mojca Lorber	60b0d69a72	fixes hound	2016-08-29 13:56:05 +02:00
Mojca Lorber	53cdbc2638	fixes notification when adding new sample	2016-08-29 13:45:54 +02:00
Matej Zrimšek	e3a7f45fdf	Merge branch 'master' into mz_file_upload_and_client_side_upgrade ... Conflicts: app/assets/javascripts/application.js app/views/results/_result_asset.html.erb app/views/steps/_step.html.erb	2016-08-26 11:13:40 +02:00
Matej Zrimšek	782d384e26	Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step).	2016-08-25 22:26:53 +02:00
Matej Zrimšek	04d9163ff6	Paperclip file spoofing corrected/modified.	2016-08-25 18:57:06 +02:00
Luka Murn	8018cff02e	Merge pull request #103 from Ducz0r/bb_edit_delete_comments ... Edit&delete comments	2016-08-25 17:18:48 +02:00
Zmago Devetak	b090fd8d5b	Merge pull request #95 from ZmagoD/zd_SCI_374 ... adds edit workflow link if no workflow [fixes SCI-374]	2016-08-25 14:07:33 +02:00
Luka Murn	a480c8d403	Styling fixes	2016-08-25 13:59:50 +02:00
Luka Murn	8592c13ed4	Remove now obsolote controller actions	2016-08-25 13:51:31 +02:00
Luka Murn	b0d7b9dc75	Generate activities when editing/deleting comments	2016-08-25 13:51:31 +02:00
Luka Murn	24dd25d9f5	Add edit/delete result comment functionality ... Lessons learned during this fix: Don't use dependant: :destroy on both ends of association between 2 ActiveRecords, or you will run into stack overflow.	2016-08-25 13:51:31 +02:00
Luka Murn	bac0455435	Add edit&delete functionality to step comments ... This commit also: * fixes a bug in permission_helper.rb, * fixes comments.js a bit, * adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.	2016-08-25 13:51:31 +02:00
Luka Murn	512efd3812	Fix 2 lines that were too long	2016-08-25 13:51:31 +02:00
Luka Murn	c92d016f65	Add edit&delete module/task comments functionality ... This required a minor fix of comments.js.	2016-08-25 13:51:31 +02:00
Luka Murn	f0d9cb96fa	Add edit project comments functionality	2016-08-25 13:51:30 +02:00
Luka Murn	15c0baeee8	Add delete project comment functionality ... This commit also removes the old code from @bberic.	2016-08-25 13:51:30 +02:00
scibb	a76d82d188	delete and edit comments for projects, protocols, results, and workflow elements	2016-08-25 13:51:30 +02:00
zmagod	f515366d91	fixes workflowing after updating description, fixes canvas bug	2016-08-25 09:11:42 +02:00
jbargu	5c104ac050	Merge pull request #93 from jbargu/jg_sci_378_move_experiment_error ... Fix 404 move experiment error	2016-08-24 16:35:29 +02:00
Jure Grabnar	00da7efb44	Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows' ... Conflicts: app/models/experiment.rb SCI-328 #close	2016-08-24 13:11:10 +02:00
Jure Grabnar	3e5e9aed22	Fix 404 on move experiment ... [fixes SCI-378]	2016-08-24 11:09:03 +02:00
mlorb	5c8d669cac	Merge pull request #81 from mlorb/ml_sci_364 ... fixes edit experiment [SCI-364]	2016-08-23 16:49:20 +02:00
Zmago Devetak	396325bd67	Merge pull request #86 from ZmagoD/zd_SCI_365 ... changed experiment create redirection [fixes SCI-365]	2016-08-23 16:30:48 +02:00
Zmago Devetak	65049692ea	Merge pull request #78 from ZmagoD/zd_SCI_349 ... updating thumbnail	2016-08-23 16:22:07 +02:00
Mojca Lorber	322be64b5f	change experiment path	2016-08-23 14:44:22 +02:00
Jure Grabnar	67768c8865	Fix Hound errors	2016-08-23 11:08:10 +02:00
zmagod	66b8a3055d	changed experiment create redirection [fixes SCI-365]	2016-08-23 09:03:39 +02:00
Jure Grabnar	c0edf51054	Fix bounding box algorithm, can move new modules	2016-08-23 09:00:25 +02:00
Jure Grabnar	667b7671a6	Add connections for moved workflows	2016-08-22 17:26:21 +02:00
Mojca Lorber	75c52d20e5	fixes hound	2016-08-22 15:30:27 +02:00
Mojca Lorber	131d0d269a	fixes edit experiment	2016-08-22 15:18:02 +02:00
zmagod	d38f29d207	set ajax loading of experiments images [fixes SCI-349]	2016-08-22 11:29:19 +02:00
mlorb	0832466d20	Merge pull request #76 from mlorb/ml_sci_286 ... fixes notifications when creating new sample type or group [SCI-286]	2016-08-22 08:54:28 +02:00
Mojca Lorber	1c220aba7b	delete comment	2016-08-22 08:50:48 +02:00
zmagod	cac5033eba	set ajax for workflow img	2016-08-19 15:36:12 +02:00
Zmago Devetak	99aa66cd84	Merge pull request #74 from ZmagoD/zd_SCI_346 ... check search input string [fixes SCI-346]	2016-08-19 14:01:56 +02:00
Mojca Lorber	799cac1238	fixes hound	2016-08-19 13:55:34 +02:00
Jure Grabnar	80498260e5	Add backend for moving task from canvas	2016-08-19 13:53:43 +02:00
Mojca Lorber	5695842fe3	fixes notifications when creating sample types and groups	2016-08-18 16:05:15 +02:00
zmagod	d62500cb56	check search input string [fixes SCI-346]	2016-08-18 13:14:31 +02:00
zmagod	fa08b861d0	fixed experiments archive bug	2016-08-18 10:55:29 +02:00
Matej Zrimšek	4ad384df5a	Fixed hound alerts.	2016-08-17 21:02:05 +02:00
Matej Zrimšek	27a9dac412	File permissions corrected, with some refactoring.	2016-08-17 18:23:24 +02:00
Matej Zrimšek	e4a6a3944e	Added deleting of files on S3 server when editing/removing a file. Some refactoring.	2016-08-17 18:13:35 +02:00
Matej Zrimšek	ccdccc5cf1	Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring.	2016-08-17 18:11:13 +02:00
Matej Zrimšek	854ef0d227	Special characters caused error [fixes SCI-315].	2016-08-17 18:10:47 +02:00
Matej Zrimšek	c87ba5b45c	Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page.	2016-08-17 18:10:32 +02:00
Matej Zrimšek	951cf67b3d	A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.	2016-08-17 18:08:21 +02:00
Jure Grabnar	78cf4f396e	render_403 and 404 now return true ... To prevent any: render_403 and return type of bugs	2016-08-17 15:46:30 +02:00
Jure Grabnar	0cdea0b51a	Add modal for moving task on canvas	2016-08-17 15:46:30 +02:00
zmagod	6c5cc8aac9	fixes notification [fixes SCI-337]	2016-08-17 13:17:40 +02:00
Zmago Devetak	da735a51f4	Merge pull request #62 from ZmagoD/zd_SCI_318 ... Zd sci 318	2016-08-17 10:01:10 +02:00
zmagod	850f5d8dad	fixing hound alerts	2016-08-17 09:44:23 +02:00
zmagod	7abc8f3a90	Merge branch 'master' into experiment-level	2016-08-17 09:28:35 +02:00
Jure Grabnar	a29b56b0bd	Even more candy for our dog	2016-08-16 09:15:29 +02:00
Jure Grabnar	042a33f2c7	Add activity for moving	2016-08-16 08:49:24 +02:00
zmagod	852fe499fb	clean up linked protocol	2016-08-12 16:31:40 +02:00
Jure Grabnar	c387439fb2	Fix projects query for experiments ... Remove unneeded word in view	2016-08-12 11:36:52 +02:00
Jure Grabnar	d7341d0383	Set actions/routes/view for move experiment	2016-08-12 11:26:18 +02:00
Jure Grabnar	9173c83502	Select current project in clone modal	2016-08-11 17:20:06 +02:00
Jure Grabnar	3c36293770	Add activity for cloning experiment	2016-08-11 17:00:33 +02:00
Jure Grabnar	3b259d34b0	Basic cloning of experiment works ... Still missing: - cloning of assets - cloning of experiment image	2016-08-11 15:13:36 +02:00
Jure Grabnar	7f21ae138a	Set clone actions/routes/view ... DRY code for showing AJAX on project#show page	2016-08-11 09:46:15 +02:00
Jure Grabnar	1ca34a7986	Fix result texts/tables	2016-08-10 15:44:33 +02:00
Jure Grabnar	52e6d7d300	Fix step comments	2016-08-10 15:44:33 +02:00
Jure Grabnar	3e72f29bfd	Fix uploading of step assets	2016-08-10 15:44:33 +02:00
Jure Grabnar	d69195a4f6	Fix uploading of result assets	2016-08-10 15:44:33 +02:00
zmagod	c866e90b33	Merge branch 'zd_add_image_to_project_preview' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_add_image_to_project_preview	2016-08-10 11:33:37 +02:00