Commit graph

12 commits

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