3920 commits

Author	SHA1	Message	Date
Matej Zrimšek	47c1308ba6	Refactored and added back button for tutorial for step 18. Tutorial function now also works with one page step.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	00ed91e856	Refactored and added back button for tutorial for steps 16-17. Tutorial now exits upon page leave.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	bfe7c19f93	Refactored and added back button for tutorial for steps 14-15.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	4ee7baabec	Enriched tutorial function description.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	33c96c9eee	Refactored and added back button for tutorial for steps 12-13.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	0687153eb8	Minor tutorial refactoring.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	f4206ea3d0	No warning popup is shown when running tutorial.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	3f8d3d5939	Refactored and added back button for tutorial for steps 6-11.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	74e58b044f	Tutorial refactored using one method, for steps 1-5.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	0d133ff32e	Refactoring and added back buttons for tutorial steps 1-5.	2016-11-17 14:46:04 +01:00
Luka Murn	d1701bd7ae	Merge pull request #276 from Ducz0r/lm-sci-637 ... Automatically resize textarea elements [SCI-637]	2016-11-17 09:58:36 +01:00
zmagod	da54d779ec	Merge branch 'rich-text-formatting' of https://github.com/biosistemika/scinote-web into zd_SCI_687	2016-11-17 08:48:40 +01:00
Luka Murn	a3bbf94643	Add a smart_text_area tag & implement it throughout application ... This fixes the mentioned issues @mlorb mentioned. Closes SCI-637.	2016-11-16 17:57:01 +01:00
Luka Murn	aadcdde417	Merge pull request #294 from Ducz0r/lm-sci-674-fix ... Import protocol steps' rich text styling when importing protocols [SCI-674]	2016-11-16 16:59:18 +01:00
Oleksii Kriuchykhin	d2e29935cf	Improved tutorial styling [SCI-685]	2016-11-16 15:44:06 +01:00
zmagod	b781db9667	fixed bullets	2016-11-16 15:30:14 +01:00
zmagod	e5ba134e83	fixes search	2016-11-16 14:50:06 +01:00
Zmago Devetak	d3234bc52f	Merge pull request #284 from biosistemika/zd_SCI_662 ... fixes description label [fixes SCI-662]	2016-11-16 14:16:57 +01:00
zmagod	7953372d83	add description label	2016-11-16 13:59:35 +01:00
okriuchykhin	43b85ac5c2	Merge pull request #293 from okriuchykhin/ok_SCI_670 ... Fix project canvas interactivity in the tutorial [SCI-670]	2016-11-16 11:32:13 +01:00
Luka Murn	4b8824ca16	Merge pull request #291 from Ducz0r/lm-sci-676-fix ... Allow inviting of unconfirmed user onto multiple teams [SCI-676]	2016-11-16 11:32:01 +01:00
Luka Murn	e4b3d397a0	Merge pull request #288 from Ducz0r/lm-sci-675-fix ... Fix a bug where user could be assigned to same project twice [SCI-675]	2016-11-16 10:34:37 +01:00
Luka Murn	29f0557d3c	Prevent CORS when importing protocols	2016-11-15 17:06:39 +01:00
Luka Murn	83160a487b	Fix importer so it supports rendering & importing rich text format ... Closes SCI-674.	2016-11-15 16:57:53 +01:00
Oleksii Kriuchykhin	410837e6cf	Fix project canvas interactivity in the tutorial [SCI-670]	2016-11-15 16:53:20 +01:00
Luka Murn	263244ad83	Reload whole page after user is invited from team invite users modal ... Closes SCI-664.	2016-11-15 16:21:32 +01:00
Luka Murn	d425a7ad05	Merge pull request #283 from Ducz0r/lm-sci-650-fix ... Update invited user form so it works if user inputs empty team name [SCI-650]	2016-11-15 15:59:52 +01:00
Luka Murn	eb4d031b79	Fix destroying of users in relation to notifications	2016-11-15 15:56:32 +01:00
Luka Murn	04749c3b2c	Allow inviting of existing, unconfirmed users ... Closes SCI-676.	2016-11-15 15:04:31 +01:00
Mojca Lorber	c089832909	add validation for result text field	2016-11-15 12:55:32 +01:00
okriuchykhin	01b01939f3	Merge pull request #277 from okriuchykhin/ok_SCI_571 ... Additional steps added to tutorial and numbering of the steps fixed [SCI-571]	2016-11-15 12:05:20 +01:00
Luka Murn	7c03037643	Merge pull request #286 from Ducz0r/lm-sci-655-fix ... Save first time tutorial Activity-s without callbacks [SCI-655]	2016-11-15 12:00:35 +01:00
mlorb	c996df7476	Merge pull request #287 from mlorb/ml_sci_665 ... Fix position of buttons in text result [SCI-665]	2016-11-15 11:27:04 +01:00
Mojca Lorber	607f1381d0	fix mobile view	2016-11-15 10:58:15 +01:00
Luka Murn	e733da728c	Fix a bug where user could be assigned to same project twice ... Closes SCI-675.	2016-11-15 10:44:32 +01:00
Zmago Devetak	fddd7f662b	Merge pull request #281 from ZmagoD/zd_SCI_660 ... hide flash after 5 sec [fixes SCI-660]	2016-11-15 10:33:45 +01:00
Zmago Devetak	914bd42448	Merge pull request #278 from ZmagoD/zd_search_bug_with_rich_text_editor ... strips the html tags from fearch query	2016-11-15 10:30:29 +01:00
Mojca Lorber	6afc5c5a4b	fix position of buttons in text result	2016-11-14 16:31:48 +01:00
Luka Murn	fa6d8d3020	Save first time tutorial Activity-s without callbacks ... This PR adds a new, pretty useful little gem called sneaky-save. Closes SCI-655	2016-11-14 15:55:44 +01:00
Mojca Lorber	7002fc3f2f	fix hound	2016-11-14 15:10:37 +01:00
Mojca Lorber	615cd3c278	profile changes for gamification	2016-11-14 15:04:18 +01:00
zmagod	67c508a891	fixes description label [fixes SCI-662]	2016-11-14 13:47:20 +01:00
zmagod	3728a6cef9	fixed sql regex	2016-11-14 12:32:41 +01:00
okriuchykhin	091cb0005e	Merge pull request #280 from okriuchykhin/ok_SCI_658 ... Show only protocols from Protocol Management in users statistics [SCI-658]	2016-11-14 09:40:12 +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
Oleksii Kriuchykhin	2fb3041784	Fixes edit avatar link area [SCI-649]	2016-11-11 13:17:44 +01:00
mlorb	b0b2484fdf	Merge pull request #279 from mlorb/ml_sci_638_vol2 ... Fix validation problems for rich text fields [SCI-638]	2016-11-11 12:37:02 +01:00
Mojca Lorber	4d681bb63c	change strip html function	2016-11-11 12:34:57 +01:00
zmagod	59f7bdb54e	hide flash after 5 sec [fixes SCI-660]	2016-11-11 12:30:48 +01:00
Oleksii Kriuchykhin	ab895ae864	Show only protocols from Protocol Management in users statistics [SCI-658]	2016-11-11 12:14:57 +01:00
mlorb	1ca452db7b	Merge pull request #273 from mlorb/ml_sci_640 ... Add rich text formatting on results and remove markdown [SCI-640]	2016-11-11 12:06:13 +01:00
mlorb	d42adff77e	Merge pull request #275 from mlorb/ml_sci_642 ... Add formatted text in reports [SCI-642]	2016-11-11 12:04:19 +01:00
Mojca Lorber	4b7fa440f6	fix hound	2016-11-11 12:03:01 +01:00
Mojca Lorber	3b7af3e66c	fix validation logic	2016-11-11 11:42:16 +01:00
zmagod	630724df2b	strips the html tags from fearch query	2016-11-11 11:41:23 +01:00
Oleksii Kriuchykhin	b9f982ead7	Additional steps added to tutorial and numbering of the steps fixed [SCI-571]	2016-11-11 10:07:34 +01:00
Oleksii Kriuchykhin	d2491a18a4	Tutorial Save Protocol step added [SCI-571]	2016-11-11 10:06:18 +01:00
Luka Murn	5727158495	Hotfix to nicely render comments form on Firefox as well	2016-11-11 09:47:37 +01:00
Luka Murn	b42922d32c	Add autosize functionality to all textareas ... Closes SCI-637	2016-11-11 09:09:41 +01:00
Luka Murn	55f9633d1d	Add jQuery.autosize plugin	2016-11-11 09:09:41 +01:00
Luka Murn	acd8ce8932	Merge pull request #270 from Ducz0r/lm-sci-644 ... Convert all large text input fields into text areas (10000 characters)	2016-11-11 09:07:25 +01:00
Mojca Lorber	1facd2cefe	fix validation problems	2016-11-10 17:20:17 +01:00
Luka Murn	0e065026bd	Closes SCI-648	2016-11-10 16:18:17 +01:00
Mojca Lorber	fbaffbcaab	add formatted text in reports	2016-11-10 15:20:40 +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
Mojca Lorber	456c6d1ad6	Copy rich text functionality to text results	2016-11-10 12:19:59 +01:00
Mojca Lorber	ab0879e8d6	Integrate library with default settings	2016-11-09 13:09:53 +01:00
Luka Murn	c88f834ba9	Merge pull request #269 from Ducz0r/lm-sci-569 ... Add a refactored invite users modal that can be reused throughout application	2016-11-08 16:57:05 +01:00
Luka Murn	b246853117	Code styling (use link_to, %w)	2016-11-08 16:43:25 +01:00
Zmago Devetak	82a12f0fce	Merge pull request #262 from ZmagoD/zd_add_notification_types_to_constants ... Enables notifications to be extended	2016-11-08 13:08:15 +01:00
Luka Murn	d44a757b25	Add textareas to checklist name & items ... Closes SCI-644	2016-11-08 11:50:29 +01:00
zmagod	330afe80dc	fixes notification model	2016-11-08 11:46:09 +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
Luka Murn	55d8fea359	Make all comment edit fields textareas	2016-11-08 11:29:55 +01:00
Mojca Lorber	6f1c9ffb81	refactoring	2016-11-08 11:20:14 +01:00
Luka Murn	9438ba7e10	Fix a bug	2016-11-08 09:00:00 +01:00
Luka Murn	9260ed31f3	Add Deface hooks to main navbar	2016-11-07 16:57:18 +01:00
Mojca Lorber	63eb4eeaf8	fix hound	2016-11-07 15:33:21 +01:00
Mojca Lorber	27c83992b4	refactoring notification method	2016-11-07 15:31:06 +01:00
okriuchykhin	fd805f4072	Merge pull request #259 from okriuchykhin/ok_SCI_605 ... Added additional activities [SCI-605]	2016-11-07 10:01:16 +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	a188984ede	Allow strings of modal to be replaced	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
Matej Zrimšek	0fe5822825	Added profile statistics data hook.	2016-11-03 17:50:32 +01:00
Mojca Lorber	a234c4c9d9	fix merge conflict problem with avatar on profile page	2016-11-03 15:23:09 +01:00
zmagod	1d6b93829c	added hooks in notifications preview	2016-11-03 14:48:01 +01:00
Oleksii Kriuchykhin	3d25da5db7	Fixed bug with protocol loading from file [SCI-605]	2016-11-03 14:15:22 +01:00
zmagod	3c9bd6f511	enables notification to be extended	2016-11-02 14:44:16 +01:00
Mojca Lorber	44b51d087a	merging	2016-11-02 14:06:20 +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
Zmago Devetak	6e022699eb	Merge pull request #256 from ZmagoD/add_getting_started_flash_hook ... Added getting started hoot to layout/application.html	2016-10-28 16:19:20 +02:00
zmagod	01b27e9e6d	added getting started hoot to layout/application.html	2016-10-28 10:36:15 +02:00
Mojca Lorber	91ec201fd0	make image clickable	2016-10-27 16:18:31 +02:00
Oleksii Kriuchykhin	d28edfb488	Added statistics block in users profile [SCI-566]	2016-10-27 13:44:27 +02:00
Mojca Lorber	888aa31aed	fix hound	2016-10-27 11:18:11 +02:00
Mojca Lorber	5719d4c61f	show edit avatar on mouse hover, add background and center image	2016-10-27 11:09:30 +02:00
Mojca Lorber	8309df0aaf	fix hound	2016-10-26 13:51:05 +02:00
Mojca Lorber	878952f072	change edit avatar in profile	2016-10-26 13:41:17 +02:00
Luka Murn	b4685b0a40	Remove console.log()	2016-10-25 18:13:29 +02:00
Luka Murn	cd360d7279	Fix the save report alert() bug ... Closes SCI-616	2016-10-25 18:12:29 +02: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
Luka Murn	b13fd22408	Add back the release notes URL to navbar ... Closes SCI-604	2016-10-24 16:59:32 +02:00
Zmago Devetak	12c77df883	Merge pull request #237 from ZmagoD/zd_SCI_593_v2 ... Styled global team switch and search [fixes SCI-593]	2016-10-21 16:28:50 +02:00
zmagod	9a4603dd7d	removed unneeded css	2016-10-21 16:27:53 +02:00
Luka Murn	388e092bbf	Merge pull request #238 from Ducz0r/lm-sci-596-fix ... SCI-596 fix	2016-10-21 11:59:01 +02:00
zmagod	49d3879642	fixes padding on mobile, added separator on team switch dropdown, focus search input	2016-10-21 11:46:59 +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
Luka Murn	7b825a217f	Closes SCI-596	2016-10-21 11:08:47 +02:00
Zmago Devetak	af0e9b99b6	Merge pull request #233 from ZmagoD/zd_SCI_591 ... Move tooltip to the right [fixes SCI-591]	2016-10-21 10:38:25 +02:00
okriuchykhin	f876ade05e	Merge pull request #236 from okriuchykhin/ok_SCI_557 ... Fixes issue with new comments and date separator SCI-557	2016-10-21 10:29:46 +02:00
Oleksii Kriuchykhin	5be7904f5a	Fix hound warnings [SCI-557]	2016-10-21 09:37:24 +02:00
zmagod	c642e208dd	styled global team switch and search [fixes SCI-593]	2016-10-21 09:33:18 +02:00
zmagod	db806f3c10	hide private projects	2016-10-21 09:06:19 +02:00
Zmago Devetak	f615b3da41	Merge pull request #230 from ZmagoD/zd_SCI_586 ... Adds new team button to team switch dropdown [fixes SCI-586]	2016-10-21 08:29:05 +02:00
Oleksii Kriuchykhin	0c1ff06f21	Fixes issue with new comments and date separator SCI-557	2016-10-20 22:33:15 +02:00
Zmago Devetak	094e989af5	Merge pull request #227 from ZmagoD/zd_SCI_587 ... Removes org selector form project archive [fixes SCI-587]	2016-10-20 16:32:46 +02:00
zmagod	9214adc591	fixed team name position	2016-10-20 15:35:09 +02:00
mlorb	fa4f3fb0a0	Merge pull request #220 from mlorb/ml_sci_462 ... fix multiplication of edit comment fields [SCI-462]	2016-10-20 15:14:31 +02:00
zmagod	f9fb4d8bd6	move tooltip to the right [fixes SCI-591]	2016-10-20 14:34:45 +02:00
Oleksii Kriuchykhin	347216183f	Fixes different color of buttons in notifications settings [SCI-590]	2016-10-20 14:17:07 +02:00
zmagod	f21c9e394f	adds new team button to team switch dropdown [fixes SCI-586]	2016-10-20 13:47:41 +02:00
zmagod	4c086a6fc1	removes archived projects from index page [fixes SCI-585]	2016-10-20 13:13:44 +02:00
zmagod	8aaf58f75f	removes org selector form project archive [fixes SCI-587]	2016-10-20 12:50:55 +02:00
Luka Murn	640a575a3a	Merge pull request #222 from biosistemika/modular-tasks ... Merge global team switch into master	2016-10-18 11:39:09 +02:00
zmagod	76f6e30078	fixes word-wrap on mozilla	2016-10-17 15:36:33 +02:00
zmagod	557957c857	fixed issue with mozilla browsers	2016-10-17 15:21:19 +02:00
zmagod	54a3237994	displays org name on the project index page if no project	2016-10-17 15:21:19 +02:00
zmagod	8a6899aeea	restyled team switch dropdown	2016-10-17 15:21:19 +02:00
zmagod	a116feac9c	fixed typos and added truncation to org name	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	e85ed788f2	fixed user_generator	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	8cd86a50bb	styled dropdown	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
Oleksii Kriuchykhin	0ec7c019b3	Fix issue with pop-up windows and turbolinks [SCI-463]	2016-10-17 14:25:54 +02:00
Mojca Lorber	177c4b5918	fix multiplication of edit comment fields	2016-10-17 12:59:51 +02:00
Matej Zrimšek	a31753ea39	Added additional color constants. Fix Ruby color constants RGB format so no errors occur for external Gems.	2016-10-17 11:57:47 +02:00
Matej Zrimšek	f2cd9890dd	Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS.	2016-10-17 11:57:47 +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	778ed8814b	Removed some unneeded code.	2016-10-17 11:57:46 +02:00
Matej Zrimšek	05acf5a725	Replaced all Ruby constants instances in JS to be called from JS.	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	845d487fa1	Merge pull request #218 from Ducz0r/lm-mail-previews ... Add notification mailer preview	2016-10-13 14:58:04 +02:00
Oleksii Kriuchykhin	c6fb57318f	Added use of constants in JS [SCI-530]	2016-10-13 13:06:11 +02:00
Luka Murn	02d3e03f75	Bugfix for notification emails ... The URLs in notification emails didn't get server URL prepended, so users could not click on them.	2016-10-13 12:12:28 +02:00
Oleksii Kriuchykhin	37cff75013	Fixes issue with comments options menu [SCI-530]	2016-10-13 12:07:41 +02:00
mlorb	cbc14d9d50	Merge pull request #211 from mlorb/ml_sci_491 ... change 80s glow [SCI-491]	2016-10-13 10:13:14 +02:00
Mojca Lorber	c51aedb178	change thickness of shadow	2016-10-13 10:11:32 +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	8f783f87f7	fixes hound	2016-10-12 15:32:40 +02:00
Mojca Lorber	42f6b679f8	Adding system notifications email function in settings	2016-10-12 11:50:26 +02:00
Mojca Lorber	6bea0a9e1a	fixes merge conflicts	2016-10-12 10:55:40 +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
Mojca Lorber	4f1cbad7da	adding update notifications in settings	2016-10-12 10:42:07 +02:00
Zmago Devetak	f25767fdc3	Merge pull request #209 from ZmagoD/zd_SCI_534_remove_popup ... Removed introductory popup [fixes SCI-534]	2016-10-12 08:13:46 +02:00
Zmago Devetak	b225dc1e29	Merge pull request #210 from ZmagoD/zd_SCI_548_protocol_steps_not_visible ... Fixes protocol steps [fixes SCI-548]	2016-10-12 08:13:28 +02:00
Oleksii Kriuchykhin	4c6a60c249	Added html_safe to notification email template	2016-10-11 16:46:20 +02:00
Oleksii Kriuchykhin	90c853743c	Additional fixes to email markup and logic [SCI-443]	2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin	3f219e1bfe	Hound code style fixes [SCI-443]	2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin	5399033fce	Added user settings for email notifications [SCI-443]	2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin	8dc956010c	Initial code commit [SCI-443]	2016-10-11 16:43:17 +02:00
Mojca Lorber	b1b23b8f41	fixes hound	2016-10-11 10:39:00 +02:00
Mojca Lorber	63ec63047d	change 80s glow	2016-10-11 10:33:26 +02:00
Zmago Devetak	692b31325b	Merge pull request #206 from ZmagoD/zd_SCI_561 ... Fixed assinement icon [fixes SCI-561]	2016-10-11 09:32:47 +02:00
zmagod	ea305b356a	fixes protocol steps [fixes SCI-548]	2016-10-11 09:10:12 +02:00
zmagod	42a30576e3	removed introductory popup [fixes SCI-534]	2016-10-11 08:33:50 +02:00
Luka Murn	448daab7c8	Merge pull request #207 from biosistemika/add-deface-hotfix ... Merge hotfix 1.3.1 into master	2016-10-07 18:26:13 +02:00
zmagod	fe7b367eae	fixed hound	2016-10-07 15:25:53 +02:00
zmagod	130db6a2c3	fixed assignment icon [fixes SCI-561]	2016-10-07 12:27:44 +02:00
zmagod	32f03ec94c	Add Deface hooks	2016-10-06 16:47:36 +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
zmagod	0bdf77562d	add word-wrap to notrification index page [fixes SCI-556]	2016-10-06 13:49:24 +02:00
zmagod	de00a19dd9	fixes styling in settings preferences [SCI-553]	2016-10-06 13:22:44 +02:00
zmagod	5b3889c172	notification index images [fixes SCI-554]	2016-10-06 12:09:01 +02:00
Luka Murn	5c80c8a817	Add "no notifications" to dropdown & notifications index page	2016-10-05 16:58:21 +02:00
Luka Murn	877574e853	Add link to settings from both notification lists	2016-10-05 16:26:26 +02:00
Luka Murn	56d2240de5	Optimize data query in user_notification.rb	2016-10-05 16:21:13 +02:00
Oleksii Kriuchykhin	083a09c2f7	Add link to notifications index page	2016-10-05 16:13:05 +02:00
okriuchykhin	50f28fe883	Merge pull request #193 from okriuchykhin/ok_global_notifications-SCI-442 ... Global notifications screen [SCI-442]	2016-10-05 16:01:41 +02:00
Oleksii Kriuchykhin	4e2ad1d5e6	Fix the issues after code review [SCI-442]	2016-10-05 15:54:31 +02:00
Oleksii Kriuchykhin	c783e9a03d	Code fix after rebase with latest master [SCI-442]	2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin	d2b48e94bd	CSS color fix [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
Zmago Devetak	f3708bcac0	Merge pull request #191 from ZmagoD/zd_SCI_469_ver2 ... Comments date duplication	2016-10-05 15:47:42 +02:00
zmagod	b0f6b1f4d0	fixed comments action on project page	2016-10-05 15:39:54 +02:00
Zmago Devetak	eea310514a	Merge pull request #194 from ZmagoD/zd_SCI_531_533 ... Notification style fixes	2016-10-05 15:27:36 +02:00
zmagod	bca3d19562	fixed comment options dropdown position	2016-10-05 15:26:11 +02:00
Zmago Devetak	71ad5bf034	Merge pull request #190 from ZmagoD/zd_SCI_529 ... Prepare settings screen for notifications	2016-10-05 14:54:47 +02:00
Zmago Devetak	c547d8a07a	Merge pull request #195 from ZmagoD/zd_SCI_532 ... add word wrapping to notifications dropdown [fixes SCI-532]	2016-10-05 14:54:10 +02:00
zmagod	dfcbebbf4f	cleaned up bootstrap extension	2016-10-05 14:49:23 +02:00
okriuchykhin	bfa7e57bd8	Merge pull request #168 from okriuchykhin/ok_SCI-463 ... Fixes issue with unexpected notification windows [fixes SCI-463]	2016-10-05 14:45:23 +02:00
zmagod	9c7a690944	fixed type, fixed settings controller, fixes setting view on mobile devices	2016-10-05 14:33:22 +02:00
zmagod	cba4318185	add word wrapping to notifications dropdown [fixes SCI-532]	2016-10-05 13:22:33 +02:00
zmagod	5bf278298b	fixed navbar on sceens smaller than 1000px	2016-10-05 12:22:27 +02:00
zmagod	f9d956bbca	fix notifications number on [fixes SCI-531]	2016-10-05 11:50:57 +02:00
zmagod	c4f28c3649	made notification images bigger [fixes SCI-533]	2016-10-05 10:16:51 +02:00
zmagod	848beb5d4b	minor fix	2016-10-05 09:46:18 +02:00
zmagod	d7a4f85ba1	added links to notification project name and task	2016-10-05 09:40:44 +02:00
zmagod	d90f17d1eb	clean comments date duplication [fixes SCI-469]	2016-10-05 08:42:32 +02:00
Jure Grabnar	62356c36a1	Add file extension to global search	2016-10-04 19:04:08 +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	6229e6a3a1	styled notification settings button [fixes SCI-529]	2016-10-04 16:12:56 +02:00
zmagod	a68e7abc57	first run notification settings	2016-10-04 15:52:48 +02:00
Jure Grabnar	0c7cd52dba	Add WOPI icons/buttons to files	2016-10-04 12:34:43 +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
mlorb	00b0f6ab07	Merge pull request #184 from mlorb/ml_sci_472 ... Protocol steps/results - change title for comment section, remove info tab [SCI-472]	2016-10-03 17:20:45 +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
Mojca Lorber	3b0185a45b	change title of modal	2016-10-03 16:33:58 +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
zmagod	36fb2713b3	start fixing comments dates	2016-10-03 16:10:20 +02:00
Zmago Devetak	84313a28a0	Merge pull request #186 from ZmagoD/zd_SCI_441_vol2 ... code notifications in toolbar	2016-10-03 16:09:04 +02:00
Zmago Devetak	91c7d8a952	Merge pull request #176 from ZmagoD/zd_SCI_474 ... Unify the comments	2016-10-03 15:26:17 +02:00
Oleksii Kriuchykhin	a39c948c5f	System notifications code rework	2016-10-03 15:21:26 +02:00
Jure Grabnar	f727289935	Add lock check for editing result	2016-10-03 13:43:35 +02:00
zmagod	77df0bc82c	cleans more comment link	2016-10-03 12:34:16 +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
Mojca Lorber	093fbd6b8e	fixes hound again	2016-10-03 10:40:32 +02:00
Mojca Lorber	2041f2a09d	fixes hound	2016-10-03 10:15:46 +02:00
Mojca Lorber	053cd8ed84	removes handler	2016-10-03 10:12:13 +02:00
Mojca Lorber	5b32be2137	adding subtitle in modal	2016-10-03 09:28:58 +02:00
zmagod	b9bc2f17c8	fixing hound	2016-10-03 08:27:13 +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	5c9e995e56	Don't delete asset on locked	2016-10-01 13:23:04 +02:00
Jure Grabnar	a2d6d9a29a	Add WOPI controlls to result	2016-10-01 11:23:32 +02:00
Jure Grabnar	a6ebff06a7	Add error message to wopi discovery ... Fix ambigious open call	2016-09-30 10:39:14 +02:00
Oleksii Kriuchykhin	f5cc2fe225	Code style fixes	2016-09-30 09:34:58 +02:00
Luka Murn	f70829d1a9	Merge pull request #179 from okriuchykhin/ok_SCI-380 ... Fixes ordering of checklist items in search results [SCI-380]	2016-09-30 08:28:07 +02:00
Luka Murn	49c5474219	Merge pull request #178 from mz3944/mz_help_button_SCI_13_v2 ... Fixed wrong CSS formatting and added release notes link to help link.	2016-09-30 08:27:57 +02:00
Luka Murn	e32e0a232c	Merge pull request #177 from okriuchykhin/ok_SCI-480 ... Fixes issue with scrollbar on sidebar [SCI-480]	2016-09-30 08:25:54 +02:00
Luka Murn	12c9f9a42f	Merge pull request #175 from okriuchykhin/ok_SCI-423 ... Fix issue with spinner in avatar upload [SCI-423]	2016-09-30 08:25:15 +02:00
Luka Murn	380d0740f8	Merge pull request #174 from okriuchykhin/ok_SCI-477 ... Fix issue with words break in task description and comments [SCI-477]	2016-09-30 08:25:04 +02:00
Luka Murn	c83342d9f0	Merge pull request #173 from okriuchykhin/ok_SCI-484 ... Fix issue with duplicate error messages in experiments modal [SCI-484]	2016-09-30 08:24:51 +02:00
Luka Murn	b1d25cb18f	Merge pull request #172 from ZmagoD/zd_SCI_465 ... Generate new experiment img after task restored [fixes SCI-465]	2016-09-30 08:24:31 +02:00
Oleksii Kriuchykhin	036bda3afa	Initial code for system notifications [SCI-444]	2016-09-29 16:51:27 +02:00
Mojca Lorber	35477b1005	Remove Info tab and change comment title on results view	2016-09-29 16:43:19 +02:00
Jure Grabnar	ff47f29dc2	Add wopi file activity ... SCI-393 #close	2016-09-29 16:16:42 +02:00
zmagod	60a503f115	added assignment image	2016-09-29 16:05:43 +02:00
zmagod	e1a1b93d44	fixed migrations	2016-09-29 14:49:58 +02:00
Mojca Lorber	c9fbf845f1	Remove Info tab and change comment title	2016-09-29 14:37:29 +02:00
Matej Zrimšek	a6324d61c5	Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab.	2016-09-29 14:27:26 +02:00
Mojca Lorber	5d905f0094	refactoring	2016-09-29 14:18:04 +02:00
Luka Murn	f1b74f1906	Fix image names in introductory popup ... This will make sure browsers don't display old, cached images to clients.	2016-09-29 13:44:38 +02:00
Jure Grabnar	ed8df3cc62	Add favicon url to iframe	2016-09-29 12:19:29 +02:00
Jure Grabnar	3bc683be8f	Fix access_token_ttl calculation	2016-09-29 10:57:08 +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
Mojca Lorber	f4345f3aef	fixes hound	2016-09-28 16:09:39 +02:00
zmagod	cab1e9b521	start implement toolbar view	2016-09-28 16:03:52 +02:00
Mojca Lorber	efa7a1d7b5	add sample information in pop-up	2016-09-28 15:46:41 +02:00
zmagod	2a86aaf7e4	changed popout content [fixes SCI-520]	2016-09-28 15:12:30 +02:00
zmagod	485497334d	generated notification related migrations and model tests	2016-09-28 14:18: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
Jure Grabnar	0e9756ad94	Fix bad step view rebase	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	402a77526a	cleaned console.log	2016-09-27 16:22:09 +02:00
zmagod	2235778110	fixed project and task comments + fixed date issue	2016-09-27 16:19:31 +02:00
Oleksii Kriuchykhin	366a49f3a1	Fixes ordering of checklist items in search results [SCI-380]	2016-09-27 13:00:51 +02:00
zmagod	0d322eba13	fixed hound	2016-09-27 11:03:10 +02:00
zmagod	4903cb970c	removed comments helper	2016-09-27 10:47:18 +02:00
Oleksii Kriuchykhin	f9e5d204bb	Fixes issue with scrollbar on sidebar [SCI-480]	2016-09-27 10:43:07 +02:00
zmagod	1eb9f772f4	refactor sciNote comments js and unified all comments behavior [fixes SCI-474]	2016-09-27 10:30:48 +02:00
zmagod	1cdfde827f	fixes protocol and results comments	2016-09-27 09:26:25 +02:00
zmagod	980ff63104	fixed task comments	2016-09-27 09:18:46 +02:00
Oleksii Kriuchykhin	792f949a61	Fix issue with spinner in avatar upload [SCI-423]	2016-09-27 09:12:31 +02:00
zmagod	02bfa1949e	fixed project comments	2016-09-27 09:00:02 +02:00
Oleksii Kriuchykhin	908ee05a23	Fix issue with words break in task description and comments [SCI-477]	2016-09-26 16:03:22 +02:00
Oleksii Kriuchykhin	8a3a9451e9	Fix issue with duplicate error messages in experiments modal [SCI-484]	2016-09-26 12:58:22 +02:00
zmagod	30a8f52216	generate new experiment img after task restored [fixes SCI-465]	2016-09-26 09:48:49 +02:00
Mojca Lorber	cc5cdf2577	Merge branch 'master' of https://github.com/biosistemika/scinote-web into ml_sci_321	2016-09-26 09:39:05 +02:00
Oleksii Kriuchykhin	db1e24202a	Minor code cleanup [fixes SCI-463]	2016-09-26 09:08:38 +02:00
Mojca Lorber	c2b742374f	adding popup sample info	2016-09-23 17:45:02 +02:00
mz3944	1c1a7c231e	Merge pull request #169 from mz3944/mz_help_button_SCI_13 ... Added help dropdown. [SCI-13]	2016-09-23 13:04:38 +02:00
okriuchykhin	4f0fb7074b	Merge pull request #167 from okriuchykhin/ok_SCI-470 ... Fix issue with long tags in dropdown list [fixes SCI-470]	2016-09-23 13:00:06 +02:00
Matej Zrimšek	fc86b7b1fd	Added help dropdown. [SCI-13]	2016-09-23 12:52:38 +02:00
Oleksii Kriuchykhin	2c144aa2f3	Fix issue with unexpected notification windows appearing after report editor exit [fixes SCI-463]	2016-09-23 11:56:13 +02:00
Oleksii Kriuchykhin	e8ac754829	Fix issue with long tags in dropdown list [fixes SCI-470]	2016-09-23 11:05:17 +02:00
okriuchykhin	a7f3f793c8	Merge pull request #161 from okriuchykhin/ok_SCI-380 ... Fixes issue with reordering of checklist items [fixes SCI-380]	2016-09-23 10:37:56 +02:00
okriuchykhin	5896cdc4bc	Merge pull request #158 from okriuchykhin/ok_SCI_314 ... Fixes issue with import of empty protocol [fixes SCI-314]	2016-09-23 10:37:35 +02:00
Zmago Devetak	2b678998d3	Merge pull request #166 from ZmagoD/zd_SCI_471 ... fixes load comments [fixes SCI-471]	2016-09-23 09:17:27 +02:00
zmagod	4f2df691ba	add error validations	2016-09-23 08:34:39 +02:00
zmagod	6143b257d0	fixes edit modal [fixes SCI-467]	2016-09-23 08:32:46 +02:00
Matej Zrimšek	0317872bc0	Added check if no comments are present for file result, which caused JS error.	2016-09-22 18:12:35 +02:00
mz3944	cde7f3805f	Merge pull request #165 from mz3944/mz_replace_hardcoded_values_with_constants_v2 ... Added missing validation for protocol description.	2016-09-22 17:36:18 +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
okriuchykhin	087ee08976	Merge pull request #164 from okriuchykhin/ok_SCI-400 ... Fixes issue with new experiment modal and with move of experiments [fixes SCI-400]	2016-09-22 17:01:58 +02:00
Oleksii Kriuchykhin	841e495234	Fix brace position [fixes SCI-380]	2016-09-22 16:48:15 +02:00
okriuchykhin	b5c861583d	Merge pull request #157 from okriuchykhin/ok_SCI_430 ... Fixes issue with unneeded sort icon [fixes SCI-430]	2016-09-22 16:39:26 +02:00
Oleksii Kriuchykhin	28ab599373	Change double quotes to single [fixes SCI-314]	2016-09-22 16:36:37 +02:00
okriuchykhin	729cbef27b	Merge pull request #156 from okriuchykhin/ok_SCI-459 ... Fixes issue with too many " | " signs in error message [fixes SCI-459]	2016-09-22 16:12:17 +02:00
okriuchykhin	37eedf17a0	Merge pull request #155 from okriuchykhin/ok_SCI-451 ... Fixes issue with zoom buttons on canvas [fixes SCI-451]	2016-09-22 16:11:45 +02:00
Matej Zrimšek	09405c667e	Added missing validation for protocol description. [SCI-408]	2016-09-22 15:52:12 +02:00
Oleksii Kriuchykhin	0dd1196ae5	Fixes issue with move of experiments between projects [fixes SCI-400]	2016-09-22 15:10:15 +02:00
zmagod	303cb4308a	fixes load comments [fixes SCI-471]	2016-09-22 13:46:27 +02:00
Oleksii Kriuchykhin	b334b037f8	Fixes issue with old data in modal fields [fixes SCI-400]	2016-09-22 10:54:03 +02:00
Matej Zrimšek	c614843044	Minor refactoring with hound alert fixes.	2016-09-21 19:48:18 +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
Matej Zrimšek	c6a23aab98	Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408]	2016-09-21 19:37:36 +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
Oleksii Kriuchykhin	011bb2d910	Fixes issue with reordering of checklist items [fixes SCI-380]	2016-09-21 14:06:47 +02:00
zmagod	bf8e2a208f	fixes restore experiment error [fixes SCI-464]	2016-09-21 08:34:32 +02:00
zmagod	2bfe8f0636	fixing hound	2016-09-21 08:16:23 +02:00
zmagod	9f56df02d2	removes comment tab and add comment in the info tab [fixes SCI-436]	2016-09-20 18:53:51 +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
Oleksii Kriuchykhin	9b7360eebf	Fixes issue with import of empty protocol [fixes SCI-314]	2016-09-20 13:41:29 +02:00
zmagod	0ca65aeca5	fixed step comment sorting	2016-09-20 13:31:50 +02:00
Oleksii Kriuchykhin	411ee4ee77	Fixes issue with unneeded sort icon [fixes SCI-430]	2016-09-20 11:30:11 +02:00
zmagod	cd64e035c0	set form validations	2016-09-20 09:50:03 +02:00
zmagod	f48553e807	fixed ajax call	2016-09-19 16:12:07 +02:00
Oleksii Kriuchykhin	3f0a2c7dfc	Fixes issue with too many " | " signs in error message [fixes SCI-459]	2016-09-19 13:53:24 +02:00
Oleksii Kriuchykhin	a3b00d0ff8	Fixes issue with zoom buttons on canvas [fixes SCI-451]	2016-09-16 16:27:54 +02:00
Matej Zrimšek	ffe6799313	Fixed hound alerts.	2016-09-16 15:57:54 +02:00
Matej Zrimšek	dd6e8a3a9a	Added step name word wrapping (needs to be improved).	2016-09-16 15:57:54 +02:00
Matej Zrimšek	20ca37f185	Readded client-side result's comment validation.	2016-09-16 15:57:54 +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
zmagod	938aa32190	js tweaks	2016-09-16 15:22:24 +02:00
zmagod	635f6b92d6	fixed comments display	2016-09-16 11:55:10 +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
zmagod	b9b466cd8e	Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas	2016-09-16 09:28:19 +02:00
mz3944	556238f39f	Merge pull request #150 from mz3944/mz_local_file_upload_fix ... URL presigning is now used only when using S3 file uploading (caused …	2016-09-16 09:17:23 +02:00
zmagod	e90f0bd3d5	refactor step view	2016-09-16 09:04:21 +02:00
Zmago Devetak	01656c1018	Merge pull request #153 from ZmagoD/zd_SCI_448 ... Wrong name of experiment and task - gets undefined as prefix	2016-09-15 15:00:34 +02:00
mlorb	587369e7a6	Merge pull request #152 from mlorb/ml_sci_428 ... fixes responsiveness on mobile phone for sample view [SCI-428]	2016-09-15 12:11:48 +02:00
Zmago Devetak	7c4a62d138	Merge pull request #139 from ZmagoD/zd_SCI_410 ... fixed moved experiment thumbnail [fixes SCI-410]	2016-09-15 11:58:48 +02:00
zmagod	779b713148	refactor code	2016-09-15 11:55:02 +02:00
zmagod	0a2ab57e28	styled new comments layout	2016-09-15 11:45:51 +02:00
zmagod	d146970f6b	add generate workflow image method for moved modules	2016-09-15 09:32:29 +02:00
zmagod	e3ae22763e	removed comments tab in protocol step	2016-09-15 08:46:14 +02:00
mlorb	098e17c0d8	Merge pull request #149 from mlorb/ml_sci_420 ... fixes links and missing experiment level in search results [SCI-420]	2016-09-14 15:42:16 +02:00
Zmago Devetak	d0a180a1e8	Merge pull request #148 from ZmagoD/zd_SCI_342 ... fixes sidebar expanded elements when adding new experiments	2016-09-14 13:48:34 +02:00
Mojca Lorber	65415415b6	fixes hound again again	2016-09-14 11:37:17 +02:00
Mojca Lorber	386cedda71	fixes hound again	2016-09-14 11:34:24 +02:00
Mojca Lorber	aba5305cd6	fixes hound	2016-09-14 11:24:19 +02:00
zmagod	c4fabdb67a	clean unneeded Observer configurations	2016-09-14 11:16:42 +02:00
zmagod	e1d871dcdb	clear undefind from experiment name and refactor sidebar in reports [fixes SCI-448]	2016-09-14 11:11:35 +02:00
Mojca Lorber	a9029e0928	fixes responsiveness on mobile phone for sample view	2016-09-14 11:08:40 +02:00
mz3944	ea898ed3ce	Merge pull request #145 from mz3944/mz_checklists_items_move_and_step/result_comment_fix ... Fixed step's checklist items editing (items not multiplying and new i…	2016-09-13 19:05:10 +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
Mojca Lorber	36378d03e2	fixes links and missing experiment level in search results	2016-09-13 17:13:58 +02:00
zmagod	d5c5c55bf2	refactor	2016-09-13 16:32:33 +02:00
Zmago Devetak	b26bf7b183	Merge pull request #136 from ZmagoD/zd_SCI_370 ... Enabled to delete results in task archive [fixes SCI-370]	2016-09-13 15:22:08 +02:00
zmagod	29a2904513	fixed moving action of workflows and tasks	2016-09-13 14:51:53 +02:00
zmagod	7c363d5ade	fixed security issue	2016-09-13 13:57:31 +02:00
Zmago Devetak	319893bf81	Merge pull request #143 from ZmagoD/zd_SCI_372 ... Set move and clone permissions	2016-09-13 13:37:23 +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
zmagod	65383f1824	fixes sidebar expanded elements when adding new experiments [fixes SCI-342]	2016-09-13 13:09:57 +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	d37c7b853b	Merge pull request #140 from ZmagoD/zd_SCI_341 ... adds label to current project in clone experiment modal [fixes SCI-341]	2016-09-13 11:59:01 +02:00
Zmago Devetak	f86c6b954e	Merge pull request #141 from ZmagoD/zd_SCI_340 ... styled dottel line in sidebar [fixes SCI-340]	2016-09-13 11:58:26 +02:00
Jure Grabnar	6519e8dbb1	Add e-notation preprocessing to formulas ... SCI-350 #close	2016-09-13 09:46:22 +02:00
Jure Grabnar	fa3515d2eb	Add formulas to reports	2016-09-13 09:46:21 +02:00
Jure Grabnar	3b364be70b	Add formulas to steps tables	2016-09-13 09:44:17 +02:00
Jure Grabnar	5c88bdeeae	Add formulas for readonly results tables	2016-09-13 09:44:17 +02:00
Jure Grabnar	e096f936f9	Add formulas to results	2016-09-13 09:44:17 +02:00
Matej Zrimšek	af8ab3e081	Fixed step's checklist items editing (items not multiplying and new item insertion always at bottom) [fixes SCI-427]. Improved step/result comment GUI [SCI-446].	2016-09-12 16:55:46 +02:00
zmagod	1b31f8827d	set experiment description to 255	2016-09-08 14:35:52 +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
mlorb	f4029a04fd	Merge pull request #142 from mlorb/ml_sci_415 ... fixes navbar size when resizing window [SCI-415]	2016-09-08 12:46:36 +02:00
Matej Zrimšek	6eca3661bf	Some JS error refactoring and accordingly updated error rendering when experiment description is too long.	2016-09-08 12:43:31 +02:00
Mojca Lorber	0435011fee	fixes hound	2016-09-08 12:43:30 +02:00
Mojca Lorber	302a777615	fixes button collision	2016-09-08 12:37:06 +02:00
zmagod	faed0500c7	set move and clone permissions to also validate the user on the organizational level [fixes SCI-372]	2016-09-08 09:23:29 +02:00
Mojca Lorber	4c66ca6f80	fixes navbar size when resizing window	2016-09-08 09:17:58 +02:00
Matej Zrimšek	40355dcc97	If file is recognized as office file, it's allowed to be any office file type.	2016-09-07 14:04:11 +02:00
Luka Murn	0c1759c15a	Merge pull request #135 from Ducz0r/lm-sci-397 ... Resize archived experiment panels	2016-09-07 11:14:53 +02:00
mz3944	d3a3dd4428	Merge pull request #138 from mz3944/mz_result_edit_and_name_length_check_fix ... Fixed result file deletion and result name updating [fixes SCI-409]. …	2016-09-07 11:07:23 +02:00
mz3944	5f446ab1f0	Merge pull request #134 from mz3944/mz_delete_step_file_fix ... Fixes files deletion when rails worker is running [fixes SCI-411] and…	2016-09-07 11:00:50 +02:00
zmagod	d92597ac30	styled dottel line in sidebar [fixes SCI-340]	2016-09-07 09:01:40 +02:00
zmagod	d482dff2e6	adds label to current project in clone experiment modal [fixes SCI-341]	2016-09-07 08:26:36 +02:00
zmagod	487d3e18f4	fixed moved experiment thumbnail [fixes SCI-410]	2016-09-07 07:55:45 +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	daa144ce7c	added missing bracket	2016-09-06 11:57:03 +02:00
zmagod	856d226946	fixed move experiment form error duplication	2016-09-06 11:48:56 +02:00
zmagod	a5a24c7610	clear unused variable	2016-09-06 11:46:28 +02:00
zmagod	b672d85405	fixed error message duplication	2016-09-06 11:46:28 +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
zmagod	de6c03a73b	setup experiment modal input validation	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
mlorb	f0e28b90a0	Merge pull request #133 from mlorb/ml_sci_415 ... minimize buttons on mobile phone [SCI-415]	2016-09-06 11:26:32 +02:00
Luka Murn	bda5120548	Resize archived experiment panels ... Closes SCI-397.	2016-09-06 10:55:05 +02:00
Matej Zrimšek	9fb30c7661	Fixes files deletion when rails worker is running [fixes SCI-411] and fixes picture's style files deletion.	2016-09-06 10:40:01 +02:00
Mojca Lorber	47983812e7	minimize buttons on mobile phone	2016-09-06 10:10:49 +02:00
Zmago Devetak	1a19753df9	Merge pull request #128 from ZmagoD/zd_SCI_105 ... Trim long words in reports [fixes SCI-105]	2016-09-06 10:10:06 +02:00
zmagod	a7b6135b2f	cleared console.log	2016-09-06 10:08:32 +02:00
Luka Murn	81883911c4	Merge pull request #132 from Ducz0r/lm-sci-228 ... Updates to invite users to team modal window	2016-09-05 15:53:15 +02:00
mlorb	aea288371f	Merge pull request #129 from mlorb/ml_sci_310 ... adds tasks, experiment and project category in protocol search results [SCI-310]	2016-09-05 15:31:35 +02:00
Luka Murn	1d8600b39f	Fix bug when inviting existing users onto teams ... Closes SCI-228	2016-09-05 14:52:56 +02:00
mz3944	50e0c26e89	Merge pull request #125 from mz3944/mz_removed_avatar_upload_popop_sci_399 ... Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]	2016-09-05 11:49:04 +02:00
Mojca Lorber	6a802e9fa7	fixes redirection to project page for all categories in search results	2016-09-05 11:40:49 +02:00
Mojca Lorber	740392c687	optimization	2016-09-05 10:58:37 +02:00
zmagod	667fb67052	sets front end validation for experiment move action [fixes SCI-400]	2016-09-02 16:31:17 +02:00
Zmago Devetak	fb6bc31bec	Merge pull request #127 from ZmagoD/zd_SCI_247_again ... Table from step stays in report, although it is deleted from step.	2016-09-02 15:59:17 +02:00
Zmago Devetak	ea26a532e4	Merge pull request #126 from ZmagoD/zd_SCI_332 ... By default all experiments should be collapsed	2016-09-02 15:58:03 +02:00
Mojca Lorber	6763d8e7a1	fixes hound again	2016-09-02 11:56:32 +02:00
Mojca Lorber	4bce00ac61	fixes hound	2016-09-02 11:54:20 +02:00
Mojca Lorber	83034f705d	adds tasks, experiment and project category in protocol search results	2016-09-02 11:45:54 +02:00
zmagod	28fa00c30c	trim long words in reports [fixes SCI-105]	2016-09-01 15:45:39 +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
Luka Murn	61f4fbd1d4	Remove warning info when removing pending user from organization	2016-09-01 13:23:53 +02:00
zmagod	ac7ac95da8	[fixes SCI-332]	2016-09-01 10:38:20 +02:00
Matej Zrimšek	4fdf478426	Minor refactoring.	2016-08-31 17:57:06 +02:00
Matej Zrimšek	828eebeb16	Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]	2016-08-31 17:21:17 +02:00
zmagod	55ba2de41f	fixes object duplication	2016-08-31 16:34:08 +02:00
zmagod	fabfa83171	introdutory popup cookie	2016-08-31 15:18:21 +02:00
zmagod	e8f971829a	added project to session storage	2016-08-31 15:13:17 +02:00
Luka Murn	5cb79f6282	Fix the default parameters in JS ... This was causing major issues in IE.	2016-08-31 14:04:45 +02:00
zmagod	eb394ce209	fixes searching tables bug [fixes SCI-402]	2016-08-31 11:01:10 +02:00
zmagod	b05c3df4d3	adds toggle id only to elements with modules	2016-08-31 10:25:40 +02:00
zmagod	eb39eedfdf	[fixes SCI-398] again	2016-08-31 08:46:51 +02:00
zmagod	21f84bacb6	set sidebar collapsed elements	2016-08-31 08:24:59 +02:00
jbargu	2cd5d85d68	Merge pull request #120 from jbargu/jg_SCI_328_move_experiment_reconnect ... When moving a task, it should connect the source and destination	2016-08-30 18:01:38 +02:00
mlorb	905acfd43d	Merge pull request #109 from mlorb/ml_sci_286 ... fixes notification when adding new sample [SCI-286]	2016-08-30 17:54:45 +02:00
Mojca Lorber	dd8e5d5e12	fixes hound	2016-08-30 17:12:26 +02:00
Mojca Lorber	1b1e6daa21	fixes notification disappearance and error notifications	2016-08-30 16:55:59 +02:00
Jure Grabnar	9a82e7d72b	Connect tasks on moving ... SCI-328 #close	2016-08-30 15:57:27 +02:00
mlorb	8fc29248b3	Merge pull request #119 from mlorb/ml_sci_396 ... fixes missing experiment name in side bar [SCI-396]	2016-08-30 15:05:04 +02:00
Zmago Devetak	11b314fa20	Merge pull request #107 from ZmagoD/zd_bug_fix ... fixes new task button after tutorial ends	2016-08-30 15:04:11 +02:00
Zmago Devetak	375a72db18	Merge pull request #114 from ZmagoD/zd_SCI_294_vol2 ... fixes reports file name [fixes SCI-294]	2016-08-30 14:59:07 +02:00
Zmago Devetak	5b4eb07960	Merge pull request #118 from ZmagoD/zd_SCI_398 ... fixes workflow img bug [fixes SCI-398]	2016-08-30 14:55:33 +02:00
Mojca Lorber	52f228725a	fixes hound	2016-08-30 14:04:47 +02:00
Mojca Lorber	aeda6f77d2	fixes missing experiment name in side bar	2016-08-30 13:51:16 +02:00
zmagod	a947354fb5	fixes update times [fixes SCI-398]	2016-08-30 13:23:48 +02:00
Luka Murn	c6e575bd2a	Merge pull request #115 from Ducz0r/lm-deleting-comments-fix ... Fix for deleting comments	2016-08-30 13:15:35 +02:00
Luka Murn	2b382fee0f	Merge pull request #113 from Ducz0r/lm-add-first-time-activities ... Fix first time data generator & fake data generator	2016-08-30 13:07:52 +02:00
Luka Murn	0e0228cb8c	Codestyle fixes	2016-08-30 13:06:49 +02:00
zmagod	95ab35e3d6	cleanup update timestamp	2016-08-30 12:58:52 +02:00
Mojca Lorber	43c3a0bb81	fixes merge again	2016-08-30 12:54:08 +02:00
Mojca Lorber	81f9e59dcd	fixes merge	2016-08-30 12:14:15 +02:00
Mojca Lorber	e8d187b5f6	Merge branch 'ml_sci_395' ... Conflicts: app/views/canvas/edit/modal/_move_module.html.erb app/views/canvas/edit/modal/_move_module_group.html.erb	2016-08-30 11:41:25 +02:00
Luka Murn	77ec5bcff9	Reposition comment dropdowns horizontally if needed ... Closes SCI-258	2016-08-30 11:39:50 +02:00
zmagod	f356acb882	fixes reports file name [fixes SCI-294]	2016-08-30 11:36:39 +02:00
Zmago Devetak	6878adda46	Merge pull request #112 from ZmagoD/zd_SCI_338_vol2 ... Tutorial	2016-08-30 11:07:51 +02:00
Luka Murn	4ee4c6caba	Remove JS validator from step comments	2016-08-30 11:06:30 +02:00
jbargu	fa357dd54f	Merge pull request #110 from jbargu/jg_SCI_328_move_task_no_experiment ... Remove move on empty experiments	2016-08-30 11:06:16 +02:00
zmagod	4b6567e488	fixed workflowimg link	2016-08-30 11:03:33 +02:00
zmagod	6f1c4df942	fixed new task button in canvas	2016-08-30 10:48:28 +02:00
Zmago Devetak	e96429409e	Merge pull request #108 from ZmagoD/zd_SCI_247_vol2 ... Fixes step destroing bug and fixes reports [fixes SCI-247]	2016-08-30 09:57:56 +02:00
zmagod	57c1707e81	fixes secondary navigation [fixes SCI-338]	2016-08-30 09:53:56 +02:00
Luka Murn	c86d21d689	Fix bug in organization.rb ... Bug was related to introduction of experiment level.	2016-08-30 09:46:54 +02:00
Mojca Lorber	a35bf7182f	fixes troubles	2016-08-30 09:43:39 +02:00
Mojca Lorber	596d403d5f	change position of buttons	2016-08-30 09:16:53 +02:00
zmagod	d33bb50519	disabled secondary navigation in samples tutorial	2016-08-30 08:57:05 +02:00
zmagod	5518d1cd1e	fixed 16 step of tutorial	2016-08-30 08:52:44 +02:00
Jure Grabnar	0c184dcdcf	Remove Move button on empty experiments ... SCI-328 #close.	2016-08-30 08:26:59 +02:00
Luka Murn	30e8e33774	Add comment activities to first time data generator	2016-08-30 08:19:35 +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
zmagod	17aacc8ff5	fixes step destroing bug and fixes reports [fixes SCI-247]	2016-08-29 12:04:46 +02:00
zmagod	5af9d10c6a	fixes new task button after tutorial ends	2016-08-29 11:46:45 +02:00
zmagod	2ac20d1af1	adds new image + new panel title [fixes SCI-336]	2016-08-29 09:28:29 +02:00
Luka Murn	a0311970f8	Add missing commits for showing image and not able to preview	2016-08-26 16:49:32 +02:00
zmagod	d886d05ccb	Merge branch 'zd_SCI_338'	2016-08-26 16:32:49 +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
Zmago Devetak	0cfc758f43	Merge pull request #102 from ZmagoD/zd_SCI_336 ... implement first time popup logic	2016-08-26 09:19:36 +02:00
zmagod	b0bd92e3f4	fixed edit action	2016-08-26 09:17:55 +02:00
zmagod	2031c42920	fixed confirmation text	2016-08-26 09:13:45 +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
zmagod	99976722a8	uncomment js file	2016-08-25 18:49:49 +02:00
zmagod	1738ca66d2	one-time introductory popup [fixes SCI-336]	2016-08-25 18:44:21 +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
mlorb	b1218cb3d6	Merge pull request #59 from biosistemika/ml_sci_244 ... fixes tutorial bug of inappropriate window [SCI-244]	2016-08-25 17:16:45 +02:00
Luka Murn	b533b0aca6	Fix another minor bug	2016-08-25 17:15:53 +02:00
Luka Murn	7cd94e8b0d	Fix a minor bug on canvas	2016-08-25 17:09:55 +02:00
Luka Murn	9cd99fc532	Display "no comments" if you delete the last comment	2016-08-25 17:01:30 +02:00
Zmago Devetak	1b21e55fea	Merge pull request #100 from ZmagoD/zd_SCI_381 ... Adds experiment and team to tag search resuls [fixes SCI-381]	2016-08-25 15:43:50 +02:00
zmagod	7a47ff6bc5	fixed new task error	2016-08-25 15:30:32 +02:00
zmagod	8ff645fb89	disabled experiment dropdown actions	2016-08-25 15:16:51 +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	6d86a02d7c	Add individual permission checks in dropdowns ... Closes SCI-258.	2016-08-25 13:51: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
Luka Murn	9e3bb8edb7	Add dependant: :destroy to comments	2016-08-25 13:51:30 +02:00
Luka Murn	8a73a3ab5c	Update permission_helper.rb and routes.rb	2016-08-25 13:51:30 +02:00
Luka Murn	319bcc7850	Add permissions for comments to permission_helper.rb	2016-08-25 13:51:30 +02:00
Luka Murn	5569a1e6d2	Revert 2 files that contained no changes	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	5fabe06b8d	implement first time popup logic	2016-08-25 11:44:49 +02:00
Mojca Lorber	4a5d720724	change position of overview and samples	2016-08-25 11:19:53 +02:00
zmagod	1120ef1407	adds experiment and team to tag search resuls [fixes SCI-381]	2016-08-25 10:40:03 +02:00
mlorb	c38a4e2614	Merge pull request #94 from mlorb/ml_sci_375 ... add move experiment instructions [SCI-375]	2016-08-25 09:45:16 +02:00
Luka Murn	c082bceafc	Merge pull request #98 from Ducz0r/lm-sci-385 ... Fix bug with linked tasks	2016-08-25 09:29:50 +02:00
zmagod	f515366d91	fixes workflowing after updating description, fixes canvas bug	2016-08-25 09:11:42 +02:00
mlorb	0a066f436f	Merge pull request #96 from mlorb/ml_sci_369 ... buttons update on experiment overview [SCI-369]	2016-08-25 08:54:16 +02:00
zmagod	92bb3dda99	hide last next button	2016-08-25 08:46:11 +02:00
zmagod	dbdbff12eb	add experiment level tutorial step [fixes SCI-338]	2016-08-24 19:03:58 +02:00
Luka Murn	3dddffaa34	Fix bug with linked tasks ... This bug was a legacy of experiment level introduction. Closes SCI-385, SCI-366.	2016-08-24 17:22:16 +02:00
mlorb	2d90ad1a65	Merge pull request #88 from mlorb/ml_sci_362 ... fixes tile size in edit canvas [SCI-362]	2016-08-24 17:07:11 +02:00
Mojca Lorber	2a897432e1	update buttons on canvas view	2016-08-24 17:00:27 +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
Mojca Lorber	d04df349d5	fixes medium and small zoom	2016-08-24 14:18:12 +02:00
Zmago Devetak	0de7ea31ea	Merge pull request #90 from ZmagoD/zd_SCI_376 ... fixes cloned experiment protocol [fixes SCI-376]	2016-08-24 14:12:19 +02:00
zmagod	9393a96302	adds edit workflow link if no workflow [fixes SCI-374]	2016-08-24 14:10:50 +02:00
Mojca Lorber	0558d49e26	buttons update on experiment overview	2016-08-24 13:50:25 +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
Zmago Devetak	afaeab492d	Merge pull request #87 from ZmagoD/zd_SCI_371 ... hide the dropdown if user has no permissions(technician) [fixes SCI-371]	2016-08-24 11:56:29 +02:00
jbargu	180efac87b	Merge pull request #92 from jbargu/jg_exp_overview_navbar_sci_353 ... Show whole tree structure for experiment in sidebar	2016-08-24 11:50:39 +02:00
Jure Grabnar	dff5abf3d9	Fix module moving position not being updated	2016-08-24 11:42:21 +02:00
Mojca Lorber	f554dc6018	add move experiment instructions	2016-08-24 11:36:50 +02:00
Jure Grabnar	3e5e9aed22	Fix 404 on move experiment ... [fixes SCI-378]	2016-08-24 11:09:03 +02:00
zmagod	27d77bc73f	added new permission for dropdown actions	2016-08-24 10:56:30 +02:00
Jure Grabnar	e60533af57	Add whole tree structure for experiment ... SCI-353 #close	2016-08-24 10:47:30 +02:00
Jure Grabnar	a091571d9c	Add consistent links for archive for all entities	2016-08-24 09:14:29 +02:00
Jure Grabnar	0cdb18ffcd	Update experiment links on sidebar between actions	2016-08-24 09:05:57 +02:00
Jure Grabnar	a41d851830	Fix secondary navigation for experiment level (overview)	2016-08-24 08:54:02 +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	9dc7708b73	Merge pull request #85 from ZmagoD/zd_SCI_360 ... fixes project overview style and add no description link [fixes SCI-360]	2016-08-23 16:24:22 +02:00
Zmago Devetak	d67997fa8b	Merge pull request #83 from ZmagoD/zd_SCI_347 ... Fixes search result link for experiment [fixes SCI-347]	2016-08-23 16:23:41 +02:00
Zmago Devetak	aa650bbc65	Merge pull request #82 from ZmagoD/zd_SCI_359 ... Add plus button at the bottom of project overview page [fixes SCI-359]	2016-08-23 16:23:20 +02:00
Zmago Devetak	7e2db66f42	Merge pull request #79 from ZmagoD/zd_SCI_345 ... Adds font-awesome to pdf [fixes SCI-345]	2016-08-23 16:22:30 +02:00
Zmago Devetak	65049692ea	Merge pull request #78 from ZmagoD/zd_SCI_349 ... updating thumbnail	2016-08-23 16:22:07 +02:00
zmagod	0429816154	deleted commented code	2016-08-23 16:21:11 +02:00
zmagod	2bbb439745	fixes cloned experiment protocol [fixes SCI-376]	2016-08-23 16:15:45 +02:00
Mojca Lorber	126cf0c210	fixes drag connections area	2016-08-23 16:08:05 +02:00
Mojca Lorber	322be64b5f	change experiment path	2016-08-23 14:44:22 +02:00
Mojca Lorber	86ed4c18d8	fixes hound	2016-08-23 13:51:20 +02:00
Mojca Lorber	ac68db97b9	fixes tile size in edit canvas	2016-08-23 13:33:10 +02:00
Jure Grabnar	67768c8865	Fix Hound errors	2016-08-23 11:08:10 +02:00
Jure Grabnar	0d56cea3e4	Add placeholders for empty experiments	2016-08-23 10:37:48 +02:00
Jure Grabnar	027193f937	Add links for moving module groups	2016-08-23 10:09:25 +02:00
Jure Grabnar	358f2b1c47	Add moving for newly created modules	2016-08-23 10:00:34 +02:00
zmagod	f918746946	hide the dropdown if user has no permissions(technician) [fixes SCI-371]	2016-08-23 09:26:52 +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
zmagod	03a3759cf5	fixes project overview style and add no description link [fixes SCI-360]	2016-08-23 08:52:53 +02:00
Jure Grabnar	8940ba891b	Add initial position for moving workflows	2016-08-22 17:52:55 +02:00
Jure Grabnar	667b7671a6	Add connections for moved workflows	2016-08-22 17:26:21 +02:00
zmagod	9a05935067	fixed search result link for experiment [fixes SCI-347]	2016-08-22 15:35:47 +02:00
Mojca Lorber	75c52d20e5	fixes hound	2016-08-22 15:30:27 +02:00
zmagod	8c592753e4	fixes hound	2016-08-22 15:27:11 +02:00
zmagod	bb11999566	adds plus button at the bottom of project overview page [fixes SCI-359]	2016-08-22 15:22:05 +02:00
Mojca Lorber	131d0d269a	fixes edit experiment	2016-08-22 15:18:02 +02:00
zmagod	eab05eb9db	adds font-awesome to pdf [fixes SCI-345]	2016-08-22 14:40:09 +02:00
zmagod	d38f29d207	set ajax loading of experiments images [fixes SCI-349]	2016-08-22 11:29:19 +02:00
mlorb	ed1cd193ac	Merge pull request #77 from mlorb/ml_sci_357 ... fixes warning messages when loading a new protocol that is linked with repository [SCI-357]	2016-08-22 08:56:36 +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
Jure Grabnar	5bb99adb25	Add frontend logic for moving workflows from canvas	2016-08-19 17:11:17 +02:00
zmagod	b86e67a0d6	refactor initProjectExperiment	2016-08-19 16:38:34 +02:00
Mojca Lorber	fb081be682	fixes warning messages when loading a new protocol that is linked with repository	2016-08-19 16:03:10 +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
Jure Grabnar	f575303d11	Update get_new_position for new canvas size ... SCI-358 #close	2016-08-19 13:42:28 +02:00
Mojca Lorber	51e0d53b12	remove code duplication	2016-08-19 13:08:35 +02:00
Mojca Lorber	571f5b60f3	fixes notifications appearance and disappearance and content adjustment	2016-08-19 10:48:43 +02:00
Mojca Lorber	5c77167388	update buttons	2016-08-18 16:47:16 +02:00
Mojca Lorber	5695842fe3	fixes notifications when creating sample types and groups	2016-08-18 16:05:15 +02:00
Zmago Devetak	58930f3456	Merge pull request #73 from ZmagoD/zd_SCI_344 ... fixes user duplication [fixes SCI-344]	2016-08-18 13:28:59 +02:00
zmagod	2216a86db5	hound again	2016-08-18 13:27:46 +02:00
zmagod	d3f61bdd18	fixes hound alert	2016-08-18 13:24:44 +02:00
Zmago Devetak	a680b09cc9	Merge pull request #72 from ZmagoD/zd_fix_exl_archive ... fixed experiments archive bug	2016-08-18 13:16:51 +02:00
Zmago Devetak	fe626a8cb3	Merge pull request #71 from ZmagoD/zd_SCI_294 ... Zd sci 294	2016-08-18 13:16:38 +02:00
zmagod	d62500cb56	check search input string [fixes SCI-346]	2016-08-18 13:14:31 +02:00
zmagod	4b5be7530c	fixed task archive	2016-08-18 11:53:57 +02:00
zmagod	da2b9ccf82	fixes user duplication [fixes SCI-344]	2016-08-18 11:26:52 +02:00
zmagod	fa08b861d0	fixed experiments archive bug	2016-08-18 10:55:29 +02:00
Jure Grabnar	6879521a75	Add missing .experiment to can_unlink_protocol	2016-08-18 10:48:44 +02:00
zmagod	6bb8d075e0	truncate asset name in task step and result [fixes SCI-294]	2016-08-18 09:22:12 +02:00
zmagod	072f816286	refactor restore_after_tutorial function	2016-08-18 08:55:40 +02:00
zmagod	f2ee5d73a0	fixed project tutorial bug	2016-08-18 08:53:34 +02:00
Zmago Devetak	b6ccecf478	Merge pull request #69 from ZmagoD/zd_SCI_335 ... cleans experiment form report if moved [fixes SCI-335]	2016-08-18 08:37:09 +02:00
Jure Grabnar	c3074e91de	Fix activity in first time generator	2016-08-18 08:33:08 +02:00
mlorb	36d24523b4	Merge pull request #61 from biosistemika/ml_sci_291 ... fixes dissapearance of sample type/group when editing samlpe or adding new sample [SCI-291]	2016-08-18 08:25:31 +02:00
Zmago Devetak	4897e2da0c	Merge pull request #68 from ZmagoD/zd_SCI_330 ... Zd sci 330	2016-08-18 08:10:20 +02:00
Zmago Devetak	f2e08db106	Merge pull request #67 from ZmagoD/zd_SCI_337 ... Zd sci 337	2016-08-18 08:06:38 +02:00
Zmago Devetak	d17af4e898	Merge pull request #66 from ZmagoD/zd_SCI_331 ... adds active class to experiment name in sidebar [fixes SCI-331]	2016-08-18 08:06:03 +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
Matej Zrimšek	b70f49f4e0	Some additional refinements.	2016-08-17 18:00:04 +02:00
Matej Zrimšek	86880f0299	Additional changes, refactoring and improvements.	2016-08-17 17:57:54 +02:00
Matej Zrimšek	01aad1764c	Some hotfixes to previous commit. Client-side file validation added (except file type validation). Some refactoring.	2016-08-17 17:54:45 +02:00
Matej Zrimšek	e2f94caa96	Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done.	2016-08-17 17:54:06 +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	77f75fdeb6	Delete module from canvas when moving	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	c27c6c19e5	cleans experiment form report if moved [fixes SCI-335]	2016-08-17 15:21:53 +02:00
zmagod	9fd68c7bd5	fixes 'new experiment' button bug on smaller screens	2016-08-17 14:27:59 +02:00
zmagod	ca0ba1403d	set flask icon to experiment [fixes SCI-330]	2016-08-17 14:17:29 +02:00
zmagod	cc2ed32ccb	fixes canvas bug when no actions are available for the viewer	2016-08-17 13:29:22 +02:00
zmagod	6c5cc8aac9	fixes notification [fixes SCI-337]	2016-08-17 13:17:40 +02:00
zmagod	8d69ca0b88	adds active class to experiment name in sidebar [fixes SCI-331]	2016-08-17 11:21:48 +02:00
zmagod	d557f3249f	Adds single tasks to the experiment img [fixes SCI-329]	2016-08-17 11:13:49 +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
Zmago Devetak	13697e8688	Merge pull request #58 from ZmagoD/zd_SCI_74 ... Filter search query for special chars [fixes SCI_74]	2016-08-17 10:00:47 +02:00
zmagod	4293f9c267	Merge branch 'zd_SCI_271' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_271	2016-08-17 09:58:29 +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
zmagod	76dd4bc90a	fixed protocol status bar [fixes SCI-318]	2016-08-16 10:47:23 +02:00
Zmago Devetak	762b805651	Merge pull request #55 from ZmagoD/zd_papperclip_migration_bug ... fixes migration error	2016-08-16 10:44:53 +02:00
Zmago Devetak	9b97dad03d	Merge pull request #54 from ZmagoD/zd_SCI_39 ... fixes loading samples error in blank project	2016-08-16 10:44:35 +02:00
Jure Grabnar	275106c27c	Add check for empty projects on move experiments	2016-08-16 10:20:36 +02:00
Mojca Lorber	7dc0c3672a	fixes dissapearance of sample type/group when adding/editing new sample	2016-08-16 10:17:29 +02:00
Jure Grabnar	c16eed5e63	Add missing dropdown_actions.js	2016-08-16 09:48:19 +02:00
zmagod	5e647f62d5	changed import label [fixes SCI-317]	2016-08-16 09:34:04 +02:00
Jure Grabnar	a29b56b0bd	Even more candy for our dog	2016-08-16 09:15:29 +02:00
Jure Grabnar	b25a7758db	Give a candy to our special dog	2016-08-16 09:10:45 +02:00
Jure Grabnar	042a33f2c7	Add activity for moving	2016-08-16 08:49:24 +02:00
Jure Grabnar	e55c66b3d0	Add query for moveable projects	2016-08-16 08:47:04 +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
Mojca Lorber	e6f205368b	fixes tutorial bug of inappropriate window	2016-08-12 11:33:27 +02:00
Jure Grabnar	d7341d0383	Set actions/routes/view for move experiment	2016-08-12 11:26:18 +02:00
zmagod	c9ff249067	fixed hound alert	2016-08-12 11:11:52 +02:00
zmagod	6c7cfb4467	filter search query for special chars [fixes SCI_74]	2016-08-12 11:08:51 +02:00
Jure Grabnar	555ed05ae6	Refactor/DRY dropdown actions code for experiment	2016-08-12 10:18:35 +02:00
mlorb	6b17385f3a	Merge pull request #56 from biosistemika/ml_sci_302 ... fixes problem with split table when generating pdf report [SCI-302]	2016-08-12 08:55:10 +02:00
mlorb	f3163ea7ce	visual corrections	2016-08-12 08:54:14 +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	5c40d04eb2	Add missing clone modal	2016-08-11 16:59:56 +02:00
Jure Grabnar	2f6ccac3bc	Add unique experiment name and copy image when cloning	2016-08-11 16:58:31 +02:00
Jure Grabnar	6e8e9ecf21	Fix activities and the dreaded no project for modules error	2016-08-11 16:57:29 +02:00
zmagod	d1f6a0f58d	fixed hound	2016-08-11 16:24:44 +02:00
zmagod	701c26a2dd	fixed canvas edit and samples tutorial [fixes: SCI-271]	2016-08-11 16:21:55 +02:00
zmagod	a128815122	fixed tutorial tasks on canvas	2016-08-11 16:06:51 +02:00
Mojca Lorber	94915a9ba7	fixes problem with splitted table when generating pdf report [SCI-302]	2016-08-11 15:24:18 +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
zmagod	2e1d81a985	fixed project archive in tutorial	2016-08-11 12:40:16 +02:00
Mojca Lorber	b350dff826	fixes problem with splitted table when generating pdf report [SCI-302]	2016-08-11 10:42: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
scibb	32699578ed	Merge pull request #52 from biosistemika/bb_canvas_fixes ... Bb canvas fixes	2016-08-11 09:29:21 +02:00
zmagod	060da59bbb	fixes migration error	2016-08-11 09:19:12 +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
zmagod	7653f2b9ec	fixed hound	2016-08-10 11:26:27 +02:00
Jure Grabnar	b2855d69f6	Fix hound warning	2016-08-10 09:24:06 +02:00
zmagod	deb739efa6	fixes loading samples error in blank project	2016-08-10 09:13:12 +02:00
Jure Grabnar	15d66c7884	Change validation for experiment workimg	2016-08-10 08:58:29 +02:00
Jure Grabnar	7b0f323576	Add expiring URL to experiment img	2016-08-09 16:37:44 +02:00
zmagod	f77e0d4a6e	changed workflow image name	2016-08-09 16:27:28 +02:00
zmagod	5583105d8a	fixed hound alert	2016-08-09 14:28:55 +02:00
zmagod	5f3a5cb845	fixed project overview	2016-08-09 14:26:08 +02:00
Jure Grabnar	e995165876	Double quotes -> single quotes (#hound)	2016-08-09 13:19:32 +02:00
Jure Grabnar	9f7df0af76	Fix checkbox in experiment reports	2016-08-09 13:13:50 +02:00
zmagod	176aad4c6d	fixes multiple graphs rendering	2016-08-09 11:19:07 +02:00
Jure Grabnar	208e85e7e0	Remove archived experiments from reports	2016-08-09 11:17:25 +02:00
Jure Grabnar	1a7a7a1d1a	Add info to experiment archive cards ... Also add addtional check for due date on archive experiment	2016-08-09 11:04:46 +02:00
Jure Grabnar	a0fe31479f	Fix permissions for archived experiments	2016-08-09 10:00:44 +02:00
Jure Grabnar	0ca5725f9b	Archive/restore of experiments now work	2016-08-08 16:35:45 +02:00
zmagod	1a56396eb5	add workflow image to project overview page [fixes SCI-41]	2016-08-08 16:02:17 +02:00
scibb	696075bf0f	smaller grid steps set. In addition enddpoint bug was fixed ... SCI 170, SCI 292'	2016-08-08 15:18:38 +02:00
Jure Grabnar	5c858ee577	Add missing experiment archive page	2016-08-08 15:04:38 +02:00
Jure Grabnar	2bd74866e0	Fix my_modules archive page	2016-08-08 15:04:02 +02:00
Jure Grabnar	5a023483d7	Prepare views for experiment archive	2016-08-08 14:19:35 +02:00
Jure Grabnar	775a39344c	Fix experiment archive permissions	2016-08-08 13:40:08 +02:00
Jure Grabnar	deecbf082c	Remove badly merged code	2016-08-08 13:06:20 +02:00
Zmago Devetak	4bd489d29c	Merge pull request #46 from ZmagoD/zd_SCI_303 ... update sidebar v2 [fixes SCI-303]	2016-08-08 08:56:01 +02:00
jbargu	3f91e7a476	Merge pull request #47 from biosistemika/jg_explvl_reports ... Update reports with experiment level [Fixes SCI-35].	2016-08-08 08:51:23 +02:00
zmagod	520cf2e0cf	hound....	2016-08-08 08:40:24 +02:00
zmagod	e16abe486c	fix hound alert	2016-08-08 08:37:22 +02:00
zmagod	756c3c777e	styled workflow dots	2016-08-08 08:33:18 +02:00
zmagod	04d171997e	Merge branch 'zd_SCI_41' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_41	2016-08-05 15:56:21 +02:00
zmagod	9c5c4f0a3a	Merge branch 'zd_SCI_44' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_44	2016-08-05 15:23:01 +02:00
Mojca Lorber	c691ca63e2	fixing houndci-bot comment	2016-08-05 09:47:06 +02:00
Mojca Lorber	5d137324bc	moving and targeting .label class	2016-08-05 09:12:17 +02:00
Jure Grabnar	d9702b6964	Remove unneeded new element	2016-08-05 08:36:06 +02:00
Jure Grabnar	2f0dc57ea6	Fix Hounds warning	2016-08-05 08:29:49 +02:00
Jure Grabnar	a25a4354c6	Fix css, #hound.	2016-08-05 08:05:14 +02:00
Jure Grabnar	cafec6a1b4	Fix controls on experiment contents ... Also fix bug with adjencent elements not updating controls. Fixes SCI-35.	2016-08-04 16:05:03 +02:00
Jure Grabnar	8b2b134614	Migrate old reports to new experiment level reports	2016-08-04 13:19:46 +02:00
zmagod	a4ec558596	start to implement project overview page	2016-08-04 12:57:33 +02:00
zmagod	f8f87e9540	Feed the Hound	2016-08-03 16:16:09 +02:00
zmagod	45dac782ca	update sidebar [fixes SCI-303]	2016-08-03 16:09:45 +02:00
Jure Grabnar	da2a06c999	Fix global sort to work with experiments	2016-08-03 14:59:53 +02:00
zmagod	fd8187370e	Feed the Hound part 3	2016-08-03 13:16:51 +02:00
Jure Grabnar	0c51f7bc8b	Saving/editing of reports now works	2016-08-03 13:15:40 +02:00
zmagod	9d4a67a5b6	Feed the Hound 2	2016-08-03 13:11:46 +02:00
zmagod	57ac34e9f4	add samples to experiment page [fixes SCI-43]	2016-08-03 12:57:51 +02:00
Jure Grabnar	964b51f84a	Add experiment reports element	2016-08-03 12:52:52 +02:00
Jure Grabnar	aedaf2f30a	Adding of experiment content now works in reports	2016-08-03 12:52:52 +02:00
Jure Grabnar	5854e72878	Add experiments_contents action	2016-08-03 12:52:52 +02:00
Jure Grabnar	9092dd6914	Replace all occurences of module_elements	2016-08-03 12:52:52 +02:00
Jure Grabnar	ff081cd844	Simplify project contents dialog	2016-08-03 12:52:51 +02:00
Jure Grabnar	dc82830a8f	Add checkbox behaviour to experiment contents	2016-08-03 12:52:51 +02:00
Jure Grabnar	3f33ebe59a	Fix wrong closure in experiment contents	2016-08-03 12:52:51 +02:00
Jure Grabnar	acc41dae40	Add experiment content report dialog ... Adding still has to be implemented	2016-08-03 12:52:51 +02:00
Jure Grabnar	41e8c54aa5	Rename _module_element_controls to element_controls	2016-08-03 12:52:06 +02:00
Jure Grabnar	1e334d9075	Remove unneeded "Add new report element"	2016-08-03 12:52:06 +02:00
Jure Grabnar	d82ba163ed	Add experiment to report screen ... Only placeholder for now, JS still needs fixing.	2016-08-03 12:52:06 +02:00
Jure Grabnar	ac708e7497	Remove no module group from reports	2016-08-03 12:52:06 +02:00
Jure Grabnar	797685fbf0	Remove workflows from project content dialog (report)	2016-08-03 12:52:06 +02:00
Jure Grabnar	daca739262	Add new line to selector for readability	2016-08-03 12:52:06 +02:00
Jure Grabnar	598c5a63fd	Add experiment level to project report contents modal	2016-08-03 12:52:05 +02:00
zmagod	d11b0b11e9	Feed the Hound	2016-08-03 09:44:05 +02:00
zmagod	caa80642c0	[fixes SCI-304], [fixes SCI-37]	2016-08-03 09:34:10 +02:00
Mojca Lorber	ffa64445df	fixes issue SCI-223	2016-08-02 16:30:07 +02:00
Zmago Devetak	43230384b5	Merge pull request #40 from ZmagoD/zd_SCI_261 ... Fixed search query [fixes SCI-261]	2016-08-02 11:44:00 +02:00
zmagod	18d73467c8	fixed hound warning	2016-08-02 11:16:07 +02:00
zmagod	166f907780	fixed search error	2016-08-02 11:10:30 +02:00
zmagod	f184ee3f2d	fixing hound warnings	2016-08-02 09:13:30 +02:00
zmagod	9581e2751f	fixes samples page for experiment level [fixes SCI-44]	2016-08-02 08:44:07 +02:00
zmagod	6e3ce92348	add checking for step content	2016-08-01 11:23:22 +02:00
Luka Murn	40fe4e54a9	Feed the Hound #2	2016-07-29 16:48:56 +02:00
Luka Murn	ecf5b5a2c1	Feed the Hound	2016-07-29 16:46:25 +02:00
Luka Murn	4d57479cf9	Remove comment ... Closes SCI-38.	2016-07-29 16:40:42 +02:00
zmagod	95da62adde	fixed hound	2016-07-29 16:38:42 +02:00
zmagod	25b99b6570	fixed search [fixes SCI-261]	2016-07-29 16:32:54 +02:00
Luka Murn	8a2b54819a	More fixes on secondary navigation	2016-07-29 16:20:35 +02:00
Luka Murn	bed8687dbd	Remove some unused commented code	2016-07-29 16:08:30 +02:00
Luka Murn	b085aa1db3	Remove uneccesary project_activities HTML pages	2016-07-29 16:06:35 +02:00
Luka Murn	ed2226c14b	Refactor sidebar	2016-07-29 15:58:47 +02:00
Luka Murn	34af50a9d0	Fix breadcrumbs & sidebar so it works	2016-07-29 15:47:41 +02:00
Luka Murn	0f0689eddc	Fix permission helper	2016-07-29 11:43:15 +02:00
Luka Murn	4ea86d6aa1	Code style fixes	2016-07-29 10:41:08 +02:00
Luka Murn	edafcaeed6	Move route module_archive_project -> module_archive_experiment ... Also add some new routes, move some templates.	2016-07-29 10:25:02 +02:00
Luka Murn	ebda92ef05	Add experiments_controller	2016-07-29 10:21:21 +02:00
Luka Murn	1ad265835b	Move route canvas_project -> canvas_experiment	2016-07-29 10:08:28 +02:00
Luka Murn	0c75423cc0	Add TODO to project overview page	2016-07-29 09:46:26 +02:00
Luka Murn	b64e200b91	Refactor canvas a lot. ... Also refactor localization files concerning canvas.	2016-07-28 16:41:10 +02:00
Luka Murn	c8ef3b1899	Fix first time generator	2016-07-28 16:40:51 +02:00
zmagod	e95f518964	refactor canvas_controller, experiments_controller	2016-07-28 16:01:53 +02:00
zmagod	d91aa5c60b	fixed translation sting 'name' to 'experiment'	2016-07-28 14:57:47 +02:00
zmagod	23a46d5fb3	added translations to experiment create and edit flash messages	2016-07-28 14:52:11 +02:00
zmagod	352944fc33	added new/edit experiment modals	2016-07-28 14:44:44 +02:00
Luka Murn	1953e295b6	Hotfix for search results bug	2016-07-28 13:29:26 +02:00
zmagod	9d23cfd940	fixed experiment routes	2016-07-28 11:30:34 +02:00
zmagod	c11932b45b	fixed layout	2016-07-28 11:00:56 +02:00
zmagod	d16c0fe706	fixed edit canvas	2016-07-28 10:09:05 +02:00
zmagod	54c4051906	added canvas under experiments	2016-07-28 09:01:44 +02:00
zmagod	a17106b883	added experiments controller and fixed sidebar	2016-07-27 16:18:26 +02:00
Zmago Devetak	c869db2506	Merge pull request #35 from ZmagoD/zd_SCI_40 ... Edit canvas controller to work with experiments	2016-07-27 12:11:19 +02:00
zmagod	485d93f8b9	refactor canvas permissions	2016-07-27 11:35:07 +02:00
Jure Grabnar	1a1c4bb68a	Remove needless join from MyModuleGroup	2016-07-27 10:18:57 +02:00
zmagod	5c7501a273	added experiments canvas labels in localization file and fixed canvas views	2016-07-26 14:21:59 +02:00
zmagod	0a84ecdfc1	edit canvas controller to work with experiment	2016-07-26 14:02:06 +02:00
Jure Grabnar	77ed1c5fd3	Change invalid references to project in search and shorten lines.	2016-07-26 12:59:37 +02:00
Jure Grabnar	80621c9b6b	Add experiment text to all searches related to experiment	2016-07-26 12:26:48 +02:00
Jure Grabnar	690ad0fffa	Add a few experiment permissions	2016-07-26 12:26:48 +02:00
Jure Grabnar	3be562bdf6	Add experiment to search results	2016-07-26 12:26:48 +02:00
Jure Grabnar	6d26203796	Add missing target var to result searches	2016-07-26 12:26:48 +02:00
Jure Grabnar	5283027da1	Add missing target var to searches.	2016-07-26 12:26:48 +02:00
Jure Grabnar	0361f006ca	Add SearchableModel to Experiment and fix children	2016-07-26 12:26:48 +02:00
Jure Grabnar	49cd8a783d	Update first time data generator with experiment.	2016-07-26 12:20:31 +02:00
Zmago Devetak	b13747291e	Merge pull request #32 from ZmagoD/zd_SCI_31 ... Fixing modules after integrating experiment-level	2016-07-26 09:18:16 +02:00
zmagod	346bffe08f	fixed protocol.rb	2016-07-26 09:17:24 +02:00
zmagod	c27ffa9fbf	fixed project_my_module method	2016-07-26 08:44:09 +02:00
Luka Murn	3187843d14	Change updated_by -> last_modified_by	2016-07-25 14:47:13 +02:00
zmagod	6053c782f9	fixed permission_helper [fixes SCI-34]	2016-07-25 12:07:10 +02:00
zmagod	18d66ece56	migrated model related functions to experiment.rb [fixes: SCI-31]	2016-07-25 11:25:10 +02:00
zmagod	426bce48b2	fixed permission_helper	2016-07-25 09:31:40 +02:00
zmagod	b3c61cfa41	fixed project_my_modules method	2016-07-25 09:13:04 +02:00
zmagod	7c9a0bc2bb	fixed models	2016-07-22 15:36:48 +02:00
zmagod	389ee7ea43	start fixing modules	2016-07-22 14:31:09 +02:00
Luka Murn	785fb2cba1	Initial migration & changes in ActiveRecords	2016-07-22 10:43:55 +02:00
Luka Murn	076b67620f	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00
Luka Murn	055298fee8	Initial commit.	2016-02-12 16:52:43 +01:00