380 commits

Author	SHA1	Message	Date
Anton Ignatov	7c55fcf0cf	Merge branch 'master' into master-with-note-section	2019-04-30 12:07:59 +02:00
aignatov-bio	687b53feb1	Add new tag activtiies [SCI-3341] (#1712) ... * Add new tag activtiies	2019-04-30 10:23:09 +02:00
aignatov-bio	dc7fddc60a	Improve task tags (#1708)	2019-04-26 15:38:33 +02:00
Oleksii Kriuchykhin	7c91b4a255	Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266	2019-04-23 17:01:13 +02:00
Oleksii Kriuchykhin	c7a707f9db	Fix task clonning with TinyMCE images [SCI-3266]	2019-04-23 15:16:40 +02:00
Urban Rotnik	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
aignatov-bio	6b45dcd475	Update eln export for new tinyMCE image format (#1680)	2019-04-19 14:44:40 +02:00
Mojca Lorber	b00cf07684	Add activity for importing inventory items	2019-04-18 15:18:10 +02:00
aignatov-bio	7ef7e2397f	Change activity filter order and reduce custom date label size [SCI-3301] (#1651) ... * Change activity filter order and reduce custom date label size * Fix hound	2019-04-09 14:18:22 +02:00
Mojca Lorber	501c46bc92	Remove activities that belong to addons	2019-04-05 16:25:22 +02:00
Jure Grabnar	613843d095	Temp commit	2019-04-04 16:58:55 +02:00
Jure Grabnar	7136294386	Remove archive_task from the list of activity_types ... Closes SCI-3288	2019-04-03 19:13:00 +02:00
Oleksii Kriuchykhin	9e91e9e59d	Improve large image saving after editing [SCI-3289]	2019-04-03 16:31:56 +02:00
Jure Grabnar	22d193114e	Add asset to activity message item type ... Closes SCI-3283	2019-04-02 16:10:20 +02:00
aignatov-bio	e6102c72c7	Adding missed activities [SCI-3253] (#1614) ... * Adding missed activties * Adding test for activities	2019-04-02 11:50:37 +02:00
Urban Rotnik	b91f08fe99	Add activity for copying Inventory and Invetory item	2019-04-01 15:40:00 +02:00
Mojca Lorber	3c69225d6b	Change activities for task protocols	2019-03-29 15:09:20 +01:00
aignatov-bio	5c8f976ad1	Adding missed project comment activities [SCI-3250] (#1612) ... * Adding missed project comment activities * Fix markup	2019-03-29 11:45:31 +01:00
aignatov-bio	b51dcc9d75	Adding children selector to global activities subjects [SCI-3247] (#1605) ... * Adding children selector to global activities subjects * Fix naming, add seperate check for project id	2019-03-29 09:26:27 +01:00
Mojca Lorber	f06358b2ae	Implement missing tests for global activities (task and protocol activities)	2019-03-27 11:24:44 +01:00
aignatov-bio	54fd3a748b	Adding activity groups [SCI-3203] (#1588) ... * Adding activty groups	2019-03-26 15:29:21 +01:00
Miha Mencin	4a87216a3d	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +01:00
aignatov-bio	9fff93ab0e	Merge pull request #1576 from biosistemika/image-editor-prototype ... Feature/Image annotation	2019-03-22 16:31:00 +01:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Mojca Lorber	4f9814b884	Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021	2019-03-20 11:03:00 +01:00
Mojca Lorber	cd7a87348f	Protocol activities refactoring, without tests	2019-03-19 16:12:07 +01:00
Mojca Lorber	1418abc8d7	Reports activities refactoring	2019-03-19 15:33:57 +01:00
Urban Rotnik	fe35c805b7	Add model breadcrumbs, update activities_helper	2019-03-19 14:01:06 +01:00
aignatov-bio	6eae12efab	Updating permission check for image editing [SCI - 3153, 3159] (#1568) ... *Add permission check for assets editing * Add check for image format	2019-03-19 13:52:57 +01:00
Luka Murn	fc4b271803	Fix stack trace trimming on WOPI middleware	2019-03-14 08:34:04 +01:00
Urban Rotnik	32422c00eb	RepositoryRows actions loggin	2019-03-12 09:11:00 +01:00
Urban Rotnik	1a3c97b978	Add new enum values for Activity type_of	2019-03-12 09:11:00 +01:00
Oleksii Kriuchykhin	af94f79f0d	Submit image as FormData [SCI-2879]	2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin	89e968c410	Add tui.image-editor [SCI-2815]	2019-03-11 15:08:15 +01:00
Urban Rotnik	b8e84b5685	Add logic for saving message items values and types	2019-03-11 08:37:22 +01:00
Oleksii Kriuchykhin	0b87e8e1e4	Merge branch 'features/global-activities' into ok_SCI_3024_v3	2019-03-08 10:29:51 +01:00
Oleksii Kriuchykhin	0c99ea9c5c	Fix local storage file download links [SCI-3048]	2019-03-07 16:46:05 +01:00
aignatov-bio	ec2dbb897f	Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521) ... * Adding side pane filtering and top pane	2019-03-06 10:34:04 +01:00
Oleksii Kriuchykhin	0930277c4e	Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]	2019-02-27 16:02:53 +01:00
Oleksii Kriuchykhin	74a60d443d	Merge branch 'features/global-activities' into ok_SCI_3014_v2	2019-02-26 13:46:25 +01:00
Oleksii Kriuchykhin	61147b480c	Add main global activities bussiness logic [SCI-3014]	2019-02-26 11:01:15 +01:00
Urban Rotnik	5a123d26ac	Activity model update	2019-02-26 07:15:05 +01:00
Urban Rotnik	7b6c6c414d	Merge branch 'master' into features/templates	2019-02-19 14:46:15 +01:00
Urban Rotnik	5b55860dea	Add scheduler	2019-02-13 15:48:15 +01:00
Oleksii Kriuchykhin	da30d187a6	Create templates project when syncing templates if team doesn't have it [SCI-3039]	2019-02-13 15:17:33 +01:00
aignatov-bio	5c85595ab4	System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482) ... * System notification view and notification partial (SCI 2956 and SCI 3001)	2019-02-13 13:06:14 +01:00
Oleksii Kriuchykhin	cc92de3726	Merge latest features/templates [SCI-2939]	2019-01-30 10:43:54 +01:00
Urban Rotnik	863e3873c2	Comment for depricated NotificationType	2019-01-29 11:40:26 +01:00
Oleksii Kriuchykhin	bd2efa55ac	Add templates business logic [SCI-2939]	2019-01-25 10:55:08 +01:00