scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-27 10:26:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
3325 commits 69 branches 179 tags 165 MiB
Commit graph

3325 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
okriuchykhin 0a6d0d1a47
Merge pull request #918 from okriuchykhin/ok_SCI_1893 
Fix invite users dropdown [SCI-1893]
 2017-12-22 16:58:49 +01:00
okriuchykhin 6fe7598b90
Merge pull request #919 from okriuchykhin/ok_SCI_1895 
Fix bootstrap select dropdown [SCI-1895][SCI-1896]
 2017-12-22 16:58:38 +01:00
okriuchykhin a31d616cf8
Merge pull request #920 from okriuchykhin/ok_SCI_1872 
Fix experiment workflow image update indicator [SCI-1872]
 2017-12-22 16:58:26 +01:00
Oleksii Kriuchykhin 917c2cf28e Fix experiment workflow image update indicator [SCI-1872] 2017-12-22 13:12:52 +01:00
Oleksii Kriuchykhin b98241ef61 Fix bootstrap select dropdown [SCI-1895][SCI-1896] 2017-12-22 09:52:00 +01:00
Oleksii Kriuchykhin afb579bef1 Fix invite users dropdown [SCI-1893] 2017-12-21 16:49:10 +01:00
mlorb 0774b6f7e6 refactor manage samples permissions again, so that addons permissions can be added 2017-12-20 16:05:05 +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
Luka Murn 44f0336a96
Merge pull request #915 from biosistemika/lm-fix-wicked-pdf-version 
Fix Wicked PDF version
 2017-12-20 11:08:03 +01:00
Luka Murn 704bd31fef Set wicked_pdf version to ~> 1.0.6 2017-12-20 10:53:53 +01:00
Oleksii Kriuchykhin 512ee07bde Fix repositories [SCI-1873] 2017-12-19 17:53:45 +01:00
okriuchykhin ee973bb3c1
Merge pull request #913 from okriuchykhin/ok_SCI_1891 
Remove Creek XLSX parser gem as it causes conflicts [SCI-1891]
 2017-12-19 16:34:53 +01:00
Oleksii Kriuchykhin 1a81a99ff0 Remove Creek XLSX parser gem as it causes conflicts [SCI-1891] 2017-12-19 16:17:11 +01:00
okriuchykhin 565fd07d05
Merge pull request #912 from okriuchykhin/ok_SCI_1891 
Fix gem dependencies [SCI-1891]
 2017-12-19 14:21:45 +01:00
Oleksii Kriuchykhin 99de5550b0 Fix gem dependencies [SCI-1891] 2017-12-19 14:18:29 +01:00
Luka Murn 49f9981a39 Remove uneccesary submodule include 2017-12-19 12:05:28 +01:00
Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4' 
Conflicts:
	Gemfile.lock
 2017-12-19 10:56:39 +01:00
Zanz2 53561ffd84 Refactored according to PR 2017-12-15 20:39:15 +01:00
Adrian Oprea 7358022fa5
Merge pull request #909 from biosistemika/chore/add-EditorConfig 
chore: Add EditorConfig preference file
 2017-12-14 15:42:31 +02:00
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