scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 05:02:50 +08:00
Code Issues Projects Releases Packages Wiki Activity
2769 commits 39 branches 184 tags 168 MiB
Commit graph

2769 commits

This branch
This branch
All branches
Author SHA1 Message Date
zmagod
3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +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
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
mlorb
9c3c32a366 fix problem with unconfirmed users 2017-10-23 11:25:49 +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
Luka Murn
e740e586e8 Additional fixes required by latest merge from master (nr. 2) 2017-10-23 10:43:32 +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
Zmago Devetak
794bcc537f Merge pull request #836 from ZmagoD/zd_SCI_1688 
fixes active tab bug, opt-in flow [fixes SCI-1688]
 2017-10-20 20:16:46 +02:00
Luka Murn
6d76029a57 Merge pull request #840 from biosistemika/release-1.12.5 
Merge release-1.12.5 into master
 2017-10-20 14:57:47 +02:00
mlorb
550c5ad6f6 add integration test for signup.feature 2017-10-20 14:48:47 +02:00
Luka Murn
fa4c787c6b Bump version to 1.12.5 2017-10-20 14:13:58 +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
20379dc62a fix invalid byte sequence bug 2017-10-19 14:53:50 +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
zmagod
fb0ba702e1 add HOC for page title 2017-10-19 12:37:17 +02:00
Oleksii Kriuchykhin
631b41cdaa Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551] 2017-10-19 11:38:23 +02:00
Zmago Devetak
a42b663fbf Merge pull request #838 from ZmagoD/zd_SCI_1705 
increase polling interval [fixes SCI-1705]
 2017-10-19 10:38:15 +02:00
zmagod
92061628a0 adds @Ducz0r suggestions 2017-10-19 10:35:53 +02:00
zmagod
063ac4ea0b increase polling interval [fixes SCI-1705] 2017-10-18 16:35:02 +02:00
zmagod
d324ea3c12 fixes flow error 2017-10-18 16:28:19 +02:00
zmagod
a6ea56540f Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688 2017-10-18 16:21:59 +02:00
zmagod
0a46d50e4b split custom types in multiple files 2017-10-18 16:14:45 +02:00
Zmago Devetak
6702265b1e Merge pull request #835 from ZmagoD/zd_SCI_1706 
disables invite user button if no emails present [fixes SCI-1706]
 2017-10-18 15:48:48 +02:00
zmagod
3558e20454 follow @Ducz0r suggestions 2017-10-18 15:37:13 +02:00
zmagod
2f68a90eff adds page titles [fixes SCI-1703] 2017-10-18 15:23:46 +02:00
mlorb
a7ebaaed87 Merge pull request #824 from mlorb/ml-sci-1700 
Fixes closing of notification modal window [SCI-1700]
 2017-10-18 15:01:59 +02:00
zmagod
d2c3827289 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688 2017-10-18 14:15:28 +02:00
Zmago Devetak
10d5b573ee Merge pull request #834 from ZmagoD/zd_SCI_1684 
fixes accept invitation bug [fixes SCI-1684]
 2017-10-18 14:10:08 +02:00
Zmago Devetak
fd755eedf0 Merge pull request #832 from ZmagoD/zd_SCI_1560 
adds label under protocols keywords input [fixes SCI-1560]
 2017-10-18 14:06:13 +02:00
zmagod
5afd65d2b1 fixes active tab bug, opt-in flow [fixes SCI-1688] 2017-10-18 13:59:52 +02:00
mlorb
5e9a1408f2 fix banana bug 2017-10-18 13:41:58 +02:00
mlorb
18e434c945 Merge pull request #833 from mlorb/ml-sci-1686 
Add new team to redux [SCI-1686]
 2017-10-18 13:10:10 +02:00
zmagod
6a5bafd07b fix hound 2017-10-18 08:42:48 +02:00
zmagod
3179a7abf5 disables invite user button if no emails present [fixes SCI-1706] 2017-10-18 08:37:58 +02:00
okriuchykhin
8e90e041b9 Merge pull request #825 from okriuchykhin/ok_SCI_1665 
Optimize memory usage in samples/repositories import [SCI-1665]
 2017-10-17 17:26:00 +02:00
zmagod
c554bc5c18 fixes accept invitation bug [fixes SCI-1684] 2017-10-17 16:00:26 +02:00