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

10600 commits

This branch
This branch
All branches
Author SHA1 Message Date
rekonder
dc46a7b650 Fix error with close on reports 2017-04-24 16:02:30 +02:00
okriuchykhin
e3f4d38424 Merge pull request #567 from okriuchykhin/ok_SCI_1199 
Build bundle dependencies in separate docker volume [SCI-1199]
 2017-04-24 12:48:07 +02:00
zmagod
55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
Oleksii Kriuchykhin
4b3d752290 Change docker-compose file version and add deface target to Makefile [SCI-1199] 2017-04-24 10:12:07 +02:00
mlorb
54f1c7b3e8 Merge pull request #566 from mlorb/ml_sci_365 
New experiment redirection [SCI-365]
 2017-04-24 08:55:55 +02:00
zmagod
550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
Oleksii Kriuchykhin
8bf220a972 Improve bundle install [SCI-1199] 2017-04-21 15:13:20 +02:00
Oleksii Kriuchykhin
cb22aa47ba Build bundle dependencies in separate docker volume [SCI-1199] 2017-04-21 09:45:30 +02:00
mlorb
d3eaf8802c Merge pull request #560 from mlorb/ml_sci_1195 
Add experiment level to notifications [SCI-1195]
 2017-04-20 18:23:27 +02:00
Mojca Lorber
3aa1225e16 fix hound 2017-04-20 18:14:12 +02:00
Mojca Lorber
cf00ecd62e new experiment redirection 2017-04-20 17:55:28 +02:00
Mojca Lorber
0bae4657f6 add experiment level to user smart annotation notification 2017-04-20 13:21:02 +02:00
Mojca Lorber
b1e939e715 add experiment to activities 2017-04-20 13:16:11 +02:00
Mojca Lorber
c13b8ab270 styling 2017-04-20 13:16:11 +02:00
Mojca Lorber
1606e2163c add experiment level to notifications 2017-04-20 13:16:11 +02:00
okriuchykhin
c57589781c Merge pull request #565 from mz3944/mz-SCI-1207 
Added :inverse_of reference for all specific comment models
 2017-04-20 09:52:02 +02:00
Matej Zrimšek
314e8fcbd2 Added :inverse_of reference for all specific comment models. [fixes SCI-1207] 2017-04-19 23:38:23 +02:00
zmagod
0757563d02 adds step tiny_mce asset relation 2017-04-19 17:22:57 +02:00
mz3944
a0b5a94d67 Merge pull request #564 from mz3944/mz-SCI-856 
Case insensitive email invitation
 2017-04-19 09:36:46 +02:00
mz3944
e92a1b3ea8 Merge pull request #563 from mz3944/mz-SCI-860 
Experiment description is inside of box for every supported browser. …
 2017-04-19 09:36:28 +02:00
Luka Murn
61af70668c Bump version to 1.10.0 2017-04-19 09:31:40 +02:00
zmagod
37be04c09c add tiny_mce controller 2017-04-19 09:13:16 +02:00
zmagod
c25df63a14 add tinymce img importer and refactor input sanitize helper 2017-04-19 09:11:52 +02:00
Luka Murn
9479b65140 Hopefully fixes the encoding issues with audit trails 
Closes SCI-1175.
 2017-04-19 08:35:04 +02:00
Matej Zrimšek
bafdbf4082 Email is now case insensitive when inviting users by it. [fixes SCI-856] 2017-04-18 18:01:29 +02:00
Matej Zrimšek
57b6b9402d Experiment description is inside of box for every supported browser. [fixes SCI-860] 2017-04-18 16:44:01 +02:00
Luka Murn
6a7e383316 Please the Hound 2017-04-18 15:38:11 +02:00
mz3944
0ebf294844 Merge pull request #562 from mz3944/mz-SCI-1187 
Added general locale for cases when a name is optional and is not spe…
 2017-04-18 15:26:35 +02:00
Matej Zrimšek
a889174938 Name of result tables should be nil, as it can't be specified. [fixes SCI-1187] 2017-04-18 15:08:13 +02:00
mlorb
aab6a9b7a4 Merge pull request #561 from mlorb/ml_sci_1198 
Change mentions for user smart annotations in notifications [SCI-1198]
 2017-04-18 09:42:38 +02:00
mlorb
39f0ec9d24 Merge pull request #557 from mlorb/ml_sci_1118 
Rename cloning text [SCI-1118]
 2017-04-18 09:42:05 +02:00
okriuchykhin
3d805d529d Merge pull request #554 from okriuchykhin/ok_SCI_877 
Add image preview to protocol repository [SCI-877]
 2017-04-18 08:58:39 +02:00
Matej Zrimšek
c8ba234023 Added general locale for cases when a name is optional and is not specified. [fixes SCI-1187] 2017-04-14 17:20:34 +02:00
Mojca Lorber
34cfe01152 change mentions for user smart annotations in notifications 2017-04-14 16:23:49 +02:00
Oleksii Kriuchykhin
4fac6484b5 Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877] 2017-04-14 16:05:35 +02:00
Zmago Devetak
e1a30cc17c Merge pull request #558 from ZmagoD/zd_SCI_1192 
fixes broken users search method for smart annotation [fixes SCI-1192]
 2017-04-14 15:38:33 +02:00
zmagod
8af3858209 fix hound 2017-04-14 11:13:58 +02:00
Mojca Lorber
56efb8086f rename the rest of cloning text 2017-04-13 17:52:32 +02:00
Luka Murn
9c28608fbf Fix encoding when cloning tables 
Closes SCI-1175.
 2017-04-13 17:00:27 +02:00
zmagod
9ee971c24b fixes broken users search method for smart annotation [fixes SCI-1192] 2017-04-13 16:14:12 +02:00
Zmago Devetak
cb1ad9e0be Merge pull request #555 from ZmagoD/zd_SCI_1103 
adds additional explanations [fixes SCI-1103]
 2017-04-13 15:15:08 +02:00
Mojca Lorber
5f02376da3 rename cloning text 2017-04-13 15:09:17 +02:00
zmagod
0987cf8abc fixes hound alerts 2017-04-13 14:55:18 +02:00
Zmago Devetak
40af0df882 Merge pull request #551 from ZmagoD/zd_SCI_1189 
fixes the user_name field in csv export [fixes SCI-1189]
 2017-04-13 14:36:44 +02:00
zmagod
a6183af63d fix method_missing again 2017-04-13 14:34:58 +02:00
mlorb
ddc0e86c92 Merge pull request #556 from mlorb/ml_sci_1174 
Fix bug with changing user own role from admin to normal user [SCI-1174]
 2017-04-13 14:33:58 +02:00
Zmago Devetak
ec60044949 Merge pull request #548 from ZmagoD/zd_SCI_1129_v2 
Disables annimateSpiner in result assets actions
 2017-04-13 14:06:50 +02:00
zmagod
0534bce1ed adds super in method_missing 2017-04-13 14:03:56 +02:00
zmagod
53e828566a change system notification description 2017-04-13 14:01:52 +02:00
zmagod
241af0620a fixes hound alerts 2017-04-13 13:27:43 +02:00