5093 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
okriuchykhin	ac0a449522	Merge pull request #271 from okriuchykhin/ok_SCI_570_v2 ... Added step numbers in intro tutorial [SCI-570]	2016-11-11 09:08:47 +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
zmagod	df43614f00	swithced quill gem to master branch	2016-11-10 14:15:39 +01:00
Mojca Lorber	3e162b3a93	remove redcarpet gem - markdown	2016-11-10 14:11:32 +01:00
zmagod	7c7106d8ff	included updated guill-rails version [fixes SCI-639]	2016-11-10 14:04:22 +01:00
Mojca Lorber	456c6d1ad6	Copy rich text functionality to text results	2016-11-10 12:19:59 +01:00
mlorb	19433850c8	Merge pull request #272 from mlorb/ml-sci-638 ... Integrate library with default settings [SCI-638]	2016-11-09 17:10:19 +01:00
Mojca Lorber	c44e25d72e	add gemfile.lock	2016-11-09 17:08:50 +01:00
Mojca Lorber	ab0879e8d6	Integrate library with default settings	2016-11-09 13:09:53 +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
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
zmagod	808ec807c2	added extends file	2016-11-08 11:26: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
mz3944	12d1c31651	Merge pull request #268 from mz3944/mz_add_profile_statistics_data_hook_SCI_567 ... Added profile statistics data hook.	2016-11-04 17:39:26 +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
mlorb	4c311c1664	Merge pull request #266 from mlorb/ml_avatar_marge_conflict ... fix merge conflict problem with avatar on profile page	2016-11-03 16:18:24 +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	dec08c47cf	Merge branch 'mlorb-ml_sci_610'	2016-11-02 14:08:05 +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
okriuchykhin	8821cfb5fc	Merge pull request #255 from okriuchykhin/ok_SCI_566 ... Added statistics block in users profile [SCI-566]	2016-10-28 14:27:15 +02:00