scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
2433 commits 70 branches 179 tags 165 MiB
Commit graph

2433 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zmagod 506e47a595 fixes sorting of assigned column [fixes SCI-1483] 2017-07-14 09:45:36 +02:00
Mojca Lorber 739f8b5b4e remove redundant rollback call 2017-07-13 13:49:26 +02:00
mlorb 9eba178dce Merge pull request #741 from mlorb/ml-sci-1480 
Fix sorting by assigned causes ajax error [SCI-1480]
 2017-07-13 13:31:48 +02:00
Mojca Lorber ec76873e95 fix sorting by assigned causes ajax error 2017-07-13 11:41:19 +02:00
Zmago Devetak 69919359f1 Merge pull request #738 from ZmagoD/zd_SCI_1452 
fixes issue with smart annotations in repositories [fixes SCI-1452]
 2017-07-12 14:50:29 +02:00
Nbernot 2a3e830a3c Merge pull request #732 from biosistemika/business_users 
Business users [SCI-1428, SCI-1447]
 2017-07-11 13:34:56 +02:00
Nbernot d746ae2549 Removes parentheses around if conditions 2017-07-11 13:33:47 +02:00
Luka Murn 1dc3e49367 Merge pull request #739 from Ducz0r/lm-sci-1432 
Extend confirmation period of emails to 7 days [SCI-1432]
 2017-07-11 10:57:16 +02:00
Luka Murn 73a4cd1e4f Merge pull request #737 from Ducz0r/lm-sci-1450 
Add versioning modal & support to sciNote [SCI-1450]
 2017-07-11 09:47:51 +02:00
Luka Murn 19a8dfe116 Extend confirmation period of emails to 7 days 
Closes SCI-1432.
 2017-07-11 08:32:52 +02:00
okriuchykhin 19e0b64a7b Merge pull request #736 from okriuchykhin/ok_SCI_1445 
Fix default order of the columns in repositories [SCI-1445]
 2017-07-10 16:31:06 +02:00
zmagod baaec67399 fixes issue with smart annotations in repositories [fixes SCI-1452] 2017-07-10 16:22:32 +02:00
Oleksii Kriuchykhin a6b80589f2 Fix default order of the columns in repositories [SCI-1445] 2017-07-10 15:32:18 +02:00
Luka Murn 3e80f761b8 Add "about" modal, prepare hooks, VERSION system for addons 
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
 2017-07-10 15:27:50 +02:00
Luka Murn 16e672b9d8 Add VERSION file where the sciNote Core version is stored 2017-07-10 09:26:35 +02:00
Nejc Bernot d917cf3340 Renames the WOPI_BREADCRUMBS_HOST env variable to WOPI_USER_HOST 2017-07-05 11:52:36 +02:00
Nejc Bernot 803934e07d Changes the host for the download and redirect paths 2017-07-05 10:23:10 +02:00
Nejc Bernot 91fe7fe4ad Changes the completely NOT ruby code 2017-07-04 17:13:59 +02:00
Nejc Bernot bd9904adb3 Adds support for business servers 
If the WOPI_BUSINESS_USERS environmental variable is set and true, indicates to Office online that all users are business users when trying to view/edit files
 2017-07-04 14:27:43 +02:00
Zmago Devetak 53a1dd14b7 Merge pull request #718 from ZmagoD/zd_SCI_1129_v3 
Fixes error message [fixes SCI-1129]
 2017-07-04 11:16:36 +02:00
Luka Murn 9a19cb711f Version bump to 1.12.1 2017-07-04 08:00:32 +02:00
okriuchykhin 4740564a40 Merge pull request #727 from okriuchykhin/ok_SCI_1445 
Fix ordering of the columns after adding the new ones [SCI-1445]
 2017-07-03 11:55:24 +02:00
Oleksii Kriuchykhin 4c6690e59b Fix ordering of the columns after adding the new ones [SCI-1445] 2017-07-03 11:53:15 +02:00
gazvoda b10e2aa34b Merge pull request #726 from biosistemika/lg-SCI-1430 
Added data hook and form id for GA tracking [SCI-1430]
 2017-07-03 11:34:15 +02:00
lenart 74e723d5d5 Changed data hook name and form id [SCI-1430] 2017-07-03 11:28:35 +02:00
lenart 8ec458db91 Added data hook and form id for GA tracking [SCI-1430] 2017-06-30 10:06:54 +02:00
zmagod a9f38962bc Fixes error message [fixes SCI-1129] 2017-06-28 11:17:50 +02:00
mz3944 6b1fb96f25 Merge pull request #717 from mz3944/mz-SCI-1419 
Fixed sample types page load error, when viewing them on a task levl [SCI-1419]
 2017-06-28 09:05:31 +02:00
Matej Zrimšek 4dbf5b0f53 Fixed sample types page load error, when viewing them on a task level. [SCI-1419] 2017-06-27 16:28:25 +02:00
mlorb 025050a7cd Merge pull request #716 from mlorb/ml-sci-1420 
Add tooltips to navigation bar [SCI-1420]
 2017-06-27 14:52:07 +02:00
Mojca Lorber d03be76f35 add tooltips to archive buttons 2017-06-27 14:48:45 +02:00
Mojca Lorber 0160956377 put all titles on links 2017-06-27 14:21:06 +02:00
Mojca Lorber 6bfb5e125c add tooltips to navigation bar 2017-06-27 13:46:49 +02:00
okriuchykhin d126391940 Merge pull request #710 from okriuchykhin/ok_SCI_1356 
Add global search in custom repositories [SCI-1356]
 2017-06-27 13:41:53 +02:00
Oleksii Kriuchykhin 69231060b0 Fix checking of my_modules presence [SCI-1356] 2017-06-27 13:39:08 +02:00
Zmago Devetak 6c541602e7 Merge pull request #715 from ZmagoD/zd_SCI_1328_v2 
fixes smart annotations bug in reports [fixes SCI-1328]
 2017-06-27 13:34:29 +02:00
Oleksii Kriuchykhin 4060ba2ac3 Code style fixes [SCI-1356] 2017-06-27 13:23:51 +02:00
mz3944 ca59ac5e36 Merge pull request #714 from mz3944/mz-SCI-1402 
Missing error message when not selecting name in case of import repository file [SCI-1402]
 2017-06-27 11:54:26 +02:00
zmagod 7b9410f02f fixes smart annotations bug in reports [fixes SCI-1328] 2017-06-27 11:26:32 +02:00
okriuchykhin ee2cc006af Merge pull request #712 from okriuchykhin/ok_SCI_1404 
Fix naming of repository items in modal and messages [SCI-1404]
 2017-06-27 09:22:43 +02:00
okriuchykhin 8ae479b370 Merge pull request #713 from okriuchykhin/ok_SCI_1399 
Remove spinner after samples import error [SCI-1399]
 2017-06-27 09:22:21 +02:00
okriuchykhin 38724cf78e Merge pull request #711 from okriuchykhin/ok_SCI_1415 
Fix changing protocol ownership logic when removing user from the team [SCI-1415]
 2017-06-27 09:17:51 +02:00
Oleksii Kriuchykhin 938896981d Remove spinner after samples import error [SCI-1399] 2017-06-26 16:51:58 +02:00
Matej Zrimšek f847b44067 Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402] 2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin 84556cf744 Fix naming of repository items in modal and messages [SCI-1404] 2017-06-26 16:03:02 +02:00
Oleksii Kriuchykhin f2f57de264 Fix changing protocol ownership logic when removing user from the team [SCI-1415] 2017-06-26 15:30:18 +02:00
Oleksii Kriuchykhin fc72453a5b Fix hound warning [SCI-1356] 2017-06-23 16:19:59 +02:00
Oleksii Kriuchykhin e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00
Zmago Devetak d726c121bc Version bump to 1.12.0 2017-06-23 12:37:19 +02:00
mz3944 e5dc49e0cf Merge pull request #708 from mz3944/mz-SCI-1398 
Changed repository records filter naming. [SCI-1398]
 2017-06-23 10:43:23 +02:00