scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
7422 commits 70 branches 179 tags 165 MiB
Commit graph

7422 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zmagod 485d93f8b9 refactor canvas permissions 2016-07-27 11:35:07 +02:00
zmagod 0955d1c66a 1. Fixed fixtures 
2. Added shoulda matcher gem
3. Added Experiment test suite
4. Fixed failing tests
 2016-07-27 10:49:13 +02:00
jbargu 3453da4c17 Merge pull request #34 from biosistemika/jg_explvl_global_search 
Update global search for experiment level
 2016-07-27 10:20:14 +02:00
Jure Grabnar 1a1c4bb68a Remove needless join from MyModuleGroup 2016-07-27 10:18:57 +02:00
zmagod 39c3a83e11 fixed my_modules and my_modules_groups fixtures and added experiments fixture 2016-07-26 15:18:09 +02:00
zmagod 5c7501a273 added experiments canvas labels in localization file and fixed canvas views 2016-07-26 14:21:59 +02:00
zmagod 0a84ecdfc1 edit canvas controller to work with experiment 2016-07-26 14:02:06 +02:00
Luka Murn 43d1ad608a Add CLA text to CONTRIBUTING.md 2016-07-26 13:58:03 +02:00
Jure Grabnar 77ed1c5fd3 Change invalid references to project in search and shorten lines. 2016-07-26 12:59:37 +02:00
Jure Grabnar 80621c9b6b Add experiment text to all searches related to experiment 2016-07-26 12:26:48 +02:00
Jure Grabnar 690ad0fffa Add a few experiment permissions 2016-07-26 12:26:48 +02:00
Jure Grabnar 3be562bdf6 Add experiment to search results 2016-07-26 12:26:48 +02:00
Jure Grabnar 6d26203796 Add missing target var to result searches 2016-07-26 12:26:48 +02:00
Jure Grabnar 17bcaeb2c2 Add experiment to db:fake:generate 
Also tweak a numbers a bit since experiment is another factor now.
 2016-07-26 12:26:48 +02:00
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