scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-17 22:51:24 +08:00
Code Issues Projects Releases Packages Wiki Activity
5666 commits 31 branches 181 tags 166 MiB
Commit graph

5666 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mojca Lorber
302a777615 fixes button collision 2016-09-08 12:37:06 +02:00
zmagod
faed0500c7 set move and clone permissions to also validate the user on the organizational level [fixes SCI-372] 2016-09-08 09:23:29 +02:00
Mojca Lorber
4c66ca6f80 fixes navbar size when resizing window 2016-09-08 09:17:58 +02:00
Luka Murn
00cc8f7e55 Merge pull request #137 from mz3944/mz_spoof_checking_exceptions_fix 
Removed header checking and added office file types grouping exceptio…
 2016-09-07 14:22:30 +02:00
Matej Zrimšek
40355dcc97 If file is recognized as office file, it's allowed to be any office file type. 2016-09-07 14:04:11 +02:00
Matej Zrimšek
f4d4977457 Removed header checking and added office file types grouping exceptions when checking file spoofing [fixes SCI-418] 2016-09-07 13:04:18 +02:00
Luka Murn
0c1759c15a Merge pull request #135 from Ducz0r/lm-sci-397 
Resize archived experiment panels
 2016-09-07 11:14:53 +02:00
mz3944
d3a3dd4428 Merge pull request #138 from mz3944/mz_result_edit_and_name_length_check_fix 
Fixed result file deletion and result name updating [fixes SCI-409]. …
 2016-09-07 11:07:23 +02:00
mz3944
5f446ab1f0 Merge pull request #134 from mz3944/mz_delete_step_file_fix 
Fixes files deletion when rails worker is running [fixes SCI-411] and…
 2016-09-07 11:00:50 +02:00
zmagod
d92597ac30 styled dottel line in sidebar [fixes SCI-340] 2016-09-07 09:01:40 +02:00
zmagod
d482dff2e6 adds label to current project in clone experiment modal [fixes SCI-341] 2016-09-07 08:26:36 +02:00
zmagod
487d3e18f4 fixed moved experiment thumbnail [fixes SCI-410] 2016-09-07 07:55:45 +02:00
Matej Zrimšek
b0ad6d0753 Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407]. 2016-09-06 23:26:00 +02:00
zmagod
daa144ce7c added missing bracket 2016-09-06 11:57:03 +02:00
zmagod
856d226946 fixed move experiment form error duplication 2016-09-06 11:48:56 +02:00
zmagod
a5a24c7610 clear unused variable 2016-09-06 11:46:28 +02:00
zmagod
b672d85405 fixed error message duplication 2016-09-06 11:46:28 +02:00
zmagod
b44a284b54 sets edit experiment validation 2016-09-06 11:46:28 +02:00
zmagod
9d469f9092 sets front end validation for new experiment modal [fixes SCI-348] 2016-09-06 11:44:03 +02:00
zmagod
de6c03a73b setup experiment modal input validation 2016-09-06 11:44:03 +02:00
Zmago Devetak
9440371f3f Merge pull request #131 from ZmagoD/zd_SCI_400 
Sets front end validation for experiment move action [fixes SCI-400]
 2016-09-06 11:39:38 +02:00
zmagod
c526cab498 removed commented code 2016-09-06 11:38:02 +02:00
mlorb
f0e28b90a0 Merge pull request #133 from mlorb/ml_sci_415 
minimize buttons on mobile phone [SCI-415]
 2016-09-06 11:26:32 +02:00
Luka Murn
bda5120548 Resize archived experiment panels 
Closes SCI-397.
 2016-09-06 10:55:05 +02:00
Matej Zrimšek
9fb30c7661 Fixes files deletion when rails worker is running [fixes SCI-411] and fixes picture's style files deletion. 2016-09-06 10:40:01 +02:00
Mojca Lorber
47983812e7 minimize buttons on mobile phone 2016-09-06 10:10:49 +02:00
Zmago Devetak
1a19753df9 Merge pull request #128 from ZmagoD/zd_SCI_105 
Trim long words in reports [fixes SCI-105]
 2016-09-06 10:10:06 +02:00
zmagod
a7b6135b2f cleared console.log 2016-09-06 10:08:32 +02:00
Luka Murn
81883911c4 Merge pull request #132 from Ducz0r/lm-sci-228 
Updates to invite users to team modal window
 2016-09-05 15:53:15 +02:00
mlorb
aea288371f Merge pull request #129 from mlorb/ml_sci_310 
adds tasks, experiment and project category in protocol search results [SCI-310]
 2016-09-05 15:31:35 +02:00
Luka Murn
1d8600b39f Fix bug when inviting existing users onto teams 
Closes SCI-228
 2016-09-05 14:52:56 +02:00
mz3944
50e0c26e89 Merge pull request #125 from mz3944/mz_removed_avatar_upload_popop_sci_399 
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
 2016-09-05 11:49:04 +02:00
Mojca Lorber
6a802e9fa7 fixes redirection to project page for all categories in search results 2016-09-05 11:40:49 +02:00
Luka Murn
ff6a4c11c0 Update README.md buildpacks info 2016-09-05 11:22:58 +02:00
Mojca Lorber
740392c687 optimization 2016-09-05 10:58:37 +02:00
zmagod
667fb67052 sets front end validation for experiment move action [fixes SCI-400] 2016-09-02 16:31:17 +02:00
Zmago Devetak
fb6bc31bec Merge pull request #127 from ZmagoD/zd_SCI_247_again 
Table from step stays in report, although it is deleted from step.
 2016-09-02 15:59:17 +02:00
Zmago Devetak
ea26a532e4 Merge pull request #126 from ZmagoD/zd_SCI_332 
By default all experiments should be collapsed
 2016-09-02 15:58:03 +02:00
Mojca Lorber
6763d8e7a1 fixes hound again 2016-09-02 11:56:32 +02:00
Mojca Lorber
4bce00ac61 fixes hound 2016-09-02 11:54:20 +02:00
Mojca Lorber
83034f705d adds tasks, experiment and project category in protocol search results 2016-09-02 11:45:54 +02:00
zmagod
28fa00c30c trim long words in reports [fixes SCI-105] 2016-09-01 15:45:39 +02:00
Jure Grabnar
73332ac7d1 Update README.md with buildpacks info 2016-09-01 14:03:53 +02:00
zmagod
4afaa50ce0 fixed multiple tables check 2016-09-01 13:49:12 +02:00
zmagod
111cb81d08 clear tables from report [fixes SCI-247] again 2016-09-01 13:38:09 +02:00
Luka Murn
61f4fbd1d4 Remove warning info when removing pending user from organization 2016-09-01 13:23:53 +02:00
Luka Murn
77f00bf3a7 Bump version to 1.2.2 2016-09-01 11:34:28 +02:00
Luka Murn
2c519284ee Merge pull request #124 from ZmagoD/zd_fix_popup_cookie 
introdutory popup cookie
 2016-09-01 11:34:05 +02:00
zmagod
ac7ac95da8 [fixes SCI-332] 2016-09-01 10:38:20 +02:00
Matej Zrimšek
4fdf478426 Minor refactoring. 2016-08-31 17:57:06 +02:00