zmagod
|
eb8124ea5a
|
follow @duco 's suggestions
|
2018-01-05 17:08:00 +01:00 |
|
zmagod
|
be014000ab
|
fixes flow-types
|
2018-01-05 09:59:08 +01:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Luka Murn
|
00fe267a2a
|
Minor codestyle fixes
|
2017-11-23 11:33:39 +01:00 |
|
Luka Murn
|
d715eb06ef
|
Add team & project role-related helper functions to User model
This will be required later once we start using Canaid.
|
2017-11-16 15:50:30 +01:00 |
|
Zmago Devetak
|
fe128dc53b
|
Merge pull request #865 from ZmagoD/zd_SCI_1761
fixes password validations [fixes SCI-1761]
|
2017-11-13 13:09:46 +01:00 |
|
zmagod
|
26912a14d6
|
fixes password validations [fixes SCI-1761]
|
2017-11-10 12:59:37 +01:00 |
|
mlorb
|
fd743ec2d5
|
fix error with event not defined and add flowtype to ESLint
|
2017-11-10 09:30:55 +01:00 |
|
mlorb
|
dfb2689fbf
|
Merge pull request #860 from mlorb/ml-sci-1730
Fix team table does not retain the number of teams per page bug [SCI-1730]
|
2017-11-09 17:53:19 +01:00 |
|
zmagod
|
327e27e123
|
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576
|
2017-11-09 15:55:10 +01:00 |
|
mlorb
|
b3e39697d5
|
Merge pull request #857 from mlorb/ml-sci-1575
Implement login feature integration tests [SCI-1575]
|
2017-11-09 13:48:57 +01:00 |
|
mlorb
|
b0fe792f9c
|
fix ESLint class-methods-use-this error
|
2017-11-09 13:33:41 +01:00 |
|
mlorb
|
c7f5d6ed8c
|
add state for number of teams per page
|
2017-11-09 13:29:14 +01:00 |
|
Zmago Devetak
|
7386974d64
|
Merge pull request #850 from ZmagoD/zd_SCI_1731
add scenic gem, teams datatables sql view
|
2017-11-09 11:37:20 +01:00 |
|
zmagod
|
e0b6683a44
|
create view directory per @Ducz0r 's request
|
2017-11-09 10:06:53 +01:00 |
|
mlorb
|
4e92065ea0
|
Merge pull request #855 from mlorb/ml-sci-1633-v2
Fix bug with import css styles [SCI-1633]
|
2017-11-09 09:49:37 +01:00 |
|
zmagod
|
9eac014f1a
|
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731
|
2017-11-09 09:05:22 +01:00 |
|
zmagod
|
e2af987b80
|
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1568
|
2017-11-09 08:35:39 +01:00 |
|
zmagod
|
33ebe1f748
|
integration tests for forgot_password [fixes SCI-1576]
|
2017-11-08 16:23:52 +01:00 |
|