Commit graph

2476 commits

Author SHA1 Message Date
mlorb
2ebcdedf57 Merge pull request #648 from mlorb/ml_sci_1268
Create new repository [SCI-1268]
2017-06-06 16:12:21 +02:00
Mojca Lorber
51c4eeb106 renaming 2017-06-06 15:50:43 +02:00
Mojca Lorber
dde714d78f fix hound 2017-06-06 13:33:57 +02:00
Mojca Lorber
39dda1ad5d refactoring 2017-06-06 13:18:44 +02:00
ajugo
887d9a4f52 Samples - show all/show assigned [SCI-1277] (#644)
* Samples - show all/show assigned [SCI-1277]

* Some fixes in code

* Some minor fixes in code

* Omit present

* Correct missed present

* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Mojca Lorber
acdea2198d code changes after rebasing 2017-06-06 11:10:55 +02:00
Mojca Lorber
da98788031 small code fixes 2017-06-06 09:57:50 +02:00
Mojca Lorber
13bf4ad229 create new repository 2017-06-06 09:54:39 +02:00
Luka Murn
eb95ec74a3 Merge pull request #654 from Ducz0r/lm-sci-1323
Fix bug with protocol preview modal not working in protocol repo [SCI-1323]
2017-06-06 08:02:33 +02:00
Luka Murn
f382c04f01 Refactor JS code a bit
Closes SCI-1323.
2017-06-06 08:02:01 +02:00
Luka Murn
62d97f6e64 Merge pull request #655 from Ducz0r/lm-sci-1321
Fix bug with TinyMCE not working for steps with nil description [SCI-1321]
2017-06-06 07:59:24 +02:00
Luka Murn
f298ec54e7 Code beautification per @zmagod's request
Closes SCI-1321.
2017-06-06 07:58:46 +02:00
mz3944
876fcfc979 Merge pull request #649 from mz3944/mz-SCI-1269
Global repositories screen - rename, delete (just core)
2017-06-05 17:59:10 +02:00
Matej Zrimšek
afce3010ef After repository deletion, the next selected repository is the first one. [SCI-1269] 2017-06-05 17:56:09 +02:00
Luka Murn
8c7aebbb88 Fix bug with TinyMCE not working for steps with nil description
Closes SCI-1321.
2017-06-05 17:43:03 +02:00
Matej Zrimšek
419d638163 Renamed reposiotry edit and destroy permission helper. [fix 1269] 2017-06-05 17:36:26 +02:00
Luka Murn
1712fc0611 Fix bug with protocol preview modal not working in protocol repo
Closes SCI-1323.
2017-06-05 17:10:13 +02:00
mlorb
3dc83cfe05 Merge pull request #650 from mlorb/ml_sci_1286
Fix bug with titles truncate in activities [SCI-1286]
2017-06-05 16:27:44 +02:00
Mojca Lorber
27d3a5097b fix hound 2017-06-05 16:07:21 +02:00
mz3944
7e586e3db0 Merge pull request #653 from mz3944/mz-DB-load-dump-fix
Fixed DB dump loading
2017-06-05 14:19:21 +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
zmagod
ab4961ddb1 adds overlay partial 2017-06-05 11:31:05 +02:00
zmagod
67d902db52 refactor 2017-06-05 10:43:58 +02:00
Matej Zrimšek
5aba15e220 Made repository names case insensitive. [fix 1269] 2017-06-05 10:38:04 +02:00
Matej Zrimšek
f012779780 Renamed before_action for repository edit and destroy action. [fix 1269] 2017-06-05 10:02:16 +02:00
Matej Zrimšek
d8d54232c3 After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269] 2017-06-02 19:08:51 +02:00
Matej Zrimšek
73aaef0949 Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269] 2017-06-02 17:52:04 +02:00
Matej Zrimšek
c82fd66146 Removed unneeded utility JS function. [SCI-1269] 2017-06-02 17:52:04 +02:00
Matej Zrimšek
5c9a453439 Added permissions for deleting and renaming of repositories. [SCI-1269] 2017-06-02 17:50:34 +02:00
Matej Zrimšek
9a7048cc7a Code formatting updated for repositories. [SCI-1269] 2017-06-02 17:50:34 +02:00
Matej Zrimšek
f8258812ef Repository remove and rename refactoring. [SCI-1269] 2017-06-02 17:50:34 +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
Matej Zrimšek
b92a760a5c Added dropdown GUI for editing repository. [SCI-1269] 2017-06-02 17:47:28 +02:00
zmagod
1c021b11db adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +02:00
Matej Zrimšek
33252e6f3e Fixed DB dump loading (wasn't changed when docker composing was changed). 2017-06-02 16:34:01 +02:00
ajugo
a9bd86352d Step: wrong last columns of table [fixes SCI-405] (#600)
* Step: wrong last two columns of table after add table results [fixes SCI-405]

* Changing double quotes to single

* Adding empty line back
2017-06-01 15:52:02 +02:00
Mojca Lorber
7c2b657b0e fix bug with special characters when truncating activities titles 2017-06-01 15:10:26 +02:00
Mojca Lorber
d88b21fb5e truncate all titles in activities 2017-06-01 15:09:01 +02:00
okriuchykhin
c88fc84538 Merge pull request #633 from okriuchykhin/ok_SCI_960_v2
Add smart annotations in sample info modal [SCI-960]
2017-05-31 11:31:14 +02:00
Luka Murn
fcc3995049 Merge pull request #647 from biosistemika/master
Bring latest master changes into custom-repositories
2017-05-30 14:18:14 +02:00
zmagod
6e1f93dd11 minor fix 2017-05-29 14:47:05 +02:00
zmagod
b527afd12b generates samples csv file in background job [fixes SCI-1278] 2017-05-29 14:42:55 +02:00
mz3944
689587c4fc Merge pull request #643 from mz3944/mz-SCI-1305
Handled user removal from the team for user smart annotation [fixes SCI-1305]
2017-05-29 12:52:19 +02:00
Matej Zrimšek
e8f842c29f Forgot to add the updated locales. [fixes SCI-1305] 2017-05-29 11:39:17 +02:00
Zmago Devetak
1df6265326 Merge pull request #627 from ZmagoD/zd_SCI_1280
prevent to duplicate new step [fixes SCI-1280]
2017-05-29 09:55:22 +02:00
mz3944
d83dcac894 Merge pull request #642 from mz3944/mz-SCI-1291
Fixed permission error while cloning workflows. [fixes SCI-1291]
2017-05-29 09:53:33 +02:00
zmagod
5806cb8e67 removes unneeded animateSpinner call 2017-05-29 09:10:11 +02:00
Zmago Devetak
2224c6511d Merge pull request #630 from ZmagoD/zd_SCI_1240_v2
fix label [fixes SCI-1240]
2017-05-29 09:01:30 +02:00