zmagod
|
bad52ceff1
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336
|
2017-06-21 15:56:07 +02:00 |
|
zmagod
|
a865253a2e
|
first run
|
2017-06-13 08:10:10 +02:00 |
|
rekonder
|
ede744849b
|
Export repository [aj-SCI-1275]
|
2017-06-09 19:44:28 +02:00 |
|
Mojca Lorber
|
71c523c406
|
load tabs with javascript
|
2017-06-08 13:47:30 +02:00 |
|
Luka Murn
|
61eb52f86f
|
Implement GUI for copying repositories
Closes SCI.1270.
|
2017-06-07 19:11:25 +02:00 |
|
Luka Murn
|
38361e4bb4
|
Setup initial GUI
|
2017-06-07 18:43:48 +02:00 |
|
Oleksii Kriuchykhin
|
8b1190060e
|
Add custom repository table [SCI-1274]
|
2017-06-07 15:23:25 +02:00 |
|
Mojca Lorber
|
51c4eeb106
|
renaming
|
2017-06-06 15:50:43 +02:00 |
|
Mojca Lorber
|
13bf4ad229
|
create new repository
|
2017-06-06 09:54:39 +02:00 |
|
Matej Zrimšek
|
2c6ad4aa05
|
Refactored modal popups for repositories to make them general. [fix 1269]
|
2017-06-05 14:13:24 +02:00 |
|
Matej Zrimšek
|
21a72da84f
|
Added rename logic and improved remove logic. [SCI-1269]
|
2017-06-02 17:50:34 +02:00 |
|
Matej Zrimšek
|
cdaac6a01b
|
Added remove repository modal logic. [SCI-1269]
|
2017-06-02 17:50:33 +02:00 |
|
Matej Zrimšek
|
791bb934ca
|
Remove repository modal logic (WIP). [SCI-1269]
|
2017-06-02 17:50:33 +02:00 |
|
mlorb
|
872f712be8
|
Merge branch 'custom-repositories' into ml_sci_1266_v2
|
2017-05-23 11:05:25 +02:00 |
|
Mojca Lorber
|
9ae615264d
|
add global repositories screen - tab control
|
2017-05-22 17:54:30 +02:00 |
|
Oleksii Kriuchykhin
|
e99e3edb7b
|
Add repositories dropdown to task navigation [SCI-1273]
|
2017-05-18 14:21:00 +02:00 |
|
Zmago Devetak
|
4b816f5322
|
Merge pull request #568 from ZmagoD/zd_SCI_1119
Add images to fields with rich text formatting
|
2017-05-08 13:06:58 +02:00 |
|
zmagod
|
acc5594f1b
|
add popup for approval to complete the Task [fixes SCI-1200]
|
2017-05-04 12:41:22 +02:00 |
|
zmagod
|
c25df63a14
|
add tinymce img importer and refactor input sanitize helper
|
2017-04-19 09:11:52 +02:00 |
|
zmagod
|
0996c14449
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765
|
2017-03-27 10:41:58 +02:00 |
|
zmagod
|
2235fd3fb7
|
adds view if download expires
|
2017-03-27 10:38:28 +02:00 |
|
zmagod
|
f380e08ab0
|
fixed hound
|
2017-03-24 12:42:50 +01:00 |
|
zmagod
|
4385c68f5f
|
adds zip_export utility first run
|
2017-03-21 16:15:11 +01:00 |
|
Mojca Lorber
|
83fa8570d7
|
refactoring
|
2017-03-17 17:52:15 +01:00 |
|
zmagod
|
0c2523beca
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
|
2017-03-10 16:21:43 +01:00 |
|
okriuchykhin
|
8e18ff44a6
|
Merge pull request #479 from okriuchykhin/ok_SCI_999
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-20 15:19:00 +01:00 |
|
Oleksii Kriuchykhin
|
cf8566df33
|
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-10 14:27:20 +01:00 |
|
Luka Murn
|
280b7a0e75
|
Minor fix
|
2017-02-09 15:10:45 +01:00 |
|
Luka Murn
|
f7bd62547e
|
Refactor teams settings into its own controllers
|
2017-02-09 14:37:59 +01:00 |
|
Luka Murn
|
5cb3eb5e09
|
Refactor preferences -> move them to subcontroller, subroute
|
2017-02-09 11:07:16 +01:00 |
|
Oleksii Kriuchykhin
|
db90c5d63b
|
Add datatable to all teams page [SCI-936]
|
2017-02-02 09:53:59 +01:00 |
|
zmagod
|
1220466035
|
fixing hound
|
2017-01-25 15:00:14 +01:00 |
|
zmagod
|
f04a2f663a
|
renamed organizations in config/
|
2017-01-25 12:30:11 +01:00 |
|
Luka Murn
|
53699193a2
|
Merge branch 'smart-annotations'
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
|
2017-01-24 14:33:23 +01:00 |
|
Luka Murn
|
cf72da5635
|
Merge branch 'improved-files-handling' into 'master'
Conflicts:
app/assets/javascripts/protocols/steps.js.erb
app/helpers/assets_helper.rb
db/schema.rb
|
2017-01-18 11:29:40 +01:00 |
|
Matej Zrimšek
|
93a8e0bdae
|
Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848]
|
2017-01-12 14:08:29 +01:00 |
|
zmagod
|
6efcf49927
|
working version of dropdown filter
|
2017-01-10 14:14:21 +01:00 |
|
zmagod
|
53d20df449
|
added xregexp
|
2017-01-10 14:14:21 +01:00 |
|
zmagod
|
94262b56ef
|
prepare data for atwho
|
2017-01-10 14:14:21 +01:00 |
|
Oleksii Kriuchykhin
|
aa2b573278
|
Enable image preview while editing steps and code style improvements [SCI-694]
|
2017-01-06 15:58:23 +01:00 |
|
Matej Zrimšek
|
5d104981fd
|
Fixed sample deletion on experiments level. Minor refactoring. [SCI-848]
|
2017-01-06 14:23:20 +01:00 |
|
mlorb
|
59751ec41e
|
Merge pull request #373 from mlorb/ml_sci_709
Add Protocol Preview to Protocol repository [SCI-709]
|
2017-01-04 11:28:55 +01:00 |
|
Luka Murn
|
3bee9d2e12
|
Save an (yet unworking) version of user smart annotations
Used so other devs can start working on smart annotations.
|
2017-01-04 10:54:02 +01:00 |
|
zmagod
|
a434649f42
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
|
2017-01-03 16:35:25 +01:00 |
|
Mojca Lorber
|
c476faca30
|
fix hound
|
2017-01-03 11:04:09 +01:00 |
|
zmagod
|
01c086b667
|
fixes routes.rb indentation
|
2017-01-03 09:49:18 +01:00 |
|
Luka Murn
|
af9e272b2a
|
Re-add tags index controller action to render tags
Closes SCI-166.
|
2017-01-03 09:39:41 +01:00 |
|
Oleksii Kriuchykhin
|
cbef971d85
|
Fix timeouts when fetching images from S3 [SCI-694]
|
2016-12-20 15:36:07 +01:00 |
|
Zmago Devetak
|
c8631077df
|
Merge pull request #361 from biosistemika/improved-sample-table
Improved sample table
|
2016-12-16 15:37:54 +01:00 |
|
Mojca Lorber
|
2cfcba0ceb
|
add protocol preview modal
|
2016-12-13 10:39:18 +01:00 |
|