Luka Murn
|
9f60ece25f
|
Merge branch 'master' into rails-5.1
Conflicts:
app/models/repository.rb
app/models/repository_row.rb
app/views/projects/index.html.erb
app/views/shared/_secondary_navigation.html.erb
|
2017-07-06 15:12:15 +02:00 |
|
zmagod
|
525c9770ac
|
fixes experiment page [fixes SCI-1395]
|
2017-06-28 15:21:32 +02:00 |
|
Oleksii Kriuchykhin
|
e038bc58fa
|
Add global search in custom repositories [SCI-1356]
|
2017-06-23 16:12:56 +02:00 |
|
zmagod
|
819f47b450
|
setup sciNote for Rails 5.1
|
2017-06-23 15:19:08 +02:00 |
|
Oleksii Kriuchykhin
|
ad8dd6d740
|
PR fixes [SCI-1274]
|
2017-06-07 15:23:25 +02:00 |
|
Oleksii Kriuchykhin
|
8b1190060e
|
Add custom repository table [SCI-1274]
|
2017-06-07 15:23:25 +02:00 |
|
Oleksii Kriuchykhin
|
85e81e9ea2
|
Improve repository models and migration [SCI-1267]
|
2017-05-17 10:04:07 +02:00 |
|
Oleksii Kriuchykhin
|
72a651c7de
|
Add migrations and models for custom repositories [SCI-1267]
|
2017-05-16 15:27:36 +02:00 |
|