170 commits

Author	SHA1	Message	Date
Martin Artnik	67f4e81a3a	Merge branch 'develop' into features/new_permissions	2021-07-28 15:16:47 +02:00
aignatov-bio	d4f974ac64	Add inline editing for folder name [SCI-5896] (#3430)	2021-07-21 21:33:13 +02:00
zmagoD	9c812e84bd	setup logic to group assign all team members and handle the unassignments logic	2021-06-27 13:22:19 +02:00
aignatov-bio	1c93131ff1	Fix folders breadcrumbs [SCI-5597]	2021-03-26 11:58:18 +01:00
Urban Rotnik	e1db291729	Merge pull request #3200 from urbanrotnik/ur-sci-5525 ... Add breadcrumbs on Experiments and Tasks pages [SCI-5525]	2021-03-08 14:13:44 +01:00
Urban Rotnik	235f19cf25	Store Table/Cards view setting per user ... SCI-5450	2021-03-04 14:56:59 +01:00
Urban Rotnik	401224ae11	Add breadcrumbs on Experiments and Tasks pages	2021-03-04 09:00:58 +01:00
Mojca Lorber	b600f22248	Add no results page on experiment page	2021-02-12 12:12:26 +01:00
aignatov-bio	bcc9d6c85c	Fix sort for experiments page [SCI-5479]	2021-02-11 15:38:10 +01:00
aignatov-bio	1eff3494fb	Fix archived experiments page routes and clean old archive page [SCI-5479]	2021-02-11 14:21:15 +01:00
aignatov-bio	8adbd11197	Fix archived project routes and experiment archived date [SCI-5477]	2021-02-10 15:05:53 +01:00
Mojca Lorber	ad61e59593	Change the title Projects to folder/subfolder title [SCI-5456]	2021-02-05 11:04:58 +01:00
aignatov-bio	a7a948abaf	Add archive/restore toolbar buttons and backend [SCI-5457]	2021-02-03 14:29:50 +01:00
aignatov-bio	7726eae4da	Add experiments page load logic and connect filters [SCI-5457]	2021-02-03 14:29:50 +01:00
Oleksii Kriuchykhin	b872c6fd14	Add breadrumbs to project experiments page [SCI-5369]	2021-01-25 16:06:48 +01:00
Alex Kriuchykhin	f15d984d47	Fix navigation between archived and active projects [SCI-5419] (#3100) ... * Fix navigation between archived and active projects [SCI-5419]	2021-01-19 11:28:59 +01:00
Urban Rotnik	ef82fcc5ee	Merge pull request #3075 from urbanrotnik/ur-sci-5379-clean-folder-info ... Remove project_folder in callback [SCI-5379]	2021-01-12 15:17:16 +01:00
Alex Kriuchykhin	5f506b7459	Merge pull request #3072 from okriuchykhin/ok_SCI_5383 ... Fix folder creation for archived view [SCI-5383]	2021-01-12 13:50:20 +01:00
Oleksii Kriuchykhin	78ec862a2c	Fix folder creation for archived view [SCI-5383]	2021-01-12 13:06:43 +01:00
Urban Rotnik	485aa0d541	Remove project_folder in callback	2021-01-12 13:04:36 +01:00
Urban Rotnik	3ad14e06b2	Merge pull request #3067 from urbanrotnik/ur-sci-5379-clean-folder-info ... Remove project_folder reference on project archive [SCI-5379]	2021-01-12 11:27:08 +01:00
Urban Rotnik	baba7fc9e7	Remove project_folder reference on project archive [SCI-5379]	2021-01-11 13:54:21 +01:00
Oleksii Kriuchykhin	684674952c	Add Restore button to the archived Projects screen [SCI-5344]	2021-01-09 21:27:19 +01:00
aignatov-bio	1f6fff812a	Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048) ... * Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]	2021-01-07 13:16:05 +01:00
aignatov-bio	1515ffa3f5	Add searching to projects member filter [SCI-5373] (#3054)	2021-01-07 13:01:14 +01:00
Oleksii Kriuchykhin	696b8d19f0	Fix new project creation and archiving [SCI-5321][SCI-5326]	2021-01-05 14:14:01 +01:00
Oleksii Kriuchykhin	ffd9132b52	Make active projects view default [SCI-5340]	2020-12-31 16:00:26 +01:00
Oleksii Kriuchykhin	67b3f853d7	Merge branch 'develop' into features/folders	2020-12-18 14:51:21 +01:00
Urban Rotnik	7c967d32f1	Reset invalid state ... SCI-5306	2020-12-18 09:46:05 +01:00
Urban Rotnik	63a41b123d	Fix dropdown JS bug, fix folders_search, apply all new filters to search ... SCI-5306	2020-12-18 09:43:11 +01:00
Urban Rotnik	87ca79717c	Add separate sorting for active/archived view ... [SCI-5306]	2020-12-18 08:41:51 +01:00
aignatov-bio	2ca7b81cea	Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011) ... * Change experiment archived card [SCI-5270]	2020-12-17 13:07:30 +01:00
aignatov-bio	30cfe78805	Add edit modal for project folders [SCI-5265] (#3002) ... Add edit modal for project folders [SCI-5265]	2020-12-14 15:54:18 +01:00
aignatov-bio	6a44e23697	Add projects sidebar [SCI-5178] (#2995) ... * Add projects sidebar navigation [SCI-5178]	2020-12-08 16:07:26 +01:00
Oleksii Kriuchykhin	9546b8f71d	Prepare backend for the improved navigation [SCI-5177]	2020-12-03 10:19:11 +01:00
Oleksii Kriuchykhin	78e050ccc0	Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171]	2020-11-27 14:27:24 +01:00
Urban Rotnik	efd4f8abde	Add members dropdown on project filters flyout	2020-11-26 12:29:43 +01:00
Urban Rotnik	5717e37f2b	Remove obsolete code, fix tests	2020-11-25 18:34:46 +01:00
Urban Rotnik	afc6d12b49	Project and folders sorting	2020-11-25 18:34:39 +01:00
Oleksii Kriuchykhin	0de237cece	Implement project search with grouping by folder [SCI-5207]	2020-11-25 11:59:02 +01:00
miha	ef880d8373	SCI-5223 return the missing method into controller	2020-11-16 15:49:26 +01:00
Oleksii Kriuchykhin	ee1bcd7aac	Implement search endpoint for Projects & folders search [SCI-5136]	2020-11-09 16:16:09 +01:00
Urban Rotnik	042231469c	Fix syntax	2020-10-30 13:37:59 +01:00
Urban Rotnik	b94a3a6cb8	Clean up controller	2020-10-26 16:17:39 +01:00
Urban Rotnik	aa1520bfb8	Merge branch 'develop' into jg_sci_2228	2020-10-22 14:21:39 +02:00
aignatov-bio	16fe11f0f7	Fix smitch team on link for object from other team	2020-09-28 17:16:18 +02:00
Urban Rotnik	a259800590	Merge branch 'develop' into jg_sci_2228	2020-08-31 16:29:23 +02:00
Oleksii Kriuchykhin	48865c8cea	Clear the obsolete code for assiging inventory items to the task [SCI-4571]	2020-06-03 22:54:45 +02:00
aignatov-bio	2269299b61	Fixed projects ordering in sidebar on team page	2020-06-01 10:55:23 +02:00
aignatov-bio	9e15d1ea42	Refactor experiment sidebar	2020-02-27 16:04:44 +01:00
Oleksii Kriuchykhin	16b591b110	Fix sidebar update for inline editing [SCI-4000]	2020-01-06 16:07:23 +01:00
Mojca Lorber	47ccf38662	Redesign of sorting button for projects/experiments cards	2019-09-16 14:43:12 +02:00
Luka Murn	701bdbd294	Remove archive controller action	2019-08-21 16:01:12 +02:00
Luka Murn	084cdcdd6b	Remove old archive endpoint, controller logic	2019-08-21 13:17:19 +02:00
Luka Murn	83bb89fdf5	Cherry-picked commit from ZZ (and LM)'s various changes	2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin	1128fedc51	Refactor title inline editing permission checking [SCI-3471]	2019-05-20 13:13:31 +02:00
Oleksii Kriuchykhin	40550f92c9	Improve HTML data escaping in JSON endpoints [SCI-3403]	2019-05-08 17:38:24 +02:00
Oleksii Kriuchykhin	d7d45bec70	Fix links for archived objects in global activities [SCI-3229]	2019-03-28 13:43:50 +01:00
Mojca Lorber	c55e314ed5	Refactor upon the review requests	2019-03-20 21:34:47 +01:00
Mojca Lorber	d1e38e5bc9	Project activities refactoring	2019-03-19 15:33:57 +01:00
Urban Rotnik	9ed3313f0f	Create project activity refactored	2019-03-11 08:36:15 +01:00
Urban Rotnik	3ad6cee766	Fix tests, remove nullable field	2019-02-25 16:50:38 +01:00
Mojca Lorber	fa1dff6352	refactor Demo project generation	2019-01-24 13:40:53 +01:00
mlorb	4040b31143	Fix behavior when user has no teams	2018-12-10 15:42:05 +01:00
Oleksii Kriuchykhin	2c96f08b98	Refresh sidebar when project is archived/restored [SCI-2881]	2018-11-29 14:20:20 +01:00
Luka Murn	c0940b143a	Fix root page bug introduced with merge features/core-api -> master	2018-11-13 21:24:20 +01:00
Luka Murn	84df2c81f9	Merge branch 'features/export-all' ... Conflicts: app/controllers/experiments_controller.rb app/controllers/my_modules_controller.rb db/schema.rb	2018-11-13 09:14:02 +01:00
mlorb	a56d22a329	change count to size	2018-11-08 09:43:32 +01:00
mlorb	4d156080ac	fix empty projects page bug and projects tree bug	2018-11-07 13:45:46 +01:00
Matej Zrimšek	18e52e2c6f	Fix fetching all user projects [SCI-2787]	2018-10-24 00:29:30 +02:00
Oleksii Kriuchykhin	f221d71bbc	Fix datatables state restore [SCI-2733]	2018-10-12 15:15:43 +02:00
Oleksii Kriuchykhin	af02f29fb5	Implement user state saving for projects overview [SCI-2733]	2018-10-10 16:15:31 +02:00
Oleksii Kriuchykhin	492a5de19e	Add Projects view - list/table view [SCI-2731]	2018-10-01 15:39:42 +02:00
Oleksii Kriuchykhin	2508394924	Refactor Projects view - cards view [SCI-2730]	2018-09-27 10:43:44 +02:00
Oleksii Kriuchykhin	84428b37c2	Add project view JSON endpoints [SCI-2728]	2018-09-21 10:39:20 +02:00
Zanz2	728b1fe491	Reverted deleted lines by accident	2018-08-28 14:51:05 +02:00
Zanz2	b26530a02f	Found a new, and more elegant fix inside controller with Luka	2018-08-28 14:48:23 +02:00
zmagod	29e0ecbc89	move FirstTimeDataGenerator helper from applictaion controller	2018-07-11 11:19:39 +02:00
Oleksii Kriuchykhin	58d8414f92	Code fixes for sidebar [SCI-2478]	2018-06-01 15:05:12 +02:00
Oleksii Kriuchykhin	2ddc0fb561	Improve sidebar rendering performance [SCI-2478]	2018-06-01 13:49:02 +02:00
mlorb	600ec99c82	fix project navigation to work with archived pages and correct current team	2018-04-17 13:52:43 +02:00
zmagod	a2d8285f35	fixes archive button but [fixes SCI-2300]	2018-04-16 09:22:10 +02:00
Luka Murn	09c60d2468	Fixes per @Ducz0r's request	2018-04-12 14:38:22 +02:00
Luka Murn	9bf8b5d864	Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 ... Conflicts: Makefile app/assets/javascripts/projects/index.js.erb app/assets/stylesheets/themes/scinote.scss config/locales/en.yml	2018-04-12 13:16:46 +02:00
mlorb	bc06542ed7	refactor project navigation	2018-03-22 11:41:33 +01:00
Oleksii Kriuchykhin	a105e61d48	Remove tutorial [SCI-1860]	2018-03-18 13:18:05 +01:00
Matej Zrimšek	b8b9707c06	Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring.	2018-02-19 14:51:14 +01:00
Matej Zrimšek	d058c371d4	Readded project archive permission.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	93536afcd5	Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	a21343a819	Fixing and refactoring project permissions in controllers.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	279da20060	Fixed Hound warnings.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	d423700e84	Used permissions where they were missing.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	321ddc2916	Grouped existing project permissions and used 'canaid' gem.	2018-02-14 13:09:45 +01:00
mlorb	99185871c4	fix naming things	2018-01-05 15:15:50 +01:00
mlorb	29f9414839	refactor create project permission	2017-12-14 14:18:17 +01:00
zmagod	c35e2a4860	adds persistence to experiments order in project overview [fixes SCI-974]	2017-05-15 09:54:37 +02:00
Oleksii Kriuchykhin	c119b7c014	Make sciNote work for users without any teams [SCI_934]	2017-02-01 14:16:26 +01:00
zmagod	c2c5616078	rename Organization to Team in controllers	2017-01-24 17:06:51 +01:00
zmagod	21c2f82582	rename controllers where org/organization	2017-01-24 16:57:14 +01:00
okriuchykhin	02bfd19d1c	Merge pull request #385 from okriuchykhin/ok_SCI_102 ... Fix XSS on activites and throghout the rest of app [SCI-102]	2017-01-16 11:41:38 +01:00