scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-15 21:56:12 +08:00
Code Issues Projects Releases Packages Wiki Activity
3928 commits 31 branches 181 tags 167 MiB
Commit graph

3928 commits

This branch
This branch
All branches
Author SHA1 Message Date
mlorb
5e689f6b4d fix toggle button on inventory page 2018-05-23 11:20:42 +02:00
Luka Murn
31a1641b42
Merge pull request #1155 from Ducz0r/lm-sci-2436-fix 
Update new repository row code so file columns work again [SCI-2436]
 2018-05-22 09:27:32 +02:00
mlorb
e3fc0237c1
Merge pull request #1153 from mlorb/ml-sci-2440 
Final button colour changes [SCI-2440]
 2018-05-21 16:29:04 +02:00
Luka Murn
6135081a71 Update new repository row code so file columns work again 
Also fix backend code a bit (so update & create of repository rows
are more similar in their behavior), and fix line in JS:
_initSelectPicker() was called a reduntant amount of times when
editing repository row.

Closes SCI-2436.
 2018-05-21 14:46:30 +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
mlorb
0fccc71fc3 fix load protocol wording and UI-style 2018-05-18 16:57:18 +02:00
mlorb
c2cf52bb34 add another toggle button 2018-05-18 16:34:01 +02:00
mlorb
81392362ac Final button colour changes 2018-05-18 16:24:24 +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
mlorb
43d19b1d8f
Merge pull request #1148 from mlorb/ml-sci-2343 
UI/UX restyle - update colours for navigation [SCI-2343]
 2018-05-18 13:48:33 +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
Zmago Devetak
5dbe978d34
Merge pull request #1144 from ZmagoD/zd_SCI_2371 
adds save PDF report to inventory feature [fixes SCI-2371]
 2018-05-17 15:25:13 +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
zmagod
69783cb73e removes unneeded spec 2018-05-16 12:11:18 +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
ac6c5de83c
Merge pull request #1134 from okriuchykhin/ok_SCI_2301 
Fix initialization of default value for repositories limit [SCI-2301]
 2018-05-16 10:24:56 +02:00
Oleksii Kriuchykhin
beacdb934f Change default inventory limit to 6 [SCI-2301] 2018-05-16 10:23:36 +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