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

312 commits

Author SHA1 Message Date
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
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
Luka Murn 0e065026bd Closes SCI-648 2016-11-10 16:18:17 +01:00
Mojca Lorber ab0879e8d6 Integrate library with default settings 2016-11-09 13:09:53 +01:00
Luka Murn b246853117 Code styling (use link_to, %w) 2016-11-08 16:43:25 +01:00
Luka Murn 55d8fea359 Make all comment edit fields textareas 2016-11-08 11:29:55 +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 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
Luka Murn b4685b0a40 Remove console.log() 2016-10-25 18:13:29 +02:00
Luka Murn cd360d7279 Fix the save report alert() bug 
Closes SCI-616
 2016-10-25 18:12:29 +02:00
Zmago Devetak 12c77df883 Merge pull request #237 from ZmagoD/zd_SCI_593_v2 
Styled global team switch and search [fixes SCI-593]
 2016-10-21 16:28:50 +02:00
zmagod 49d3879642 fixes padding on mobile, added separator on team switch dropdown, focus search input 2016-10-21 11:46:59 +02:00
okriuchykhin f876ade05e Merge pull request #236 from okriuchykhin/ok_SCI_557 
Fixes issue with new comments and date separator SCI-557
 2016-10-21 10:29:46 +02:00
Zmago Devetak f615b3da41 Merge pull request #230 from ZmagoD/zd_SCI_586 
Adds new team button to team switch dropdown [fixes SCI-586]
 2016-10-21 08:29:05 +02:00
Oleksii Kriuchykhin 0c1ff06f21 Fixes issue with new comments and date separator SCI-557 2016-10-20 22:33:15 +02:00
mlorb fa4f3fb0a0 Merge pull request #220 from mlorb/ml_sci_462 
fix multiplication of edit comment fields [SCI-462]
 2016-10-20 15:14:31 +02:00
Oleksii Kriuchykhin 347216183f Fixes different color of buttons in notifications settings [SCI-590] 2016-10-20 14:17:07 +02:00
zmagod f21c9e394f adds new team button to team switch dropdown [fixes SCI-586] 2016-10-20 13:47:41 +02:00
Luka Murn 640a575a3a Merge pull request #222 from biosistemika/modular-tasks 
Merge global team switch into master
 2016-10-18 11:39:09 +02:00
zmagod 557957c857 fixed issue with mozilla browsers 2016-10-17 15:21:19 +02:00
zmagod d86a4dd311 setup global team switch view and controller action 2016-10-17 15:10:26 +02:00
Oleksii Kriuchykhin 0ec7c019b3 Fix issue with pop-up windows and turbolinks [SCI-463] 2016-10-17 14:25:54 +02:00
Mojca Lorber 177c4b5918 fix multiplication of edit comment fields 2016-10-17 12:59:51 +02:00
Matej Zrimšek f2cd9890dd Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS. 2016-10-17 11:57:47 +02:00
Matej Zrimšek a6a2a237aa Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
Matej Zrimšek ece89da391 Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
Matej Zrimšek 05acf5a725 Replaced all Ruby constants instances in JS to be called from JS. 2016-10-17 11:57:46 +02:00
Matej Zrimšek 0780bd2416 Ruby constants are now automatically available in JS. Refactoring was needed. 2016-10-17 11:57:37 +02:00
Matej Zrimšek a3dfb59558 Added remaining constants. 2016-10-17 11:30:05 +02:00
Matej Zrimšek 21ec05d541 Refactored searches (user and globals earch) and used constants. 2016-10-17 11:17:59 +02:00
Oleksii Kriuchykhin c6fb57318f Added use of constants in JS [SCI-530] 2016-10-13 13:06:11 +02:00
Oleksii Kriuchykhin 37cff75013 Fixes issue with comments options menu [SCI-530] 2016-10-13 12:07:41 +02:00
Mojca Lorber 42f6b679f8 Adding system notifications email function in settings 2016-10-12 11:50:26 +02:00
Mojca Lorber 6bea0a9e1a fixes merge conflicts 2016-10-12 10:55:40 +02:00
Mojca Lorber 4f1cbad7da adding update notifications in settings 2016-10-12 10:42:07 +02:00
Zmago Devetak f25767fdc3 Merge pull request #209 from ZmagoD/zd_SCI_534_remove_popup 
Removed introductory popup [fixes SCI-534]
 2016-10-12 08:13:46 +02:00
Oleksii Kriuchykhin 5399033fce Added user settings for email notifications [SCI-443] 2016-10-11 16:43:17 +02:00
zmagod 42a30576e3 removed introductory popup [fixes SCI-534] 2016-10-11 08:33:50 +02:00
Luka Murn 5c80c8a817 Add "no notifications" to dropdown & notifications index page 2016-10-05 16:58:21 +02:00
okriuchykhin 50f28fe883 Merge pull request #193 from okriuchykhin/ok_global_notifications-SCI-442 
Global notifications screen [SCI-442]
 2016-10-05 16:01:41 +02:00
Oleksii Kriuchykhin 868ffd03d6 JS code improvement [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin 8907e54b49 Global notifications index page added [SCI-442] 2016-10-05 15:51:11 +02:00
Zmago Devetak f3708bcac0 Merge pull request #191 from ZmagoD/zd_SCI_469_ver2 
Comments date duplication
 2016-10-05 15:47:42 +02:00
zmagod b0f6b1f4d0 fixed comments action on project page 2016-10-05 15:39:54 +02:00
Zmago Devetak eea310514a Merge pull request #194 from ZmagoD/zd_SCI_531_533 
Notification style fixes
 2016-10-05 15:27:36 +02:00
zmagod bca3d19562 fixed comment options dropdown position 2016-10-05 15:26:11 +02:00
Zmago Devetak 71ad5bf034 Merge pull request #190 from ZmagoD/zd_SCI_529 
Prepare settings screen for notifications
 2016-10-05 14:54:47 +02:00
okriuchykhin bfa7e57bd8 Merge pull request #168 from okriuchykhin/ok_SCI-463 
Fixes issue with unexpected notification windows [fixes SCI-463]
 2016-10-05 14:45:23 +02:00
zmagod f9d956bbca fix notifications number on [fixes SCI-531] 2016-10-05 11:50:57 +02:00
zmagod d90f17d1eb clean comments date duplication [fixes SCI-469] 2016-10-05 08:42:32 +02:00
zmagod a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
Luka Murn 61cb9651c7 Merge pull request #188 from biosistemika/global-notifications 
Global notifications
 2016-10-04 08:30:50 +02:00
zmagod c9bbab1004 added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users 2016-10-03 20:31:00 +02:00
mlorb 153b692c0c Merge pull request #181 from mlorb/ml_sci_321 
Displaying more information for individual samples in Sample table [SCI-321]
 2016-10-03 16:37:35 +02:00
zmagod 36fb2713b3 start fixing comments dates 2016-10-03 16:10:20 +02:00
Zmago Devetak 91c7d8a952 Merge pull request #176 from ZmagoD/zd_SCI_474 
Unify the comments
 2016-10-03 15:26:17 +02:00
zmagod 77df0bc82c cleans more comment link 2016-10-03 12:34:16 +02:00
Mojca Lorber 093fbd6b8e fixes hound again 2016-10-03 10:40:32 +02:00
Mojca Lorber 2041f2a09d fixes hound 2016-10-03 10:15:46 +02:00
Mojca Lorber 053cd8ed84 removes handler 2016-10-03 10:12:13 +02:00
zmagod b9bc2f17c8 fixing hound 2016-10-03 08:27:13 +02:00
zmagod 2ee02ec472 mark all seen notifications 2016-10-03 08:20:23 +02:00
Luka Murn c83342d9f0 Merge pull request #173 from okriuchykhin/ok_SCI-484 
Fix issue with duplicate error messages in experiments modal [SCI-484]
 2016-09-30 08:24:51 +02:00
zmagod e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
Mojca Lorber f4345f3aef fixes hound 2016-09-28 16:09:39 +02:00
Mojca Lorber efa7a1d7b5 add sample information in pop-up 2016-09-28 15:46:41 +02:00
zmagod 2a86aaf7e4 changed popout content [fixes SCI-520] 2016-09-28 15:12:30 +02:00
zmagod dad0d3868b fixing hound 2016-09-27 17:31:37 +02:00
zmagod 402a77526a cleaned console.log 2016-09-27 16:22:09 +02:00
zmagod 2235778110 fixed project and task comments + fixed date issue 2016-09-27 16:19:31 +02:00
zmagod 0d322eba13 fixed hound 2016-09-27 11:03:10 +02:00
zmagod 4903cb970c removed comments helper 2016-09-27 10:47:18 +02:00
zmagod 1eb9f772f4 refactor sciNote comments js and unified all comments behavior [fixes SCI-474] 2016-09-27 10:30:48 +02:00
zmagod 1cdfde827f fixes protocol and results comments 2016-09-27 09:26:25 +02:00
zmagod 980ff63104 fixed task comments 2016-09-27 09:18:46 +02:00
zmagod 02bfa1949e fixed project comments 2016-09-27 09:00:02 +02:00
Oleksii Kriuchykhin 8a3a9451e9 Fix issue with duplicate error messages in experiments modal [SCI-484] 2016-09-26 12:58:22 +02:00
Oleksii Kriuchykhin db1e24202a Minor code cleanup [fixes SCI-463] 2016-09-26 09:08:38 +02:00
Mojca Lorber c2b742374f adding popup sample info 2016-09-23 17:45:02 +02:00
Oleksii Kriuchykhin 2c144aa2f3 Fix issue with unexpected notification windows appearing after report editor exit [fixes SCI-463] 2016-09-23 11:56:13 +02:00
Zmago Devetak 2b678998d3 Merge pull request #166 from ZmagoD/zd_SCI_471 
fixes load comments [fixes SCI-471]
 2016-09-23 09:17:27 +02:00
zmagod 4f2df691ba add error validations 2016-09-23 08:34:39 +02:00
zmagod 6143b257d0 fixes edit modal [fixes SCI-467] 2016-09-23 08:32:46 +02:00
Matej Zrimšek 0317872bc0 Added check if no comments are present for file result, which caused JS error. 2016-09-22 18:12:35 +02:00
mz3944 cde7f3805f Merge pull request #165 from mz3944/mz_replace_hardcoded_values_with_constants_v2 
Added missing validation for protocol description.
 2016-09-22 17:36:18 +02:00
Matej Zrimšek 13e886f7a9 Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408] 2016-09-22 17:35:23 +02:00
okriuchykhin 087ee08976 Merge pull request #164 from okriuchykhin/ok_SCI-400 
Fixes issue with new experiment modal and with move of experiments [fixes SCI-400]
 2016-09-22 17:01:58 +02:00
okriuchykhin 729cbef27b Merge pull request #156 from okriuchykhin/ok_SCI-459 
Fixes issue with too many " | " signs in error message [fixes SCI-459]
 2016-09-22 16:12:17 +02:00
zmagod 303cb4308a fixes load comments [fixes SCI-471] 2016-09-22 13:46:27 +02:00
Oleksii Kriuchykhin b334b037f8 Fixes issue with old data in modal fields [fixes SCI-400] 2016-09-22 10:54:03 +02:00
Matej Zrimšek c614843044 Minor refactoring with hound alert fixes. 2016-09-21 19:48:18 +02:00
Matej Zrimšek 234918a76d Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits. 2016-09-21 19:48:18 +02:00
Matej Zrimšek c6a23aab98 Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408] 2016-09-21 19:37:36 +02:00
zmagod 06b1992e94 Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436 2016-09-21 19:20:55 +02:00
zmagod 2bfe8f0636 fixing hound 2016-09-21 08:16:23 +02:00
zmagod 9f56df02d2 removes comment tab and add comment in the info tab [fixes SCI-436] 2016-09-20 18:53:51 +02:00
zmagod 42bbc47f5f first working version 2016-09-20 17:06:07 +02:00
zmagod 0ca65aeca5 fixed step comment sorting 2016-09-20 13:31:50 +02:00