Commit graph

3305 commits

Author SHA1 Message Date
mlorb
bd7eda1506 fix failing tests 2017-12-14 14:18:18 +01:00
mlorb
2936770c01 refactor can view team users ATWHO permission 2017-12-14 14:18:18 +01:00
mlorb
5c790287ec refactor again manage user team permissions 2017-12-14 14:18:18 +01:00
mlorb
7c1ae6bc82 refactor manage repository permissions 2017-12-14 14:18:18 +01:00
mlorb
2918a9833d refactor manage repository column permissions 2017-12-14 14:18:18 +01:00
mlorb
3f5e9e60b7 refactor view repository permission 2017-12-14 14:18:18 +01:00
mlorb
079ac7a4d3 refactor manage repository row permissions 2017-12-14 14:18:18 +01:00
mlorb
740ecc674b refactor view repositories permission 2017-12-14 14:18:18 +01:00
mlorb
3ca51f097f refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions 2017-12-14 14:18:17 +01:00
mlorb
e577b363b2 byTheWay fix of Rails 5.1 bug 2017-12-14 14:18:17 +01:00
mlorb
29f9414839 refactor create project permission 2017-12-14 14:18:17 +01:00
mlorb
72023c7dfe refactor update/delete sample permissions 2017-12-14 14:18:17 +01:00
mlorb
b09377cd8d refactor update sample permission 2017-12-14 14:18:17 +01:00
mlorb
f801ed8eb6 refactor view/export samples permission 2017-12-14 14:18:16 +01:00
mlorb
0d37f9c85a refactor clone protocol permission 2017-12-14 14:18:16 +01:00
mlorb
f6d36ae6a2 refactor update protocol type in repository 2017-12-14 14:18:16 +01:00
mlorb
806fcbce36 refactor update protocol in repository permission 2017-12-14 14:18:16 +01:00
mlorb
e0d1ae174e refactor read protocol in repository permission 2017-12-14 14:18:15 +01:00
mlorb
a3a494c3a2 fix banana: remove dead code which strangely reappeared, probably with some rebasing 2017-12-14 14:18:15 +01:00
mlorb
ccc2451494 refactor create sample permissions 2017-12-14 14:18:15 +01:00
mlorb
43c01b74b1 refactor create protocol permission 2017-12-14 14:18:14 +01:00
mlorb
11a3cd196c add create, update team permission and refactor 422 respond handling in controllers 2017-12-14 14:18:14 +01:00
mlorb
8893fd668d add create, update, delete user_team permission 2017-12-14 14:18:14 +01:00
mlorb
a0b2d3f5ef refactor read_team permission 2017-12-14 14:18:14 +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
Adrian Oprea
20eb9f643f chore: Add EditorConfig preference file
EditorConfig is a tool (editor extension) that allows developers to
configure the indent style / size for various files in the codebase.
It is useful to uniformly introduce spacing for various filetypes.
In our case it is used for .js/.jsx and .rb files to keep indents
consistent. It is also configured to insert a final new line on every
file we create/edit. This is helpful for Git Diffs.

Learn more about EditorConfig: http://editorconfig.org/

Learn more about the history behind new lines at EOF:

- https://robots.thoughtbot.com/no-newline-at-end-of-file
- https://unix.stackexchange.com/questions/18743/whats-the-point-in-adding-a-new-line-to-the-end-of-a-file
- https://stackoverflow.com/questions/5813311/no-newline-at-end-of-file

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2017-12-14 10:34:12 +02: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
zmagod
b106545d31 fixes per @duco 's request 2017-12-13 08:57:50 +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
Zmago Devetak
00be4460cc
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step
Fixes bug with embedded images [SCI-1624]
2017-12-12 09:53:24 +01:00
Zanz2
306ae51a4c
Merge pull request #904 from Zanz2/buttons_design_SCI-1809
Made scrolling possible at most zoom levels in protocols.io import preview [SCI-1809]
2017-12-11 21:16:40 +01:00
Zanz2
1fc8b2a2b2 quick fix un-needed styling 2017-12-10 01:45:47 +01:00
Zanz2
11dc3be9d4 It is now possible to scroll down preview modal 2017-12-10 01:41:21 +01:00
Zanz2
d0a9198408 Fixed the styling 2017-12-10 01:20: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
b3b0e367e8
Merge pull request #889 from okriuchykhin/ok_SCI_1747
Improve server side assets validation display for steps [SCI-1747]
2017-12-04 14:12:43 +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
zmagod
52e5cf7be8 remove unneeded import 2017-12-04 13:27:24 +01:00
zmagod
e01e7bebbf add permissions endpoint on the API 2017-12-04 13:25:48 +01:00
Zanz2
b0012ab936 Simplified repeating method calls 2017-12-03 16:50:06 +01:00
Zanz2
fcbd956d6e Finished code beautification 2017-12-03 01:17:49 +01:00
Zanz2
835ac6910f Code refactor part 1 2017-12-02 00:29:47 +01:00
Zmago Devetak
205d3b3d8f
Merge pull request #894 from ZmagoD/zd_SCI_1650
Adds task to copy images [fixes SCI-1650]
2017-12-01 17:32:09 +01:00