6949 commits

Author	SHA1	Message	Date
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