scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
2392 commits 77 branches 180 tags 167 MiB
Commit graph

2392 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zmago Devetak
9a75411cbd Merge pull request #517 from ZmagoD/zd_SCI_1110 
fixed wopi buttons [fixes SCI-1110]
 2017-03-17 16:50:24 +01:00
zmagod
5cc6cd094e refactor 2017-03-17 16:47:58 +01:00
zmagod
95a0f596b7 adds file link 2017-03-17 16:40:57 +01:00
zmagod
70f17a924e adds hooks in team switch [fixes SCI-1092] 2017-03-17 16:10:22 +01:00
okriuchykhin
ced6b6d1f4 Merge pull request #518 from okriuchykhin/ok_SCI_1114 
Add missing translations for samples assign/unassign activities [SCI-1114]
 2017-03-17 14:18:31 +01:00
Oleksii Kriuchykhin
d17eb2b3f7 Add missing translations for samples assign/unassign activities [SCI-1114] 2017-03-17 14:15:50 +01:00
zmagod
52878e0989 fixed wopi buttons [fixes SCI-1110] 2017-03-16 15:38:11 +01:00
Zmago Devetak
b2521a895b Merge pull request #516 from ZmagoD/fix-wopi-ctrl 
fixes owner id if empty
 2017-03-15 18:02:56 +01:00
zmagod
307fef17d8 fixes owner id if empty 2017-03-15 18:01:15 +01:00
Zmago Devetak
1afb4c9a42 Merge pull request #515 from ZmagoD/file_owner_id_bug 
fixes bug with wopi contorller
 2017-03-15 17:40:07 +01:00
zmagod
c5156f5ca3 fixes bug with wopi contorller 2017-03-15 17:33:36 +01:00
Mojca Lorber
4792bd87b9 fix error message when editing custom column on locked task 2017-03-15 14:09:44 +01:00
Mojca Lorber
7a4e3201e7 add error messages to sample group/type edit/delete actions 2017-03-14 17:32:25 +01:00
zmagod
5d372851d3 fixes reports comment bug [fixes SCI-1100] 2017-03-14 16:24:02 +01:00
zmagod
856a4611c6 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-14 15:58:08 +01:00
Zmago Devetak
ac31e4ba00 Merge pull request #513 from ZmagoD/zd_fix_office_v1 
fixes bug with organization
 2017-03-14 13:37:13 +01:00
zmagod
15b1712a3d fixes bug with organization 2017-03-14 13:29:59 +01:00
Zmago Devetak
210519b506 Merge pull request #338 from biosistemika/office_integration 
Office integration
 2017-03-13 14:19:03 +01:00
zmagod
b821fff4a5 adds non breaking space between file name and buttons 2017-03-13 14:14:44 +01:00
zmagod
df2abe5d17 fixed typo 2017-03-13 13:51:31 +01:00
zmagod
7b16e5643e fix assets preprocesor for wopi files 2017-03-13 13:20:49 +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
mlorb
39e1ac4b26 Merge pull request #512 from biosistemika/ml_sci_1074 
Fix permissions for experiment actions [SCI-1074]
 2017-03-10 11:44:27 +01:00
okriuchykhin
2a33391f4b Merge pull request #511 from okriuchykhin/ok_SCI_1090 
Refactoring of the comments using STI [SCI-1090]
 2017-03-10 10:50:43 +01:00
Mojca Lorber
1ba5f1748f fix permissions for experiment actions 2017-03-09 17:45:34 +01:00
Oleksii Kriuchykhin
456934464a Remove unneeded validation calls [SCI-1090] 2017-03-09 17:20:27 +01:00
zmagod
1d42d46c02 fixes bug with step comments 2017-03-09 16:02:52 +01:00
Luka Murn
ae96223437 Fix rake db:add_user task 2017-03-09 15:37:15 +01:00
zmagod
3057965940 fix bug with filenames 2017-03-09 11:48:50 +01:00
zmagod
9939d8df06 refactor 2017-03-09 10:51:54 +01:00
Luka Murn
1026700b40 Merge pull request #509 from biosistemika/lm-sci-1052-fix 
Allow upload of .dot, .pot, .rtf files [SCI-1052]
 2017-03-09 10:47:19 +01:00
Luka Murn
1e3a697a91 Merge pull request #508 from biosistemika/lm-sci-838-fix 
Open edit/view Office files in new browser tab/window [SCI-838]
 2017-03-09 10:39:16 +01:00
Luka Murn
018fa63234 Merge pull request #507 from biosistemika/lm-sci-1049-fix 
Add HTML <head><title> to edit, view file pages [SCI-1049]
 2017-03-09 10:37:59 +01:00
zmagod
49f91184da fixes locals 2017-03-09 09:55:15 +01:00
Luka Murn
a4bf5516a5 Merge pull request #505 from Ducz0r/lm-sci-1082-fix 
Minor change [SCI-1082]
 2017-03-09 08:58:14 +01:00
Luka Murn
f97a8f3238 Merge branch 'Ducz0r-lm-sci-1091-fix' 2017-03-09 08:52:17 +01:00
Luka Murn
0e8f5f8e99 Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix 
Conflicts:
	app/views/my_modules/_state_buttons.html.erb
 2017-03-09 08:44:09 +01:00
Luka Murn
ce4afb49f1 Merge pull request #506 from Ducz0r/lm-sci-1073-vol-2 
Fix padding of state buttons [SCI-1073]
 2017-03-08 16:09:17 +01:00
zmagod
f78ef8c82a fixes hound 2017-03-08 14:41:42 +01:00
zmagod
5c2e9a4b04 adds extends and fixes report methods 2017-03-08 14:14:03 +01:00
Luka Murn
800df7a26b Also make button icons work when rendering them via JS 
Closes SCI-1073.
 2017-03-08 13:55:10 +01:00
Oleksii Kriuchykhin
0f8336e5a5 Refactoring of the comments using STI [SCI-1090] 2017-03-08 13:18:20 +01:00
Luka Murn
7c9aa2e476 Hide complete&uncomplete task buttons if user cannot do it 
Closes SCI-1091.
 2017-03-06 16:01:04 +01:00
Luka Murn
0916e7e40d Allow upload of .dot, .pot, .rtf files 
Closes SCI-1052.
 2017-03-06 15:01:32 +01:00
Luka Murn
86a800a84e Open edit/view Office files in new browser tab/window 
Closes SCI-838.
 2017-03-06 14:12:18 +01:00
Luka Murn
473487faec Add HTML <head><title> to edit, view file pages 
Closes SCI-1049.
 2017-03-06 13:55:07 +01:00
Luka Murn
4ddb139911 Fix padding of state buttons 
Closes SCI-1073.
 2017-03-03 16:36:52 +01:00
Luka Murn
42b773f180 Merge pull request #504 from Ducz0r/lm-sci-1078-fix 
Fix sample type groups edit color script [SCI-1078]
 2017-03-02 13:09:51 +01:00
Luka Murn
043613782e Minor change 2017-03-02 13:04:13 +01:00
Luka Murn
808fdf6744 Merge pull request #502 from Ducz0r/lm-sci-1073-fix 
Fix protocol state buttons a bit [SCI-1073]
 2017-03-02 09:02:52 +01:00