scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
2945 commits 70 branches 179 tags 165 MiB
Commit graph

2337 commits

Author SHA1 Message Date
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
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
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
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
zmagod b6a5ab5e6c fix request 2017-12-01 17:29:46 +01:00
zmagod 52b278fe78 adds premissions service to FE 2017-12-01 17:15:15 +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
zmagod b036452d8c adds background worker to cucumber tests 2017-11-08 11:59:01 +01:00
Luka Murn dfa1c83c9f Merge branch 'lm-add-flow-to-validation' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-add-flow-to-validation 
Conflicts:
	flow-typed/npm/lodash_v4.x.x.js
 2017-11-08 09:33:29 +01:00
Luka Murn 0412c6f283 Update code per @ZmagoD's request 2017-11-07 17:30:15 +01:00
mlorb 157b1968cc implement login's feature integration tests 2017-11-07 17:18:41 +01:00
mlorb df835fccb4 fix bug with import css styles 2017-11-07 11:09:30 +01:00
zmagod 3255d5cf7c code cleanup 2017-11-06 15:37:09 +01:00
zmagod 54e360bb52 fixes team switch 2017-11-06 15:14:17 +01:00
mlorb bd569b9746 small changes 2017-11-06 11:34:25 +01:00
mlorb 21e3c653eb add integration tests for single team feature 2017-11-03 10:48:09 +01:00
zmagod 5bc38414d1 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-03 09:56:44 +01:00
Zmago Devetak 460bcd4980
Merge pull request #844 from ZmagoD/zd_SCI_1669 
Refactor all API server calls from react to go through the services
 2017-11-03 09:19:02 +01:00
Zmago Devetak b1f4d578f0
Merge pull request #848 from ZmagoD/zd_SCI_1726_add_team_member_bug_fix 
fixes user invitation button [fixes SCI-1726]
 2017-11-02 16:50:42 +01:00
zmagod 618880aa30 follows @Ducz0r 's remarks 2017-11-02 16:49:09 +01:00
zmagod e17f945d8a fix typos 2017-11-02 16:41:29 +01:00
zmagod 5ded818291 fixes failing cucumber tests 2017-11-02 16:24:11 +01:00
zmagod 5538805faa Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1669 2017-11-02 14:39:07 +01:00
zmagod 2118b31762 adds about sciNote modal 2017-11-02 13:23:57 +01:00
Luka Murn 329dd4f1b0 Onboard Flow onto validation components. 2017-10-30 14:13:36 +01:00
zmagod e5a01f7a57 adds integration tests for about sciNote modal 2017-10-27 16:37:42 +02:00
zmagod 3158fc4a8a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1723 2017-10-27 10:47:10 +02:00
zmagod e0323a0a46 fixes failing tests 2017-10-27 09:35:39 +02:00
zmagod 3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +02:00
zmagod c36fcb1fa4 fixes user invitation button [fixes SCI-1726] 2017-10-25 11:31:32 +02:00
Luka Murn be2c3b807f Merge pull request #845 from Ducz0r/lm-sci-1670 
Input validation extracting to reusable service [SCI-1670]
 2017-10-25 09:42:33 +02:00
zmagod 62dfd6a713 adds wait_for_ajax function to cucumber tests [fixes SCI-1723] 2017-10-24 15:39:06 +02:00
Luka Murn a60e4c28bb Hound is love, Hound is life 2017-10-24 13:58:59 +02:00
Luka Murn cbe3e67402 Codestyle refactor 2017-10-24 13:57:33 +02:00
Luka Murn 0eea1e3def Fixes per @ZmagoD's request 2017-10-24 13:49:33 +02:00
mlorb 324ecf1bb4 Merge pull request #843 from mlorb/ml-sci-1574 
Add integration test for signup.feature [SCI-1574]
 2017-10-24 10:05:28 +02:00
Luka Murn 998519066c Remove unneeded localized Strings 2017-10-24 10:00:10 +02:00
Luka Murn 823ed75898 Add file validators, refactor a bit 2017-10-24 09:40:55 +02:00
Luka Murn c026b60790 Update Profile page to use validation 2017-10-23 18:04:20 +02:00
Luka Murn ceb11c143f Change edit team name & description modals to use new validation 2017-10-23 17:55:28 +02:00
Luka Murn 463d17ace1 Add first version of reusable validation form elements 
Implemented on new team page.
 2017-10-23 17:55:28 +02:00
zmagod f76dc29e61 fix change user role [fixes SCI-1669] 2017-10-23 15:48:12 +02:00
zmagod 545cf50993 removes modalContaine, move leaveTeamModal under teams 2017-10-23 15:02:04 +02:00
Luka Murn 82f982e983 Merge branch 'rails-5.1' into decoupling-settings-page 
Conflicts:
	Gemfile
	Gemfile.lock
 2017-10-23 10:59:10 +02:00
zmagod 7d6d95630d add flow and fix api request in updateTeamNameModal component 2017-10-23 10:11:39 +02:00
zmagod 7cf43a299a adds flow in updateTeamDescriptionModal 2017-10-23 09:59:05 +02:00
Luka Murn 6c2c5aff17 Additional fixes required by latest merge from master 2017-10-23 09:51:13 +02:00
Luka Murn 8254153bb9 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/connection.rb
	app/models/experiment.rb
	app/models/my_module.rb
 2017-10-23 08:57:57 +02:00
Zmago Devetak a0eaec214b Merge pull request #821 from ZmagoD/zd_SCI_1572 
Implement integration test: profile.feature + initial setup
 2017-10-20 20:17:37 +02:00
mlorb 550c5ad6f6 add integration test for signup.feature 2017-10-20 14:48:47 +02:00
okriuchykhin 44733fefda Merge pull request #839 from okriuchykhin/ok_SCI_1609 
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
 2017-10-19 16:26:36 +02:00
zmagod e3e3f4c75d Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688 2017-10-19 16:06:40 +02:00
Zmago Devetak a677ef06c7 Merge pull request #837 from ZmagoD/zd_SCI_1703 
adds page titles [fixes SCI-1703]
 2017-10-19 15:50:16 +02:00
zmagod 09e4e23e3d fixes typos 2017-10-19 15:48:21 +02:00
zmagod 7943bfda13 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688 2017-10-19 14:01:26 +02:00
zmagod 5e5d7ea2dd fix page title locales 2017-10-19 12:50:33 +02:00