scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 15:33:50 +08:00
Code Issues Projects Releases Packages Wiki Activity
3388 commits 43 branches 185 tags 169 MiB
Commit graph

3388 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
605674bf6b adds controller spec 2017-11-02 13:36:21 +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
Zanz2
6fc1afe4c1 Trying to fix this messy table preview 2017-10-30 01:57:42 +01:00
Zanz2
de9a3a1d0d Preview tables are now functional but with inline javascript , ugly styling and a few major bugs (they dont display fully until you click on them, and i dug deep on the handson table wiki and hot table wiki for issues like this, and while they exist, idk how to implement the solutions because they use angular js mostly 2017-10-28 23:57:29 +02:00
Zanz2
a167db11da Scinote table elements code 2017-10-28 20:20:19 +02:00
Zanz2
c291caaae3 Debbuging preive hot tables 2017-10-28 16:59:36 +02:00
Zanz2
2413dc251a Added new preview tables code 2017-10-28 02:19:22 +02:00
zmagod
e5a01f7a57 adds integration tests for about sciNote modal 2017-10-27 16:37:42 +02:00
okriuchykhin
2e0bf91467 Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675 
Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2
 2017-10-27 11:14:39 +02:00
Zmago Devetak
a769cb8563 Merge pull request #846 from ZmagoD/zd_SCI_1723 
adds wait_for_ajax function to cucumber tests [fixes SCI-1723]
 2017-10-27 10:54:09 +02:00
zmagod
22cf72e054 fix hound 2017-10-27 10:53:19 +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
Zanz2
a732c8afa7 Code for protocol repository scinote table elements view 2017-10-26 17:28:27 +02:00
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