452 commits

Author	SHA1	Message	Date
zmagod	a4aa933151	refactor smart annotation parser helper	2017-01-11 10:34:14 +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
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
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	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
Oleksii Kriuchykhin	4fe3030ad4	Freeze WHITELISTED_ATTRIBUTES constatnt [SCI-102]	2017-01-05 16:13:00 +01:00
Oleksii Kriuchykhin	1009347026	Add list of whitelisted attributes [SCI-102]	2017-01-05 15:33:41 +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	6487bd788a	Add additional whitelisted tags [SCI-102]	2017-01-05 14:40:38 +01:00
Luka Murn	b614ce714b	Restyle atwho dropdown	2017-01-05 14:06:48 +01:00
Oleksii Kriuchykhin	9c4191a1e0	Initial code commit [SCI-102]	2017-01-05 13:04:19 +01:00
Luka Murn	09ef3b3ad5	Merge pull request #378 from Ducz0r/lm-sci-802-fix ... Add tooltips to samples column dropdown [SCI-802]	2017-01-04 11:30:04 +01:00
Luka Murn	2c5b27ce81	Change "Update" to "Save" ... Closes SCI-802.	2017-01-04 11:29:34 +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	37cd6417c8	Merge pull request #374 from Ducz0r/lm-sci-808-814-fix ... Fix some bugs on sample groups & types page [SCI-808, SCI-814]	2017-01-04 09:50:26 +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
zmagod	01c086b667	fixes routes.rb indentation	2017-01-03 09:49:18 +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
Oleksii Kriuchykhin	d898f8993f	Add description to Clone actions [SCI-766]	2016-12-29 15:33:49 +01:00
Luka Murn	2304742d87	Add tooltips to samples column dropdown ... Closes SCI-802.	2016-12-27 08:45:23 +01:00
Luka Murn	3922be2b17	Change String in sample types & groups ... Closes SCI-808.	2016-12-23 11:48:57 +01:00
Luka Murn	e16c826bb1	Version bump to 1.6.0	2016-12-22 11:43:52 +01:00
Mojca Lorber	40e3240a99	add content to preview modal	2016-12-22 11:43:11 +01:00
Oleksii Kriuchykhin	cbef971d85	Fix timeouts when fetching images from S3 [SCI-694]	2016-12-20 15:36:07 +01:00
Oleksii Kriuchykhin	b537feb8a0	Added large preview [SCI-694]	2016-12-16 17:07:08 +01:00
Oleksii Kriuchykhin	0541253ffa	Added modal for images preview [SCI-694]	2016-12-16 15:53:16 +01:00
Zmago Devetak	90a115fff3	Merge pull request #342 from ZmagoD/zd_SCI_758 ... Generate png preview images for uploaded TIFF images	2016-12-16 15:39:07 +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
zmagod	2426539715	fixes long names in columns dropdown [fixes SCI-784]	2016-12-13 14:54:37 +01:00
Mojca Lorber	2cfcba0ceb	add protocol preview modal	2016-12-13 10:39:18 +01:00
Zmago Devetak	d54007f69c	Merge pull request #337 from ZmagoD/zd_SCI_740 ... limits max size of all uploaded files at the one time	2016-12-13 09:04: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	5176f8b459	clean unneeded code [fixes SCI-778] refactor js	2016-12-12 15:40:13 +01:00
zmagod	d9025a9601	changes create/edit mode buttons [fixes SCI-777]	2016-12-12 14:42:06 +01:00
Luka Murn	d30a9780f4	Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix ... Conflicts: app/assets/javascripts/samples/sample_datatable.js	2016-12-12 09:57:37 +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
Matej Zrimšek	aea679ec11	Added links for creating new sample type and group when creating new sample. [fixes SCI-701]	2016-12-09 11:39:12 +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
Mojca Lorber	195055f9cf	change SAMPLES_TABLE_DEFAULT_STATE	2016-12-07 14:51:34 +01:00
Mojca Lorber	39b6fa66fe	add SamplesTable for new users	2016-12-07 14:14:32 +01:00
zmagod	9f1e436623	limits max size of all uploaded files at the one time [fixes SCI-740]	2016-12-07 09:02:04 +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
zmagod	8ca7151df4	added constant to load_from_file_size_error local	2016-12-06 13:52:07 +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
Oleksii Kriuchykhin	94866e8994	Initial code commit for samples columns dropdown [SCI-712]	2016-12-06 13:16: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	ef2471d3f7	fixes inport eln error message and spinner [fixes SCI-752]	2016-12-05 10:44:58 +01:00
zmagod	83aae59eed	adds sample groups index page	2016-12-02 09:33:09 +01:00
Luka Murn	7309da9d92	Version bump to 1.5.1	2016-12-01 15:54:08 +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	495c648f41	Added subdomain based routing constraints ... Non-wopi routes will only work with the subdomain set by the env variable USER_SUBDOMAIN (if it is set). Likewise, wopi routes will only work with the WOPI_SUBDOMAIN if it is set, but they also require the WOPI_ENABLED to be true.	2016-11-30 16:43:33 +01:00
Luka Murn	f138a39508	Merge pull request #324 from Ducz0r/lm-sci-718-fix ... Fix intro tutorial string	2016-11-30 09:50:40 +01:00
zmagod	1859df0319	fix hound	2016-11-30 09:44:49 +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	12848f15fa	adds sample_type index view with all crud actions	2016-11-29 17:15:54 +01:00
zmagod	5c0b2d7b24	init sample_types page	2016-11-29 08:57:12 +01:00
Luka Murn	48a1c98f16	Fix intro tutorial string ... Closes SCI-718.	2016-11-28 17:28:04 +01:00
Zmago Devetak	1e870a6e7c	Merge pull request #320 from ZmagoD/zd_SCI_698 ... adds new samples columns dropdown [fixes SCI-698]	2016-11-28 16:30:16 +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	d8f8e01a46	Code cleanup, added new image types to whitelist [SCI-736]	2016-11-28 11:13:20 +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
Luka Murn	d0b86de3a4	Use Rails's email regex	2016-11-25 17:37:27 +01:00
zmagod	9d91d2ce28	adds new samples columns dropdown [fixes SCI-698]	2016-11-25 17:29:30 +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	b1b095910c	Merge pull request #309 from Ducz0r/lm-remove-unused-files ... Brace for impact...	2016-11-25 10:00:29 +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	91ffb232e2	Version bump to 1.5.0	2016-11-24 11:37:45 +01:00
Mojca Lorber	3f7eb75e40	add comment	2016-11-24 09:48:25 +01:00
Mojca Lorber	beae54e278	remove already_authenticated alert flash	2016-11-23 14:55:41 +01:00
Luka Murn	198febfd94	Fix user projects not working	2016-11-23 13:19:10 +01:00
Mojca Lorber	51abd8907c	add switch to toggle email confirmations	2016-11-23 09:49:52 +01:00
Mojca Lorber	b87bc4020b	set ENABLE_RECAPTCHA to false in test environment	2016-11-23 09:36:49 +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
Mojca Lorber	88890ab65b	fix hound	2016-11-22 15:05:25 +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	8505d75bca	Fix Hound errors	2016-11-21 17:33:08 +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	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
Matej Zrimšek	f13cc5be0e	Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way).	2016-11-17 18:03:49 +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
okriuchykhin	39d3b65c52	Merge pull request #297 from okriuchykhin/ok_SCI_685 ... Improved tutorial styling [SCI-685]	2016-11-17 10:57:10 +01:00
Oleksii Kriuchykhin	d2e29935cf	Improved tutorial styling [SCI-685]	2016-11-16 15:44:06 +01:00
Oleksii Kriuchykhin	fc09cafe63	Fix tutorial strings [SCI-677]	2016-11-16 13:15:02 +01:00
Luka Murn	04749c3b2c	Allow inviting of existing, unconfirmed users ... Closes SCI-676.	2016-11-15 15:04:31 +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
Mojca Lorber	615cd3c278	profile changes for gamification	2016-11-14 15:04:18 +01:00
Mojca Lorber	3b7af3e66c	fix validation logic	2016-11-11 11:42:16 +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
Oleksii Kriuchykhin	6811120829	Added step numbers in intro tutorial [SCI-570]	2016-11-09 10:52:00 +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
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
zmagod	808ec807c2	added extends file	2016-11-08 11:26:55 +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	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
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	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
Oleksii Kriuchykhin	d28edfb488	Added statistics block in users profile [SCI-566]	2016-10-27 13:44:27 +02:00
Mojca Lorber	878952f072	change edit avatar in profile	2016-10-26 13:41:17 +02:00
Luka Murn	24cdbedd05	Bump version to 1.4.0	2016-10-25 18:15:53 +02:00
Luka Murn	4b388493b0	Fix a String ... Closes SCI-611	2016-10-25 09:36:22 +02:00
zmagod	578ce86fed	removes projects dropdown description from tutorial step [fixes SCI-589]	2016-10-20 13:29:16 +02:00
zmagod	1614cbc2b2	fixes repeat tutorial button and localization typos	2016-10-17 15:16:22 +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	1b0fb255db	Replaced hardcoded big values with infinity constant in fixtures.	2016-10-17 13:52:33 +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	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	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
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
Oleksii Kriuchykhin	90c853743c	Additional fixes to email markup and logic [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
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
Luka Murn	860c3f9bf1	Bump version to 1.3.1	2016-10-07 15:57:01 +02:00
Jure Grabnar	1f67aec258	Prevent destroying protocols when file is edited ... SCI-552 #close	2016-10-06 16:13:42 +02:00
zmagod	de00a19dd9	fixes styling in settings preferences [SCI-553]	2016-10-06 13:22:44 +02:00
Luka Murn	5c80c8a817	Add "no notifications" to dropdown & notifications index page	2016-10-05 16:58:21 +02:00
Oleksii Kriuchykhin	4e2ad1d5e6	Fix the issues after code review [SCI-442]	2016-10-05 15:54:31 +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	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
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
Zmago Devetak	91c7d8a952	Merge pull request #176 from ZmagoD/zd_SCI_474 ... Unify the comments	2016-10-03 15:26:17 +02:00
Jure Grabnar	f727289935	Add lock check for editing result	2016-10-03 13:43:35 +02:00
zmagod	ea17182372	generate notifications [fixes SCI-440]	2016-10-03 11:37:29 +02:00
Mojca Lorber	5b32be2137	adding subtitle in modal	2016-10-03 09:28:58 +02:00
Jure Grabnar	d9fa882d6a	Add check for locked files on step delete	2016-10-01 14:51:55 +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
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
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
Luka Murn	f994469cb5	Bump version to 1.3	2016-09-29 13:04:28 +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
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	3217271efe	Remove default headers	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	1eb9f772f4	refactor sciNote comments js and unified all comments behavior [fixes SCI-474]	2016-09-27 10:30:48 +02:00
zmagod	02bfa1949e	fixed project comments	2016-09-27 09:00:02 +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
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
Matej Zrimšek	fc86b7b1fd	Added help dropdown. [SCI-13]	2016-09-23 12:52:38 +02:00
Oleksii Kriuchykhin	e8ac754829	Fix issue with long tags in dropdown list [fixes SCI-470]	2016-09-23 11:05:17 +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
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	9f56df02d2	removes comment tab and add comment in the info tab [fixes SCI-436]	2016-09-20 18:53:51 +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	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
zmagod	e3ae22763e	removed comments tab in protocol step	2016-09-15 08:46:14 +02:00