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

6870 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik 5b710241e1 Add delete condition to update_data method on CellValues 2019-12-10 14:29:33 +01:00
Urban Rotnik 79a50860b6 Add methods update_data, data_changed, formatted for all types off ColumnValues 2019-12-10 14:29:29 +01:00
mlorb 55b9a82ff0
Merge pull request #2254 from mlorb/ml-sci-4029 
Add numeric repository column type [SCI-4029]
 2019-12-10 14:19:46 +01:00
Mojca Lorber 1c342d1d26 structure changes 2019-12-10 13:52:55 +01:00
Mojca Lorber a3a5b21951 small fixes 2019-12-10 12:02:08 +01:00
mlorb 1122fe2d2f
Merge branch 'features/new-column-types' into ml-sci-4029 2019-12-10 10:54:41 +01:00
Urban Rotnik 28986ee177
Merge pull request #2256 from urbanrotnik/ur-sci-fix-syntax-errors 
Fix syntax errors
 2019-12-10 10:50:06 +01:00
aignatov-bio 4d3968a48a
Merge pull request #2249 from aignatov-bio/ai-sci-fix-comment-error 
Remove edit initialization from comment view mode
 2019-12-10 10:36:38 +01:00
aignatov-bio 5ba8e6507e
Merge branch 'release-1-17-8' into ai-sci-fix-comment-error 2019-12-10 10:36:30 +01:00
Alex Kriuchykhin 2e15548680
Merge pull request #2245 from okriuchykhin/ok_SCI_4107 
Fix TinyMCE images and avatars for export all [SCI-4107]
 2019-12-10 10:35:09 +01:00
Urban Rotnik c6a3c41019 Fix routes in dropdown 2019-12-10 10:13:41 +01:00
Urban Rotnik e764e856d8 Fix syntax error 2019-12-10 09:40:40 +01:00
Mojca Lorber 8503dd7007 Add numeric repository column type 2019-12-09 16:38:21 +01:00
Alex Kriuchykhin 7a97f813b2
Merge pull request #2252 from biosistemika/SCI-4109-export-with-assigned-item-bugfix 
SCI-4109 fix the file copying
 2019-12-09 16:04:43 +01:00
aignatov-bio c05991be94
Merge pull request #2253 from aignatov-bio/ai-sci-4144-fix-autosave-for-chemical-drawings 
Fix autosave for marvinJS in tinyMCE [SCI-4144]
 2019-12-09 16:03:56 +01:00
aignatov-bio 2a38928b7a
Merge pull request #2251 from aignatov-bio/ai-sci-4068-custom-select-on-manage-columns-forms 
Update drop-down for columns type selection [SCI-4068]
 2019-12-09 14:09:21 +01:00
aignatov-bio 5da9f1ab34
Merge pull request #2250 from aignatov-bio/ai-sci-4011-new-column-type-checklist 
Add checklists column type [SCI-4011]
 2019-12-09 14:06:59 +01:00
aignatov-bio 09079fbcda Fix naming and tests 2019-12-09 13:48:36 +01:00
aignatov-bio 643abc3fd7 Fixes tests 2019-12-09 13:48:36 +01:00
aignatov-bio d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
aignatov-bio c4a87bed52 Fix autosave for marvinJS in tinyMCE 2019-12-09 11:23:01 +01:00
Urban Rotnik 4b8209bcbe
Merge pull request #2246 from urbanrotnik/ur-sci-4064-refactor-edit-renderers 
Refactor edit renderers [SCI-4064]
 2019-12-07 13:08:41 +01:00
aignatov-bio eb708e4226 Update dropdown for column type selection 2019-12-06 16:14:16 +01:00
Urban Rotnik eca0c84bbd Fix tests 2019-12-06 14:20:37 +01:00
aignatov-bio 63edd3e877 Remove edit initialization from view mode 2019-12-06 13:26:47 +01:00
Urban Rotnik e934e08c17 Implement STI for DateTimeValue types 2019-12-06 12:50:19 +01:00
Urban Rotnik 06d87cb4b6 Add I18n to serializers 2019-12-06 11:39:10 +01:00
Urban Rotnik 7661a24a44 Remove scope for before_action 2019-12-06 11:15:17 +01:00
Urban Rotnik 2c0a6ed085 Remove current_user vars 2019-12-06 11:12:07 +01:00
Urban Rotnik 64c6159354 Update require JS 2019-12-06 10:39:21 +01:00
Oleksii Kriuchykhin 7a89cae56f Fix TinyMCE images and avatars for export all [SCI-4107] 2019-12-05 13:27:17 +01:00
Oleksii Kriuchykhin 03667f619f Merge branch 'release-1-17-7' into develop 2019-12-05 13:03:39 +01:00
aignatov-bio 29f4b6fe79
Merge pull request #2248 from aignatov-bio/ai-sci-4125-search-doesnt-find-file-content 
Fix file post process method [SCI-4125]
 2019-12-05 12:48:03 +01:00
aignatov-bio 9fe6e7b538 Fix markup 2019-12-05 11:27:52 +01:00
aignatov-bio ac545a7775 Fix GemFile lock 2019-12-05 11:26:42 +01:00
Urban Rotnik 2ec99fa696 Add new renderer for File, Status and List 2019-12-05 09:19:19 +01:00
Urban Rotnik ee5c2ac93d Add edit renderer for Assets 2019-12-04 14:52:52 +01:00
Oleksii Kriuchykhin f675948fa6 Bump version to 1.17.7 2019-12-04 10:49:43 +01:00
aignatov-bio 6c057a86c9 Update git version 2019-12-03 13:31:13 +01:00
aignatov-bio 42dac51241 Fix markup 2019-12-03 10:38:21 +01:00
aignatov-bio be87d50bfa Remove YOMU serrver 2019-12-03 10:35:54 +01:00
aignatov-bio d5f9604e1c Fix file post process method 2019-12-03 10:17:47 +01:00
Miha Mencin 8caa88fc7e Merge branch 'release-1-17-7' of github.com:biosistemika/scinote-web into release-1-17-7 2019-12-03 09:10:55 +01:00
Miha Mencin 80579043b2 Merge branch 'SCI-4108-bug-at-report-generation' into release-1-17-7 2019-12-03 09:10:09 +01:00
aignatov-bio d643a08a9c
Merge pull request #2243 from aignatov-bio/ai-sci-4137-fix-activity-page-it-task 
Fix task activity page [SCI-4137]
 2019-12-03 09:09:36 +01:00
aignatov-bio f148ae8b24
Merge pull request #2242 from aignatov-bio/ai-sci-4136-fix-smart-annotation-on-autosave 
Fix smart annotation for autosave [SCI-4136]
 2019-12-03 09:09:16 +01:00
aignatov-bio 1a3dbc9521
Merge pull request #2241 from aignatov-bio/ai-sci-4135-fix-experiment-copy 
Fix experiment copy [SCI-4135]
 2019-12-03 09:09:05 +01:00
aignatov-bio 010a44650c Fix task activity page 2019-12-02 16:04:50 +01:00
aignatov-bio 2d4104b0f2 Fix smart annotation for autosave 2019-12-02 15:53:42 +01:00
aignatov-bio 43ff9f6f26 Fix experiment copy 2019-12-02 15:34:42 +01:00