Commit graph

30 commits

Author SHA1 Message Date
ajugo d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295) 2023-04-25 15:12:19 +02:00
Alex Kriuchykhin e7c61d6fd9
Fix smart annotation inventory items flyout, case with no available inventories [SCI-7824] (#4898) 2023-01-27 14:16:52 +01:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
aignatov-bio 86667feb6b Add remembered state for smart annotation 2020-09-17 11:43:07 +02:00
aignatov-bio 008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
aignatov-bio f4a13a73cb Refactor smart annotation front-end 2020-09-09 12:25:34 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Mojca Lorber be19190ff1 Revert default_scope for active repositories 2020-06-22 14:57:35 +02:00
Mojca Lorber 4c7c7ccdf1 Add ability to browse through shared inventories to smart annotations 2019-08-09 14:13:03 +02:00
Mojca Lorber cac7dab440 Show shared inventories in left navigation and fix read repository permission 2019-08-09 14:13:00 +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 40550f92c9 Improve HTML data escaping in JSON endpoints [SCI-3403] 2019-05-08 17:38:24 +02:00
Oleksii Kriuchykhin addf4cfe5e Handle situation with smart annotations and zero inventories [SCI-2396] 2018-05-14 15:34:23 +02:00
Oleksii Kriuchykhin 8ec643c54b Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301] 2018-05-09 18:03:16 +02:00
Oleksii Kriuchykhin 51860652c1 Refactor smart annotations modal [SCI-2223] 2018-04-02 20:38:56 +02:00
mlorb 2936770c01 refactor can view team users ATWHO permission 2017-12-14 14:18:18 +01:00
zmagod 8af3858209 fix hound 2017-04-14 11:13:58 +02:00
zmagod 9ee971c24b fixes broken users search method for smart annotation [fixes SCI-1192] 2017-04-13 16:14:12 +02:00
zmagod e59b2e039a Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939 2017-01-27 11:15:31 +01:00
Mojca Lorber 5bed5f0f4a fix bug with avatar in smart annotations 2017-01-26 17:15:00 +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
zmagod 3a1ec0eb5e refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +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
Luka Murn 5873eea994 We serve to please the Hound 2017-01-10 10:42:52 +01:00
Luka Murn a78bb79618 Temp commit 2017-01-05 12:07:17 +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