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
3922 commits 70 branches 179 tags 165 MiB
Commit graph

3124 commits

Author SHA1 Message Date
zmagod e97a98f189 adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372] 2018-05-22 14:18:40 +02:00
Zmago Devetak 2ac04ee476
Merge pull request #1150 from ZmagoD/zd_SCI_2426 
migrations that fixes the bug with smart annotations [fixes SCI-2426]
 2018-05-21 14:15:47 +02:00
Zmago Devetak 67127b4d89
Merge pull request #1151 from ZmagoD/zd_SCI_2344_v2 
shorten project name [fixes SCI-2344]
 2018-05-21 14:15:24 +02:00
Luka Murn 91673afbf3
Merge pull request #1149 from Ducz0r/lm-remove-unnecessary-save-on-notifications 
Remove unnecessary save on notifications
 2018-05-21 13:53:23 +02:00
okriuchykhin 6dbb5bc583
Merge pull request #1152 from okriuchykhin/ok_SCI_2403 
Change remove file button appearence [SCI-2403]
 2018-05-18 17:34:56 +02:00
Oleksii Kriuchykhin b79b0b79cf Change remove file button appearence [SCI-2403] 2018-05-18 14:51:45 +02:00
zmagod 5514683f96 shorten project name [fixes SCI-2344] 2018-05-18 14:12:12 +02:00
zmagod b8098093ee migrations that fixes the bug with smart annotations [fixes SCI-2426] 2018-05-18 13:57:52 +02:00
Luka Murn 5e90ae7383 Remove uneccesary save when setting notification settings on user 
These methods should behave as the rest of setters on
ActiveRecords, ergo setting the model state, but not saving it.

The save is called at the end of the action inside the controller
anyway, so this save is redundant.
 2018-05-18 13:43:04 +02:00
mlorb 876717e355 add pointer cursor to arrow 2018-05-18 13:34:52 +02:00
mlorb 64cbddb9a0 UI/UX restyle - update colours for navigation 2018-05-18 10:41:32 +02:00
Zmago Devetak c3d247faae
Merge pull request #1128 from ZmagoD/zd_SCI_2331 
adds deface hook in support dropdown [fixes SCI-2331]
 2018-05-18 09:31:02 +02:00
zmagod 8a99d35a8d removes datatables.noSearchHidden plugin 2018-05-18 09:24:36 +02:00
zmagod cf4c33bf92 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 15:22:43 +02:00
zmagod 38b0cb742c removes empty space 2018-05-17 15:21:45 +02:00
mlorb 7bda68b9f4
Merge pull request #1146 from mlorb/ml-sci-2336-v3 
Add locales [SCI-2336]
 2018-05-17 13:29:47 +02:00
zmagod e019767e90 refactor save_pdf_to_inventory_item service 2018-05-17 13:17:19 +02:00
zmagod b125863baf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 11:25:33 +02:00
zmagod ca0c8cbb71 fixes typos, fixes pdf rendering 2018-05-17 11:21:34 +02:00
mlorb 933a98c1f6 fix smart anotation color 2018-05-17 11:01:15 +02:00
Zmago Devetak 5184170a90
Merge pull request #1147 from ZmagoD/zd_SCI_2399 
fixes ajax error in repositories [fixes SCI-2399]
 2018-05-16 20:34:56 +02:00
Zmago Devetak f73bd18989
Merge pull request #1145 from ZmagoD/zd_SCI_2407 
fixes column name in columns visibility dropdown tooltip [fixes SCI-2…
 2018-05-16 20:34:40 +02:00
zmagod 87369ae16b fixes ajax error in repositories [fixes SCI-2399] 2018-05-16 15:08:50 +02:00
okriuchykhin e9d6b26ec6
Merge pull request #1141 from okriuchykhin/ok_SCI_2403 
Add clear file selector button to repository edit [SCI-2403]
 2018-05-16 14:55:53 +02:00
zmagod b1b259fdbe fixes column name in columns visibility dropdown tooltip [fixes SCI-2407] 2018-05-16 14:37:58 +02:00
mlorb 06ce285ae2 add locales 2018-05-16 14:32:15 +02:00
Zmago Devetak 8a92f1a499
Merge pull request #1127 from ZmagoD/zd_SCI_2307_v3 
Adds custom method that generates smart annotations name for repository
 2018-05-16 13:23:25 +02:00
Zmago Devetak 9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321 
fixes images preview in repository/library [fixes SCI-2321]
 2018-05-16 12:05:33 +02:00
zmagod 98baa77846 fixes cursor icon 2018-05-16 12:02:46 +02:00
mlorb f59ea8c7a6
Merge pull request #1137 from mlorb/ml-sci-2336-v2 
UI/UX restyle - fixes throughout application - part 2 [SCI-2336]
 2018-05-16 11:30:54 +02:00
Oleksii Kriuchykhin c8094f196c Add margin to clear button and fix case with new file in the cell [SCI-2403] 2018-05-16 11:25:43 +02:00
zmagod 7e3dbcd92f hound 2018-05-16 10:43:25 +02:00
zmagod 712a3c7ff6 fixes css, changes spinner in preview modal 2018-05-16 10:40:49 +02:00
Oleksii Kriuchykhin be5d481cdc Add clear file selector button to repository edit [SCI-2403] 2018-05-16 10:32:50 +02:00
okriuchykhin 19ed711ce2
Merge pull request #1142 from okriuchykhin/ok_SCI_2411 
Fix pagination in global search inside repositories [SCI-2411]
 2018-05-16 10:19:05 +02:00
okriuchykhin 62f0c21a79
Merge pull request #1140 from okriuchykhin/ok_SCI_2391 
Re-init file preview modal after inventory row editing [SCI-2391]
 2018-05-16 10:18:13 +02:00
okriuchykhin 3e2b455d2c
Merge pull request #1139 from okriuchykhin/ok_SCI_2385 
Fix task resore permissions [SCI-2385]
 2018-05-16 10:17:51 +02:00
okriuchykhin a7547b9775
Merge pull request #1138 from okriuchykhin/ok_SCI_2404 
Disable some validations in repository import to improve speed [SCI-2404]
 2018-05-16 10:17:10 +02:00
okriuchykhin ffddf3fd94
Merge pull request #1135 from okriuchykhin/ok_SCI_2394 
Fix editing of inventory rows with existing files [SCI-2394]
 2018-05-16 10:16:26 +02:00
Luka Murn 19e30b4e95
Merge pull request #1143 from Ducz0r/lm-sci-2320-fix 
Write tests for repository table state [SCI-2320]
 2018-05-16 09:49:00 +02:00
zmagod 4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +02:00
Zmago Devetak b771149477
Merge pull request #1133 from ZmagoD/zd_SCI_2337 
fixes error message for invalid file type [fixes SCI-2337]
 2018-05-16 08:26:11 +02:00
Luka Murn 63b7b937bb Fix a bug with table order not updating properly with col deletion 2018-05-15 20:44:15 +02:00
Oleksii Kriuchykhin 0ca0884937 Fix pagination in global search inside repositories [SCI-2411] 2018-05-15 17:48:48 +02:00
mlorb cea7f5a3f7 some extra style unification 2018-05-15 17:10:31 +02:00
mlorb 5f462165b5 change font and alerts colors 2018-05-15 14:16:34 +02:00
Oleksii Kriuchykhin 95b8821cc9 Re-init file preview modal after inventory row editing [SCI-2391] 2018-05-15 12:57:36 +02:00
Oleksii Kriuchykhin 1d0536b064 Fix task resore permissions [SCI-2385] 2018-05-15 11:51:53 +02:00
Oleksii Kriuchykhin 39d594b0da Disable some validations in repository import to improve speed [SCI-2404] 2018-05-15 11:14:43 +02:00
mlorb dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +02:00