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

2460 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luka Murn
5ac0ed4505 Merge pull request #661 from mlorb/ml_sci_1266_vol2 
load tabs with javascript [SCI-1266]
 2017-06-08 15:31:31 +02:00
Luka Murn
7bb1af3692 Minor JS fix 2017-06-08 15:28:26 +02:00
Luka Murn
c7c3c46d9d Fix dropdown 2017-06-08 15:26:57 +02:00
Mojca Lorber
be52af4e4f fix rename/delete/copy modals not working 2017-06-08 15:13:00 +02:00
Mojca Lorber
0004c2b7d5 fix selection of tab after redirection 2017-06-08 14:17:27 +02:00
zmagod
5f8606c9c5 removes the delete function of uncompleted steps [fixes SCI-1315] 2017-06-08 14:03:06 +02:00
Mojca Lorber
71c523c406 load tabs with javascript 2017-06-08 13:47:30 +02:00
mlorb
78147b5a4f Merge pull request #662 from Ducz0r/lm-fix-en-yml 
Fix en.yml localization bug
 2017-06-08 13:45:35 +02:00
zmagod
e45c2ce560 fixes bug with smart annotations in reports [fixes SCI-1328] 2017-06-08 13:41:27 +02:00
Luka Murn
810599bef2 Fix en.yml localization bug 2017-06-08 13:36:37 +02:00
Luka Murn
2ab31aba2f Merge pull request #660 from Ducz0r/lm-sci-1270 
Copy repository functionality [SCI-1270]
 2017-06-08 11:45:57 +02:00
Luka Murn
27feb46d8f Merge pull request #659 from Ducz0r/lm-sci-1279 
Include repositories in reports [SCI-1279]
 2017-06-08 11:24:21 +02:00
Luka Murn
e0828657b3 Somebody kill the Hound please 2017-06-08 11:23:24 +02:00
Luka Murn
9bfbf3b634 Minor fix #2 2017-06-08 11:22:27 +02:00
Luka Murn
b729c06f31 Minor fix 2017-06-08 11:20:11 +02:00
mz3944
30b204e0ed Merge pull request #657 from mz3944/mz-SCI-1276 
Repositories UI - show all/show assigned [SCI-1276]
 2017-06-07 22:49:45 +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
Luka Murn
b94d2c5c03 Implement 'copy' method on Repository object 2017-06-07 18:28:07 +02:00
Luka Murn
0aee11d6d8 Hound is love, Hound is life #2 2017-06-07 18:26:32 +02:00
Luka Murn
42f7b4f68d Hound is love, Hound is life 2017-06-07 18:22:15 +02:00
Matej Zrimšek
77a225ec31 Added toggle between assigned and all repository records. [SCI-1276] 2017-06-07 18:13:25 +02:00
Luka Murn
9e45d197df Change some stuff for repos to work, fix some bugs 
Closes SCI-1279.
 2017-06-07 18:07:49 +02:00
Luka Murn
02dd6636ba Allow saving & editing of reports with repository elements 
Closes SCI-1279.
 2017-06-07 16:55:00 +02:00
Luka Murn
b5f6d1da94 Allow custom repositories to be added to reports 2017-06-07 16:54:32 +02:00
Luka Murn
bb20d2661f Add association between repository rows & my modules 2017-06-07 16:54:32 +02:00
okriuchykhin
ef1ecdd7c7 Merge pull request #651 from okriuchykhin/ok_SCI_1274 
Add custom repository table [SCI-1274]
 2017-06-07 15:52:11 +02:00
Oleksii Kriuchykhin
c18bba9fbe Fix rebase errors [SCI-1274] 2017-06-07 15:50:22 +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
Zmago Devetak
fcec42ae31 Merge pull request #645 from ZmagoD/zd_SCI_1278 
generates samples csv file in background job [fixes SCI-1278]
 2017-06-07 15:04:24 +02:00
zmagod
353c27da15 rename method 2017-06-07 13:51:16 +02:00
zmagod
c6bb20039b adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285] 2017-06-07 13:29:39 +02:00
Paul Menzel
24b97637b4 Gemfile: Use HTTPS protocol for sneaky-save 
Address the Bundler warning below.

```
Step 6/14 : RUN bundle install
 ---> Running in bfbfa83e61de
The git source `git://github.com/einzige/sneaky-save.git` uses the `git` protocol, which transmits data without encryption. Disable this warning with `bundle config git.allow_insecure true`, or switch to the `https` protocol to keep your data secure.
Your Ruby version is 2.3.4, but your Gemfile specified 2.3.3
The command '/bin/sh -c bundle install' returned a non-zero code: 18
```
 2017-06-07 11:47:16 +02:00
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