scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-17 14:46:00 +08:00
Code Issues Projects Releases Packages Wiki Activity
2861 commits 31 branches 181 tags 167 MiB
Commit graph

2861 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleksii Kriuchykhin
ea63864b33 Add icons for different notification types in recent notification dropdown [SCI-1865] 2017-12-12 17:05:08 +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
okriuchykhin
1c852252c4
Merge pull request #899 from okriuchykhin/ok_SCI_1839 
Fix jsPlumb library loading [SCI-1839]
 2017-12-04 14:12:12 +01:00
Luka Murn
022c81ec1f Add developer documentation to Git 
Currently, this only includes some remarks regarding validation.
 2017-12-01 15:53:38 +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
okriuchykhin
7dfaab82bb
Merge pull request #895 from okriuchykhin/ok_SCI_1840 
Add initialization of the selectpicker on experiments actions [SCI-1840]
 2017-11-30 10:56:07 +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
Zmago Devetak
215fa9d0b0
Merge pull request #887 from ZmagoD/zd_SCI_1762 
fixes rspec tests
 2017-11-24 11:48:39 +01:00
zmagod
65aee2630f fix makefile 2017-11-24 09:56:04 +01:00
zmagod
6987261b53 disable pending cucumber tests 2017-11-24 09:52:13 +01:00
zmagod
6f8c97a686 remove rm container 2017-11-23 17:43:09 +01:00
zmagod
b5537e2dfc change setup 2017-11-23 17:23:55 +01:00
zmagod
6d68135a70 adds mailer envs 2017-11-23 17:09:05 +01:00
zmagod
6d56377eb0 adds sleep time after Delayed::Worker.new.work_off 2017-11-23 16:57:30 +01:00
zmagod
331823c2fb upgrade capybara_email gem 2017-11-23 16:27:49 +01:00
zmagod
dc51d328bc removes make worker 2017-11-23 15:58:46 +01:00
zmagod
149f09da55 add workder to travic 2017-11-23 15:45:47 +01:00
zmagod
61be762b76 fix failing navigation spec 2017-11-23 15:30:08 +01:00
zmagod
930e3a86dc Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1762 2017-11-23 13:56:17 +01:00
Luka Murn
c51a85a161
Merge pull request #888 from biosistemika/lm-sci-1795 
Setup main architecture for permissions refactoring [SCI-1795]
 2017-11-23 12:32:49 +01:00
Luka Murn
00fe267a2a Minor codestyle fixes 2017-11-23 11:33:39 +01:00
Zmago Devetak
2f66c1df25
adds travis config file (#873) 
* adds travis config file

* add dist to travis

* adds script section

* test env

* remove globals

* adds hashed variables

* add matrix

* removed matrix

* test env

* testing

* test

* update Gemfile

* test travis

* test

* test

* test travis

* test

* build with docker

* test

* test

* ads

* add devise secre

* test travis

* test

* test

* test

* adds travis db configurations

* make travis happy

* test

* test

* test

* test

* test

* test

* testing devise

* test

* test

* teset

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* edit env

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* final commit

* test

* cleanup

* cleanup
 2017-11-23 09:55:57 +01:00
Luka Murn
28cadb987e Update revision of canaid Gem 2017-11-20 18:16:05 +01:00
zmagod
70db34090d fixes rspec tests 2017-11-20 09:41:14 +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
Luka Murn
ccef5571f1 Add dependency to Canaid, the permission helper library 2017-11-16 15:49:13 +01:00
Zmago Devetak
a2af2fcd7c
Merge pull request #885 from ZmagoD/zd_SCI_1817 
fixes dependencies issue [fix SCI-1817]
 2017-11-16 10:50:32 +01:00
zmagod
ed50466acd fixes dependencies issue [fix SCI-1817] 2017-11-16 09:49:42 +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
mlorb
a982472e4a
Merge pull request #863 from mlorb/ml-sci-1728 
Fix error with "event not defined" and add flowtype to ESLint [SCI-1728]
 2017-11-10 14:33:39 +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
Zmago Devetak
9678d2a50d
Merge pull request #858 from ZmagoD/zd_SCI_1576 
Implement Integration test: forgot password.feature
 2017-11-09 16:12:49 +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
zmagod
16d4327010 rename sign_in_sign_up dir to sessions 2017-11-09 15:53:16 +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
e227a75f5f rename folder 2017-11-09 13:40:30 +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
Zmago Devetak
a3245eecff
Merge pull request #851 from ZmagoD/zd_SCI_1568 
adds integration tests for about sciNote modal
 2017-11-09 09:01:00 +01:00
zmagod
f224629259 fixes failing team.feature:19 scenario 2017-11-09 09:00:00 +01:00