scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-20 16:11:27 +08:00
Code Issues Projects Releases Packages Wiki Activity
15158 commits 31 branches 181 tags 166 MiB
Commit graph

15158 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jure Grabnar
5283027da1 Add missing target var to searches. 2016-07-26 12:26:48 +02:00
Jure Grabnar
0361f006ca Add SearchableModel to Experiment and fix children 2016-07-26 12:26:48 +02:00
Jure Grabnar
49cd8a783d Update first time data generator with experiment. 2016-07-26 12:20:31 +02:00
Zmago Devetak
b13747291e Merge pull request #32 from ZmagoD/zd_SCI_31 
Fixing modules after integrating experiment-level
 2016-07-26 09:18:16 +02:00
zmagod
346bffe08f fixed protocol.rb 2016-07-26 09:17:24 +02:00
zmagod
c27ffa9fbf fixed project_my_module method 2016-07-26 08:44:09 +02:00
Luka Murn
3187843d14 Change updated_by -> last_modified_by 2016-07-25 14:47:13 +02:00
zmagod
6053c782f9 fixed permission_helper [fixes SCI-34] 2016-07-25 12:07:10 +02:00
zmagod
18d66ece56 migrated model related functions to experiment.rb [fixes: SCI-31] 2016-07-25 11:25:10 +02:00
zmagod
426bce48b2 fixed permission_helper 2016-07-25 09:31:40 +02:00
zmagod
b3c61cfa41 fixed project_my_modules method 2016-07-25 09:13:04 +02:00
zmagod
7c9a0bc2bb fixed models 2016-07-22 15:36:48 +02:00
zmagod
389ee7ea43 start fixing modules 2016-07-22 14:31:09 +02:00
Luka Murn
785fb2cba1 Initial migration & changes in ActiveRecords 2016-07-22 10:43:55 +02:00
Luka Murn
6da718072e Update CONTRIBUTING.md 2016-07-21 13:59:31 +02:00
Luka Murn
076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Nbernot
55042c5800 Merge pull request #30 from biosistemika/jira-test22 
SCI-6 #ready-for-merge #close Power Overwhelming!
 2016-06-24 10:57:32 +02:00
nbernot
e5f1939f72 SCI-6 #ready-for-merge #close Power Overwhelming! 2016-06-24 10:50:01 +02:00
Nbernot
662772717f Merge pull request #29 from biosistemika/jira-test21 
SCI-6
 2016-06-24 10:22:55 +02:00
nbernot
5d8c9c96e2 SCI-6 2016-06-24 10:20:24 +02:00
Nbernot
b9bab9e036 Merge pull request #28 from biosistemika/jira-test20 
SCI-6
 2016-06-24 10:02:53 +02:00
nbernot
c3347ecc27 SCI-6 2016-06-24 10:01:33 +02:00
Nbernot
835fb08f2a Merge pull request #27 from biosistemika/jira-test16 
SCI-6
 2016-06-24 09:53:07 +02:00
nbernot
f320b0c14b SCI-6 2016-06-23 16:16:02 +02:00
Nbernot
0d393948ed Merge pull request #26 from biosistemika/jira-test15 
SCI-6
 2016-06-23 15:49:19 +02:00
nbernot
f336ddaa38 SCI-6 2016-06-23 15:46:47 +02:00
Nbernot
f8bde75b6e Merge pull request #25 from biosistemika/jira-test13 
SCI-6
 2016-06-23 15:42:31 +02:00
nbernot
fc12d554df SCI-6 2016-06-23 15:40:26 +02:00
Nbernot
ba6fee50e3 Merge pull request #24 from biosistemika/jira-test12 
SCI-6
 2016-06-23 15:37:05 +02:00
nbernot
0fd43c00b7 SCI-6 2016-06-23 15:35:58 +02:00
Nbernot
20b3294407 Merge pull request #21 from biosistemika/jira-test10 
SCI-6 #close because i can!
 2016-06-23 15:08:29 +02:00
nbernot
5229ecb37a SCI-6 #close because i can! 2016-06-23 15:07:22 +02:00
Nbernot
6f0e7ffc57 Merge pull request #20 from biosistemika/jira-test9 
SCI-6 #close can i close directly?
 2016-06-23 15:03:52 +02:00
nbernot
4911e3a18b SCI-6 #close can i close directly? 2016-06-23 15:02:30 +02:00
Nbernot
7a4ea75367 Merge pull request #19 from biosistemika/jira-test7 
SCI-6
 2016-06-23 14:57:31 +02:00
nbernot
d3aeb73972 SCI-6 2016-06-23 14:31:13 +02:00
nbernot
a8587be94e SCI-6 #close WORK!!!! 2016-06-23 14:20:42 +02:00
Nbernot
2b0a5f7762 Merge pull request #18 from biosistemika/triggers 
SCI-6 #ready-for-merge WORK!
 2016-06-23 13:43:05 +02:00
nbernot
7d6225aaa0 SCI-6 #ready-for-merge WORK! 2016-06-23 13:41:50 +02:00
nbernot
8edb1cfe55 SCI-6 #closed this way perhaps? 2016-06-23 10:54:06 +02:00
nbernot
1e8b3ab23b SCI-6 #comment this is just a comment 2016-06-23 10:51:13 +02:00
Nbernot
ce1fb064ff Merge pull request #17 from biosistemika/jira-test4 
SCI-6 #close I hope this works
 2016-06-23 10:48:47 +02:00
nbernot
3fb7806ae2 SCI-6 #close I hope this works 2016-06-23 10:47:34 +02:00
Nbernot
6106429039 Merge pull request #16 from biosistemika/jira-test3 
Jira test3
 2016-06-23 10:29:20 +02:00
nbernot
64f22aa4ea SCI-6 #Close testing jira smartcommits 2016-06-23 10:27:48 +02:00
nbernot
9c5994d1e8 testing 2016-06-23 10:26:31 +02:00
Nbernot
1d1c4ac7d9 Merge pull request #15 from biosistemika/jira-test 
SCI-6 #Ready_for_merge Testing integration
 2016-06-23 10:19:02 +02:00
nbernot
2d6cb4aa5d SCI-6 #Ready_for_merge Testing integration 2016-06-23 10:17:11 +02:00
Luka Murn
0656c2fd07 Update CONTRIBUTING.md 2016-05-13 10:47:46 +02:00
Luka Murn
b7415bfc3d Minor fix in README.md 2016-05-13 09:56:01 +02:00