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

1119 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zmago Devetak a5637a65a0 Merge pull request #274 from ZmagoD/zd_SCI_639 
Customize the library SCI-639
 2016-11-11 12:15:23 +01:00
Oleksii Kriuchykhin ab895ae864 Show only protocols from Protocol Management in users statistics [SCI-658] 2016-11-11 12:14:57 +01:00
mlorb 1ca452db7b Merge pull request #273 from mlorb/ml_sci_640 
Add rich text formatting on results and remove markdown [SCI-640]
 2016-11-11 12:06:13 +01:00
mlorb d42adff77e Merge pull request #275 from mlorb/ml_sci_642 
Add formatted text in reports [SCI-642]
 2016-11-11 12:04:19 +01:00
Mojca Lorber 4b7fa440f6 fix hound 2016-11-11 12:03:01 +01:00
Mojca Lorber 3b7af3e66c fix validation logic 2016-11-11 11:42:16 +01:00
zmagod 630724df2b strips the html tags from fearch query 2016-11-11 11:41:23 +01:00
Oleksii Kriuchykhin b9f982ead7 Additional steps added to tutorial and numbering of the steps fixed [SCI-571] 2016-11-11 10:07:34 +01:00
Oleksii Kriuchykhin d2491a18a4 Tutorial Save Protocol step added [SCI-571] 2016-11-11 10:06:18 +01:00
Luka Murn 5727158495 Hotfix to nicely render comments form on Firefox as well 2016-11-11 09:47:37 +01:00
Luka Murn b42922d32c Add autosize functionality to all textareas 
Closes SCI-637
 2016-11-11 09:09:41 +01:00
Luka Murn 55f9633d1d Add jQuery.autosize plugin 2016-11-11 09:09:41 +01:00
okriuchykhin ac0a449522 Merge pull request #271 from okriuchykhin/ok_SCI_570_v2 
Added step numbers in intro tutorial [SCI-570]
 2016-11-11 09:08:47 +01:00
Luka Murn acd8ce8932 Merge pull request #270 from Ducz0r/lm-sci-644 
Convert all large text input fields into text areas (10000 characters)
 2016-11-11 09:07:25 +01:00
Mojca Lorber 1facd2cefe fix validation problems 2016-11-10 17:20:17 +01:00
Luka Murn 0e065026bd Closes SCI-648 2016-11-10 16:18:17 +01:00
Mojca Lorber fbaffbcaab add formatted text in reports 2016-11-10 15:20:40 +01:00
Luka Murn 564274a588 Set invited_by field to invited users 2016-11-10 14:45:24 +01:00
Mojca Lorber d2ae11f1af fix hound 2016-11-10 14:16:54 +01:00
zmagod df43614f00 swithced quill gem to master branch 2016-11-10 14:15:39 +01:00
Mojca Lorber 3e162b3a93 remove redcarpet gem - markdown 2016-11-10 14:11:32 +01:00
zmagod 7c7106d8ff included updated guill-rails version [fixes SCI-639] 2016-11-10 14:04:22 +01:00
Mojca Lorber 456c6d1ad6 Copy rich text functionality to text results 2016-11-10 12:19:59 +01:00
mlorb 19433850c8 Merge pull request #272 from mlorb/ml-sci-638 
Integrate library with default settings [SCI-638]
 2016-11-09 17:10:19 +01:00
Mojca Lorber c44e25d72e add gemfile.lock 2016-11-09 17:08:50 +01:00
Mojca Lorber ab0879e8d6 Integrate library with default settings 2016-11-09 13:09:53 +01:00
Oleksii Kriuchykhin 6811120829 Added step numbers in intro tutorial [SCI-570] 2016-11-09 10:52:00 +01:00
Luka Murn c88f834ba9 Merge pull request #269 from Ducz0r/lm-sci-569 
Add a refactored invite users modal that can be reused throughout application
 2016-11-08 16:57:05 +01:00
Luka Murn b246853117 Code styling (use link_to, %w) 2016-11-08 16:43:25 +01:00
Zmago Devetak 82a12f0fce Merge pull request #262 from ZmagoD/zd_add_notification_types_to_constants 
Enables notifications to be extended
 2016-11-08 13:08:15 +01:00
Luka Murn d44a757b25 Add textareas to checklist name & items 
Closes SCI-644
 2016-11-08 11:50:29 +01:00
zmagod 330afe80dc fixes notification model 2016-11-08 11:46:09 +01:00
mlorb 0793fb9f11 Merge pull request #260 from mlorb/ml_sci_614 
Add notification for removing user from team and removing user from project [SCI-614]
 2016-11-08 11:30:49 +01:00
Luka Murn 55d8fea359 Make all comment edit fields textareas 2016-11-08 11:29:55 +01:00
zmagod 808ec807c2 added extends file 2016-11-08 11:26:55 +01:00
Mojca Lorber 6f1c9ffb81 refactoring 2016-11-08 11:20:14 +01:00
Luka Murn 9438ba7e10 Fix a bug 2016-11-08 09:00:00 +01:00
Luka Murn 9260ed31f3 Add Deface hooks to main navbar 2016-11-07 16:57:18 +01:00
Mojca Lorber 63eb4eeaf8 fix hound 2016-11-07 15:33:21 +01:00
Mojca Lorber 27c83992b4 refactoring notification method 2016-11-07 15:31:06 +01:00
okriuchykhin fd805f4072 Merge pull request #259 from okriuchykhin/ok_SCI_605 
Added additional activities [SCI-605]
 2016-11-07 10:01:16 +01:00
Luka Murn ce7733e9e9 Also add notification when UserOrganization is created 2016-11-07 09:47:30 +01:00
Luka Murn 0ab62576a2 Add new modal to organization page, remove old modal code 2016-11-07 09:43:10 +01:00
Luka Murn a188984ede Allow strings of modal to be replaced 2016-11-07 09:43:10 +01:00
Luka Murn 6fe0d6b3df A working invite modal! 2016-11-07 09:43:10 +01:00
Luka Murn ccf8932611 Add first version of invite users modal 2016-11-07 09:43:09 +01:00
Oleksii Kriuchykhin fe6724431e Futher improvement of samples assign/unassign logging [SCI-605] 2016-11-07 09:29:56 +01:00
mz3944 12d1c31651 Merge pull request #268 from mz3944/mz_add_profile_statistics_data_hook_SCI_567 
Added profile statistics data hook.
 2016-11-04 17:39:26 +01:00
Oleksii Kriuchykhin a1bfacef86 Improved samples assign/unassign logging [SCI-605] 2016-11-03 17:59:32 +01:00
Matej Zrimšek 0fe5822825 Added profile statistics data hook. 2016-11-03 17:50:32 +01:00