2886 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zmagod	862b73cae7	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866	2018-01-05 09:13:43 +01:00
okriuchykhin	4cdbecc3bc	Merge pull request #923 from okriuchykhin/ok_SCI_1869 ... Add project/task path with tooltips to activities [SCI-1869]	2018-01-04 16:44:35 +01:00
Oleksii Kriuchykhin	53f4db9352	Code refactoring [SCI-1869]	2018-01-04 14:56:16 +01:00
okriuchykhin	b0f8c36677	Merge pull request #917 from okriuchykhin/ok_SCI_1870 ... Fix adding users to a task [SCI-1870]	2018-01-04 14:14:05 +01:00
okriuchykhin	e49ffb61d4	Merge pull request #914 from okriuchykhin/ok_SCI_1873 ... Fix repositories [SCI-1873]	2018-01-04 13:33:30 +01:00
Oleksii Kriuchykhin	070711917e	Code fixes [SCI-1873]	2018-01-04 11:25:34 +01:00
okriuchykhin	d149facd50	Merge pull request #922 from okriuchykhin/ok_SCI_1875 ... Fix about modal [SCI-1875]	2018-01-03 17:00:29 +01:00
okriuchykhin	ac7746ae91	Merge pull request #916 from okriuchykhin/ok_SCI_1871 ... Fix canvas update [SCI-1871]	2018-01-03 15:47:10 +01:00
okriuchykhin	ff62a36788	Merge pull request #910 from okriuchykhin/ok_SCI_1838 ... Change invite users to project link to new settings page [SCI-1838]	2018-01-03 14:47:26 +01:00
okriuchykhin	b8fa3c4d51	Merge pull request #905 from okriuchykhin/ok_SCI_1865 ... Add icons for different notification types in recent notification dropdown [SCI-1865]	2018-01-03 14:23:53 +01:00
zmagod	1d3881b649	fixes bug with duplicated activities and wrong date separators [fixes SCI-1866]	2018-01-03 13:48:59 +01:00
Oleksii Kriuchykhin	2e275d6d67	Add project/task path with tooltips to activities [SCI-1869]	2017-12-28 15:13:39 +01:00
Oleksii Kriuchykhin	89230bd730	Fix about modal [SCI-1875]	2017-12-22 18:27:20 +01:00
Oleksii Kriuchykhin	49ae9bcd55	Fix adding users to a task [SCI-1870]	2017-12-20 13:44:21 +01:00
Oleksii Kriuchykhin	66869fe4cf	Fix canvas update [SCI-1871]	2017-12-20 11:44:11 +01:00
Oleksii Kriuchykhin	512ee07bde	Fix repositories [SCI-1873]	2017-12-19 17:53:45 +01:00
zmagod	219ef3baf6	setup new pagination for activities	2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin	4ff6e87fed	Change invite users to project link to new settings page [SCI-1838]	2017-12-14 11:22:28 +01:00
zmagod	3b1cb51be9	fixed flow-type error	2017-12-14 08:08:08 +01:00
Oleksii Kriuchykhin	7bdc22ee80	Remove default property [SCI-1865]	2017-12-13 17:28:05 +01:00
Oleksii Kriuchykhin	6986d11cfe	Add Flow types for notifications [SCI-1865]	2017-12-13 17:25:25 +01:00
zmagod	249d3d7698	fixes current timezone setup for activities	2017-12-13 16:48:31 +01:00
okriuchykhin	2fa7591f36	Merge pull request #903 from okriuchykhin/ok_SCI_1864 ... Rename notifications settings accessor [SCI-1864]	2017-12-13 12:57:56 +01:00
Oleksii Kriuchykhin	baf3151bb0	Fix notification settings accessors [SCI-1864]	2017-12-13 11:59:53 +01:00
Oleksii Kriuchykhin	ea63864b33	Add icons for different notification types in recent notification dropdown [SCI-1865]	2017-12-12 17:05:08 +01:00
Oleksii Kriuchykhin	6256acdfea	Rename notifications settings accessor [SCI-1864]	2017-12-07 13:59:33 +01:00
Luka Murn	86ac07c69f	Merge pull request #902 from biosistemika/rails-5.1 ... Merge rails-5.1 into decoupling-settings-page	2017-12-07 09:25:11 +01:00
okriuchykhin	1c852252c4	Merge pull request #899 from okriuchykhin/ok_SCI_1839 ... Fix jsPlumb library loading [SCI-1839]	2017-12-04 14:12:12 +01:00
Luka Murn	022c81ec1f	Add developer documentation to Git ... Currently, this only includes some remarks regarding validation.	2017-12-01 15:53:38 +01:00
Oleksii Kriuchykhin	c4fe2b1c11	Fix jsPlumb library loading [SCI-1839]	2017-12-01 10:48:07 +01:00
okriuchykhin	16729ccd7d	Merge pull request #898 from okriuchykhin/ok_SCI_1838 ... Fix assignment of users to projects [SCI-1838]	2017-11-30 11:16:07 +01:00
okriuchykhin	9ed73702c5	Merge pull request #896 from okriuchykhin/ok_SCI_1837 ... Fix Ajax calls with redirect [SCI-1837]	2017-11-30 11:00:26 +01:00
okriuchykhin	7dfaab82bb	Merge pull request #895 from okriuchykhin/ok_SCI_1840 ... Add initialization of the selectpicker on experiments actions [SCI-1840]	2017-11-30 10:56:07 +01:00
Oleksii Kriuchykhin	194054d973	Fix assignment of users to projects [SCI-1838]	2017-11-29 22:55:10 +01:00
Oleksii Kriuchykhin	7bb52191cd	Fix Ajax calls with redirect [SCI-1837]	2017-11-29 16:13:28 +01:00
Oleksii Kriuchykhin	6964ed2dbb	Add initialization of the selectpicker on experiments actions [SCI-1840]	2017-11-28 16:34:30 +01:00
Zmago Devetak	215fa9d0b0	Merge pull request #887 from ZmagoD/zd_SCI_1762 ... fixes rspec tests	2017-11-24 11:48:39 +01:00
zmagod	65aee2630f	fix makefile	2017-11-24 09:56:04 +01:00
zmagod	6987261b53	disable pending cucumber tests	2017-11-24 09:52:13 +01:00
zmagod	6f8c97a686	remove rm container	2017-11-23 17:43:09 +01:00
zmagod	b5537e2dfc	change setup	2017-11-23 17:23:55 +01:00
zmagod	6d68135a70	adds mailer envs	2017-11-23 17:09:05 +01:00
zmagod	6d56377eb0	adds sleep time after Delayed::Worker.new.work_off	2017-11-23 16:57:30 +01:00
zmagod	331823c2fb	upgrade capybara_email gem	2017-11-23 16:27:49 +01:00
zmagod	dc51d328bc	removes make worker	2017-11-23 15:58:46 +01:00
zmagod	149f09da55	add workder to travic	2017-11-23 15:45:47 +01:00
zmagod	61be762b76	fix failing navigation spec	2017-11-23 15:30:08 +01:00
zmagod	930e3a86dc	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1762	2017-11-23 13:56:17 +01:00
Luka Murn	c51a85a161	Merge pull request #888 from biosistemika/lm-sci-1795 ... Setup main architecture for permissions refactoring [SCI-1795]	2017-11-23 12:32:49 +01:00
Luka Murn	00fe267a2a	Minor codestyle fixes	2017-11-23 11:33:39 +01:00