scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 23:44:55 +08:00
Code Issues Projects Releases Packages Wiki Activity
1777 commits 43 branches 185 tags 169 MiB
Commit graph

603 commits

Author SHA1 Message Date
Zmago Devetak
0019fd19ea Merge pull request #525 from ZmagoD/zd_SCI_765 
Export large files - utility class
 2017-03-29 11:55:51 +02:00
zmagod
0096f9dc14 refactor 2017-03-29 09:32:23 +02:00
okriuchykhin
05a49e5a82 Merge pull request #528 from okriuchykhin/ok_SCI_1133 
Fix secondary navigation on Mac [SCI-1133]
 2017-03-29 09:30:34 +02:00
Oleksii Kriuchykhin
391c5af267 Fix secondary navigation on Mac [SCI-1133] 2017-03-28 14:36:52 +02:00
zmagod
7039420f99 add hook to canvas module actions 2017-03-28 10:43:39 +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
mlorb
3beb179f87 Merge pull request #514 from biosistemika/ml_sci_1089 
Add error messages to sample group/type edit/delete actions [SCI-1089]
 2017-03-27 09:57:32 +02:00
zmagod
4635a3320d Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-24 16:09:28 +01:00
Zmago Devetak
804fb2fec9 Merge pull request #519 from ZmagoD/zd_SCI_1092_v2 
adds hooks in team switch [fixes SCI-1092]
 2017-03-24 12:56:52 +01:00
zmagod
023b3213e8 fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +01:00
Mojca Lorber
83fa8570d7 refactoring 2017-03-17 17:52:15 +01:00
zmagod
c244e69e81 fixed report comments bug [fixes SCI-1100] 2017-03-17 16:59:40 +01:00
zmagod
70f17a924e adds hooks in team switch [fixes SCI-1092] 2017-03-17 16:10:22 +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
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
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
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
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
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
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
3d7f09bde6 Fix protocol state buttons a bit 
Closes SCI-1073.
 2017-02-28 14:35:12 +01:00
Luka Murn
fecfc9e41d Merge pull request #498 from biosistemika/release-1.8.1 
Release 1.8.1
 2017-02-23 14:57:30 +01:00
Luka Murn
dc89c160be Fix a bug with team page not working from user task modal 2017-02-23 14:45:00 +01:00
mlorb
a72a072fac Merge pull request #495 from mlorb/ml_sci_948 
Fix report - checklist items are in separate row than checkboxes [SCI-948]
 2017-02-23 10:50:48 +01:00
Mojca Lorber
f84611f558 fix report - checklist items are in separate row than checkboxes 2017-02-22 15:51:26 +01:00
Zmago Devetak
58f97fdb5b Merge pull request #489 from ZmagoD/zd_SCI_1002_add_hook 
adds hook for lock task action
 2017-02-22 14:24:01 +01:00
mlorb
42e6a99911 Merge pull request #487 from mlorb/ml_sci_1032 
Fix visual bug in edit avatar mode [SCI-1032]
 2017-02-22 10:59:18 +01:00
mlorb
8c111db31a Merge pull request #486 from mlorb/ml_sci_1033 
Fix user has no teams view [SCI-1033]
 2017-02-22 10:58:39 +01:00
zmagod
151dc79a81 adds hook for lock task action 2017-02-21 16:25:50 +01:00
Mojca Lorber
ac0988ef32 add data-hooks for remove manage teams button 2017-02-21 15:39:08 +01:00
Mojca Lorber
0fd41e8a6d remove changes on user has no teams view 2017-02-21 15:12:58 +01:00
mlorb
ea1711be83 Merge pull request #485 from mlorb/ml_sci_1001 
Add data-hook for E-signature manifestation/display [SCI-1001]
 2017-02-21 14:25:08 +01:00
mlorb
01d9f306a5 change div to span 2017-02-21 14:22:28 +01:00
Mojca Lorber
6b30f097f0 fix visual bug in edit avatar mode 2017-02-21 14:02:42 +01:00
Mojca Lorber
90864a45a0 fix user has no teams view 2017-02-21 13:08:06 +01:00
Luka Murn
6f1c19ae2d Fix _user_dropdown.html.erb 2017-02-21 09:27:42 +01:00
Mojca Lorber
cb2127ee7f add data-hook for E-signature manifestation/display 2017-02-20 18:03:55 +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
Luka Murn
ce617894c5 Fix manage project users modal bug 
Closes SCI-1026.
 2017-02-16 15:29:58 +01:00
Oleksii Kriuchykhin
218e96b1f0 Code style fixes [SCI-999] 2017-02-16 11:45:07 +01:00
Luka Murn
d097f0dd15 Merge pull request #477 from Ducz0r/lm-sci-928 
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
 2017-02-13 16:42:57 +01:00