scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-14 00:44:07 +08:00
Code Issues Projects Releases Packages Wiki Activity
3418 commits 55 branches 189 tags 169 MiB
Commit graph

3418 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
Zmago Devetak
58c850cfad Merge pull request #849 from ZmagoD/zd_SCI_1724 
adds environment variable that disables/enables the creation of new t…
 2017-10-26 12:37:55 +02:00
zmagod
d2ed415a25 Fixes per @okriuchykhin 's request 2017-10-26 10:42:18 +02:00
Zanz2
79e0a11054 Fixed before start and link not displaying in protocol description 2017-10-25 17:39:01 +02:00
Zanz2
a645bcb32d fixed oversight;Changed double quote to single 2017-10-25 17:21:05 +02:00
zmagod
5e6a4bb69a adds environment variable that disables/enables the creation of new team when user sign up 2017-10-25 15:29:04 +02:00
zmagod
c36fcb1fa4 fixes user invitation button [fixes SCI-1726] 2017-10-25 11:31:32 +02:00
zmagod
4de335d189 add whacamole configuration [fixes SCI-1683] 2017-10-25 09:47:26 +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
Zanz2
19b9da2e83 deleted comment 2017-10-24 19:44:34 +02:00
Zanz2
49501b3d3d Finished review refactor 2017-10-24 19:24:53 +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
zmagod
cd70395717 fixed some failing tests 2017-10-24 09:45:35 +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
Luka Murn
8cda449738 Update en.yml 
Remove unneccesary my_module_groups localization Strings.
 2017-10-23 17:49:55 +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
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
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
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
Zanz2
03e40017e4 Updated local 2017-10-19 19:58:18 +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
Zanz2
ae9ac46472 Put the two blocks of code into seperate partials 2017-10-19 00:13:35 +02:00