scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-10-02 04:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
2546 commits 69 branches 179 tags 166 MiB
Commit graph

2546 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zanz2 29b9d50363 Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer 2017-09-14 11:30:53 +02:00
Zanz2 9fc91aac32 added protocols io upload preview modal 2017-09-13 16:04:16 +02:00
Zanz2 b7432b336a added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller 2017-09-13 15:15:08 +02:00
Žan Žagar 706031dacb added model and controler, model should go to services while the controller should go to protocols controller 2017-09-12 15:25:22 +02:00
Žan Žagar fdbae19156 changed .json to .txt for clarity 2017-09-12 09:33:18 +02:00
Žan Žagar 2a7a2b8fa1 Changed some minor button text and fixed a local error 2017-09-12 09:26:22 +02:00
Žan Žagar 62350d0d42 Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later 2017-09-11 16:03:33 +02:00
Žan Žagar 9b640c5df8 Dropdown menu works, need to add backend code for the second button 2017-09-11 15:28:48 +02:00
Žan Žagar 0f4dadefa9 prvi (star gumb) v dropdownu sedaj deluje 2017-09-11 15:23:09 +02:00
Žan Žagar f668f60237 dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni 2017-09-11 15:22:22 +02:00
Žan Žagar 2c0a458aaf dodav moj alternativni text za importanje (text na gumbu), za rails translate (t) 2017-09-11 15:21:35 +02:00
Žan Žagar 31e8c107fd dodav na pravi branch te file 2017-09-11 14:35:00 +02:00
Jure Grabnar b4a13dffe3 init commit, dodav na protocols index gumb z dropdown 2017-09-11 13:07:22 +02:00
mlorb 03743a21f6 Merge pull request #786 from mlorb/ml-sci-1587 
Fix bugs with importing samples [SCI-1587]
 2017-09-08 09:19:35 +02:00
Mojca Lorber a0f7030a70 fix bug with tinyMCE text validaton 2017-09-07 14:54:12 +02:00
Mojca Lorber 0e14420193 fix bugs with importing samples 2017-09-06 14:41:14 +02:00
Luka Murn c44c5b37bb Merge pull request #785 from okriuchykhin/ok_GIOT_29 
Add validation for uid uniqness [GIOT-29]
 2017-09-01 17:04:38 +02:00
Oleksii Kriuchykhin fc0e2d2172 Add validation for uid uniqness [GIOT-29] 2017-09-01 17:00:13 +02:00
okriuchykhin 91233a97c4 Merge pull request #784 from okriuchykhin/ok_GIOT_31 
Improve error logging [GIOT-31]
 2017-09-01 16:42:23 +02:00
Oleksii Kriuchykhin a927c2832d Improve error logging [GIOT-31] 2017-09-01 16:36:45 +02:00
Luka Murn 8463c89386 Update Gemfile 2017-09-01 09:36:40 +02:00
Luka Murn e5bfb3c42d Rollback migration version 2017-09-01 09:06:25 +02:00
okriuchykhin ccf60fba7d Merge pull request #779 from okriuchykhin/ok_SCI_1579 
Backport API to Rails-4 [SCI-1579]
 2017-08-30 13:32:21 +02:00
Oleksii Kriuchykhin c3fceb90df Backport API to Rails-4 [SCI-1579] 2017-08-30 13:30:41 +02:00
Luka Murn 67017d383c Merge pull request #761 from Ducz0r/lm-add-versions-rake-file 
Add versions Rake
 2017-08-23 08:36:45 +02:00
Luka Murn 5ee7fd895c Moved the arrays into json 2017-08-23 08:35:48 +02:00
Luka Murn b6eb46471a Merge pull request #753 from Ducz0r/lm-remove-some-code 
Remove some code we're no longer maintaining
 2017-08-22 14:04:04 +02:00
Luka Murn 1cabe84910 Merge pull request #774 from Ducz0r/lm-sci-1376 
Update delayed_paperclip library [SCI-1376]
 2017-08-22 09:23:30 +02:00
Luka Murn 90188c89c9 Update delayed_paperclip library 
Closes SCI-1376.
 2017-08-22 08:34:58 +02:00
Luka Murn cf2b06d82f Merge pull request #760 from mz3944/mz-SCI-1481 
Fixed slow exporting of repositories - JS listeners which triggered f… [SCI-1481]
 2017-08-07 14:11:50 +02:00
Luka Murn 85634b2fb6 Add 'off' before setting export button to 'on' 2017-08-07 14:04:39 +02:00
Luka Murn a9b74e3b95 Merge branch 'mz-SCI-1481' of https://github.com/mz3944/scinote-web into mz3944-mz-SCI-1481 2017-08-07 14:00:23 +02:00
Luka Murn 6239e01536 Bump version to 1.12.3 2017-08-03 13:35:41 +02:00
Luka Murn 77fdaaeb2e Add versions Rake file 2017-08-03 11:28:33 +02:00
Matej Zrimšek d90ca1b934 Fixed slow exporting of repositories - JS listeners which triggered function responsible for providing export data was bound more than once. [SCI-1481] 2017-08-02 16:49:53 +02:00
lenart 6c5bc32f24 Revert incorrect changes from previous commit [SCI-1249] 2017-08-02 16:00:23 +02:00
lenart e781dfc6a6 Truncate activity taking smart annotations into account fixes [SCI-1249] 2017-08-02 15:51:32 +02:00
mz3944 25f4095446 Merge pull request #756 from mz3944/mz_SCI_1524 
Fix permissions for editing and deleting custom repository custom columns. [SCI-1524]
 2017-07-28 15:58:33 +02:00
Matej Zrimšek 07fea16d26 Fix permissions for editing and deleting custom repository custom columns. [SCI-1524] 2017-07-28 12:01:11 +02:00
Luka Murn 03a7440136 Remove SkyLight stuff (we're not using it any more) 2017-07-27 14:26:44 +02:00
Luka Murn fbdf96f04b Remove 3rd party licenses file & fake data generator 2017-07-27 14:12:28 +02:00
Luka Murn 61e4072c62 Bump version to 1.12.2 2017-07-26 13:39:21 +02:00
okriuchykhin af4b310754 Add ordering for column mappings in repositories 2017-07-26 13:35:54 +02:00
okriuchykhin 1f7528d4a4 Merge pull request #751 from okriuchykhin/ok_SCI_1519 
Fix adding and editing repository items [SCI-1519]
 2017-07-26 11:25:43 +02:00
Oleksii Kriuchykhin 6a43483a2f Fix adding and editing repository items [SCI-1519] 2017-07-26 11:22:26 +02:00
okriuchykhin 38f254ae9b Merge pull request #749 from ZmagoD/zd_SCI_1487 
don't hide modal [fixes SCI-1487]
 2017-07-25 14:35:10 +02:00
zmagod dfc8ea7fbf don't hide modal [fixes SCI-1487] 2017-07-25 14:33:41 +02:00
okriuchykhin 532153b9cb Merge pull request #747 from okriuchykhin/ok_SCI_101 
Improve samples import speed [SCI-101]
 2017-07-25 14:10:45 +02:00
Oleksii Kriuchykhin efd03db6db Further samples import improvement [SCI-101] 2017-07-25 10:56:07 +02:00
mz3944 895eb22702 Merge pull request #748 from mz3944/mz-SCI-1516 
Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516]
 2017-07-25 10:49:33 +02:00