Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev 8.5 #151

Open
wants to merge 169 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
169 commits
Select commit Hold shift + click to select a range
223d419
Update changes.txt
jushadi Apr 3, 2016
84e06ec
Update slimsinfo.inc.php
jushadi Apr 3, 2016
ddd5b13
Update messages.po
kolordwijo Mar 21, 2017
7829f35
Add files via upload
kolordwijo Mar 22, 2017
2a8a16b
Update info
buitenzorg812 Sep 13, 2018
b7378b8
Update reserve_list.php
nalamapu Oct 13, 2018
31fac2d
Added spanish help
Oct 25, 2018
e68b4b3
Updated spanish messages.po
aferrop Oct 25, 2018
f9f7c81
Added new translation with Urdu (Pakistan) language
buitenzorg812 Nov 29, 2018
bf4a978
Edited some line to add information about new localisation
buitenzorg812 Nov 29, 2018
8bfbe26
Add new template Schils...yeaaah baby!
mucill Nov 30, 2018
6a0ab4d
Merge branch 'master' of github.com:slims/slims8_akasia into dev-8.5
mucill Nov 30, 2018
5d42934
Perbaikan template Schils
mucill Dec 1, 2018
a622975
Modified Z3950 Service on Bibliography module.
buitenzorg812 Dec 2, 2018
bcd943d
Modified SLiMS version numbering from 8.3.1 to 8.5
buitenzorg812 Dec 2, 2018
4c107af
Modified but not able to change
buitenzorg812 Dec 3, 2018
2cd974f
fixed shortcut not visible
heroesoebekti Dec 3, 2018
3823025
Update installation SQL to be compliant with SQL 5.7 default settings.
slimstemplate Dec 5, 2018
dd7913f
Bug fixing in update membership data.
slimstemplate Dec 5, 2018
0ebd0b5
Resolve #124 - Copy cataloguing with marc sru
idoalit Dec 5, 2018
074d5f3
Resolve #132 - invalid form submission token
idoalit Dec 5, 2018
3bd1e73
Resolve #136 - invalid token
idoalit Dec 5, 2018
fc771e4
Resolve #137 - User profile edit page
idoalit Dec 5, 2018
ff0022c
Remove mysql_connect. Migrate to mysqli_connect
slimstemplate Dec 5, 2018
457e5fe
Migrate to mysqli_connect
slimstemplate Dec 5, 2018
69470d1
Resolve #141 - Data topik tidak ter-input
idoalit Dec 5, 2018
f12ccbb
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
idoalit Dec 5, 2018
faed1b1
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
idoalit Dec 5, 2018
d3ab534
Remove error: undefined index sql_criteria
slimstemplate Dec 5, 2018
2283fa1
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
slimstemplate Dec 5, 2018
ee0483e
Update sysconfig.inc.php to default value
slimstemplate Dec 5, 2018
a4e1262
Update public default template to comply to custom record
slimstemplate Dec 5, 2018
4290c57
Resolve #136 - Cannot add new system user. Add compatibility with mys…
idoalit Dec 5, 2018
0ee4dd0
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
idoalit Dec 5, 2018
24bd5b5
Resolve #133 - Automatic page reload
idoalit Dec 5, 2018
1336493
Update .gitignore
idoalit Dec 5, 2018
57818ee
perbaikan ruas kala terbit untuk terbitan berseri
heroesoebekti Dec 6, 2018
2e2638e
Resolve slims#126 - Show biblio custom data on OPAC details
idoalit Dec 6, 2018
26f1777
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
idoalit Dec 6, 2018
1fb20b7
Merge pull request #143 from idoalit/126-biblio-custom
idoalit Dec 6, 2018
de52733
Resolve slims#139 - Missing Advance Search Option
idoalit Dec 6, 2018
c315522
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
idoalit Dec 6, 2018
3ef1354
Merge pull request #144 from idoalit/139-missing-advanced-search
idoalit Dec 6, 2018
0ea646a
Update lib/api.inc.php
slimstemplate Dec 8, 2018
4709da2
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
slimstemplate Dec 8, 2018
456cc77
Change caching directory destination
drajathasan Dec 6, 2018
e726e22
Fixing Undefined index in circulation process
drajathasan Dec 8, 2018
dea78c5
Add "id" support for Solr id field and "_id" support for ES id field.
slimstemplate Dec 8, 2018
6fa9c91
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
slimstemplate Dec 8, 2018
959f724
Added new ignored directory to upstream upload
buitenzorg812 Dec 8, 2018
6153ea6
Merge branch 'dev-8.5' into pr/37
idoalit Dec 8, 2018
f784d73
Merge branch 'dev-8.5' into pr/112
idoalit Dec 8, 2018
6849947
Merge branch 'dev-8.5' into pr/120
idoalit Dec 9, 2018
f5b8a86
Merge branch 'dev-8.5' into pr/128
idoalit Dec 9, 2018
e67d285
Fix miss-typed command within the configuration file
buitenzorg812 Dec 10, 2018
832c304
update member custom
heroesoebekti Dec 12, 2018
fa611d9
Merge pull request #148 from heroesoebekti/dev-8.5
heroesoebekti Dec 12, 2018
7015856
nothing
heroesoebekti Dec 12, 2018
88faff7
Merge pull request #149 from heroesoebekti/dev-8.5
heroesoebekti Dec 12, 2018
979d626
Add beta testing for SOLR Support
slimstemplate Dec 13, 2018
dd1f13a
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
slimstemplate Dec 13, 2018
1d213b6
Change indexing engine default value to FALSE
slimstemplate Dec 13, 2018
02d516b
New upload
mucill Dec 17, 2018
7eb5fc1
Update template
mucill Dec 19, 2018
23ea6ca
Ubah layout print
mucill Dec 19, 2018
080d2a3
Update Report
mucill Dec 19, 2018
97a089d
Change button color
mucill Dec 19, 2018
98cd2b9
Update oai to not attach bibliography data that in opac hide status.
slimstemplate Dec 21, 2018
1967ce1
add call number information on record_dc.php
ridorido Dec 21, 2018
579665d
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
ridorido Dec 21, 2018
f84e0e4
Fix some shortcut on Transaction
mucill Dec 21, 2018
b100eb3
Merge pull request #8 from idoalit/dev-8.5
idoalit Dec 23, 2018
057e963
Add new Member Card design
mucill Dec 23, 2018
e5467d2
Add new Membercard Template
mucill Dec 23, 2018
83fe90f
Change value
mucill Dec 24, 2018
d2e4ed4
Add new Multimedia Player
mucill Dec 24, 2018
693ea13
Merge branch 'dev-8.5' of https://github.com/mucill/slims85_dev into dev
mucill Dec 24, 2018
963e405
Resolve #1 implement elasticsearch
idoalit Dec 25, 2018
34c1bdd
Resolve #1 implement elasticsearch
idoalit Dec 25, 2018
953dc30
Update mapping elasticsearch
idoalit Dec 26, 2018
9eeb512
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
idoalit Dec 26, 2018
8737c9b
Added composer lock for development
buitenzorg812 Dec 26, 2018
43cf188
Change Dashboard layout
mucill Dec 26, 2018
4f0af1b
Change potential security
mucill Dec 27, 2018
3ba8b93
Merge branch 'dev' of github.com:mucill/slims85_dev into dev-8.5
mucill Dec 27, 2018
afe5934
Merge pull request #153 from mucill/dev-8.5
idoalit Dec 27, 2018
c817cb7
Make load autoload.php as optional
idoalit Dec 27, 2018
0e8ef1a
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
idoalit Dec 27, 2018
6febbcc
Make load autoload.php as optional
idoalit Dec 27, 2018
684a2ef
Fix some css class to BS4
idoalit Dec 27, 2018
13b9313
Add options value in print settings.
idoalit Dec 27, 2018
c326ceb
Merge branch 'master' of https://github.com/slims/slims8_akasia into …
idoalit Dec 27, 2018
b3c136c
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
buitenzorg812 Dec 27, 2018
53904cc
Add toastr library for show notification
idoalit Dec 27, 2018
3dc4ed6
Change native alret to toastr in bibliography
idoalit Dec 27, 2018
3f8fdf7
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
buitenzorg812 Dec 27, 2018
710c559
Resolve #156 Removing Shorcut
idoalit Dec 27, 2018
16f7c5f
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
buitenzorg812 Dec 27, 2018
2cbe2c2
Merge pull request #1 from slims/dev-8.5
mucill Dec 27, 2018
2af4389
Change all native alert to toastr in bibliography module
idoalit Dec 28, 2018
abc9233
Add Barcode Reader
mucill Dec 28, 2018
ef6e0ae
Add Barcode Reader
mucill Dec 28, 2018
d3cc6bf
Moving to /circulation and repairing security check
mucill Dec 28, 2018
1aed4fc
Merge branch 'dev-8.5' into dev-8.5
mucill Dec 28, 2018
1572b3d
Merge pull request #160 from mucill/dev-8.5
mucill Dec 28, 2018
b7b6170
Merge pull request #2 from slims/dev-8.5
mucill Dec 28, 2018
d3167ab
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
buitenzorg812 Dec 28, 2018
dc4977e
Add Barcode Scanner to Circulation & StockOpname
mucill Dec 29, 2018
b30e745
Merge pull request #162 from mucill/dev-8.5
mucill Dec 29, 2018
4e329c0
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
buitenzorg812 Dec 31, 2018
9917091
Update pdf.js to version v2.0.943
idoalit Jan 8, 2019
ed3dc9f
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
buitenzorg812 Jan 9, 2019
7e33159
Resolve #168 - overdue fines
idoalit Feb 18, 2019
01501c9
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
buitenzorg812 Feb 19, 2019
be39cbf
Fix upgrade through installer
buitenzorg812 Mar 1, 2019
480839e
Turkish Translation
ayyilmaz Mar 22, 2019
21549f6
Merge pull request #173 from ayyilmaz/dev-8.5
buitenzorg812 Apr 1, 2019
71cbe80
Update changes.txt
buitenzorg812 Apr 1, 2019
a10355e
fix writing log before function returns a value
idoalit Apr 12, 2019
71cadf8
Merge branch 'master' of https://github.com/slims/slims8_akasia into …
idoalit May 12, 2019
ff4ed42
Fixed: unknow param type
idoalit Jun 12, 2019
bfdc6af
Download digital file (pdf) from UCS3
idoalit Aug 22, 2019
e07280b
Download image cover from UCS3
idoalit Aug 22, 2019
09da5bb
Fix: undefined index
idoalit Aug 22, 2019
a679c5f
Adding files for previous clone. Need to get the configuration right.
buitenzorg812 Aug 25, 2019
3b75761
Add voice announcer in Visitor
mucill Aug 27, 2019
5c1731b
Add voice announcer reference
mucill Aug 27, 2019
fdf7183
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
buitenzorg812 Aug 27, 2019
55382b9
Images from insert bibliography data.
buitenzorg812 Aug 27, 2019
6c7d6d3
Modified : Content for changes.txt regarding new features and updates.
buitenzorg812 Aug 27, 2019
3398d6b
Modified: Content for changes.txt regarding new features and updates
buitenzorg812 Aug 27, 2019
b80aaaf
Fix missing closing tag
idoalit Oct 5, 2019
5521388
update: print settings
heroesoebekti Oct 14, 2019
1777e1a
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
heroesoebekti Oct 14, 2019
d27134f
Add date range for most active members in member report.
idoalit Oct 30, 2019
34ba0e8
Merge remote-tracking branch 'origin/dev-8.5' into dev-8.5
idoalit Oct 30, 2019
d8c2af3
Add note for empty data
idoalit Oct 30, 2019
bb36e27
Fix: promoted collection in default template
idoalit Nov 4, 2019
ed07451
Increase security in datagrid
idoalit Jan 1, 2020
6a35139
Prevent update other user data
idoalit Jan 1, 2020
e68eeea
Prevent delete other file using delete image link
idoalit Jan 1, 2020
61382f5
Prevent delete other file using delete image link
idoalit Jan 1, 2020
1f79c30
Use httpOnly cookie
idoalit Jan 1, 2020
73765b2
Prevent xss attack
idoalit Jan 1, 2020
c0179cb
Add: all new classic template
idoalit Jan 3, 2020
abadbc7
Use vue as production
idoalit Jan 3, 2020
7c4a41d
Prevent submit for empty memberID
idoalit Jan 3, 2020
bc78b44
Fix: missing popup
idoalit Jan 4, 2020
ea3f7ec
Add: videoStream library to fix zero bytes stream file
idoalit Jan 4, 2020
28a3c74
Added info after updating
Jan 5, 2020
de67e96
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
Jan 5, 2020
2357753
Make align content center
idoalit Jan 5, 2020
fbbb07b
Add: random bibliography as suggestion
idoalit Jan 5, 2020
e0d668e
Add: detail link to suggestion list
idoalit Jan 5, 2020
55f30b1
Add: other option mysqldump path
idoalit Jan 5, 2020
9ae8b12
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
Jan 5, 2020
79e1fb7
Add: notice backup before initialize stock take
idoalit Jan 5, 2020
f19830c
Fix: minor bug
idoalit Jan 6, 2020
5df2ddf
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
Jan 6, 2020
5463931
Add: select language menu for classic template
idoalit Jan 7, 2020
452548c
Change language code for Arabic Language
idoalit Jan 7, 2020
c67c28c
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
Jan 9, 2020
c08fff2
add turkish locale
heroesoebekti Jan 9, 2020
8f3d76a
Added Russian translation
Jan 9, 2020
d6ea10b
Merge branch 'dev-8.5' of https://github.com/slims/slims8_akasia into…
Jan 9, 2020
2f10e94
Added language menu for Russian translation.
Jan 9, 2020
29f34f5
Update messages.po
nalamapu Jan 24, 2020
5583fc1
Merge pull request #194 from nalamapu/patch-11
idoalit Jan 27, 2020
c679f21
Fix msg error while sending to UCS
wynerst Mar 9, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ images/barcodes/*
images/persons/*
images/docs/*
images/labels/*
images/cache/*
files/*
!files/membercard/*
repository/*
config/*
cache/*
.DS_Store
._.*
._*
.project
.idea/*
sysconfig.local.inc.php
config/sysconfig.local.inc.php
sysconfig.inc.php
Expand All @@ -33,4 +36,6 @@ $RECYCLE.BIN/
*.msp

# Windows shortcuts
*.lnk
*.lnk

/vendor/
5 changes: 1 addition & 4 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Listen for XDebug",
"type": "php",
"request": "launch",
"port": 9000
},
{
"name": "Launch currently open script",
"type": "php",
"request": "launch",
"program": "${file}",
"cwd": "${fileDirname}",
"port": 9000
}
]
}
110 changes: 110 additions & 0 deletions admin/admin_template/barcodescanner.tpl.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />

<title>index</title>
<meta name="description" content="" />
<meta name="author" content="Christoph Oberhofer" />
<meta name="viewport" content="width=device-width; initial-scale=1.0; user-scalable=no" />
<link rel="stylesheet" type="text/css" href="<?php echo SWB ?>css/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="<?php echo JWB ?>quaggaJS/css/styles.css?v=<?php echo date('this') ?>" />
</head>

<body>
<audio id="barcodeAudio">
<source src="<?php echo JWB ?>quaggaJS/sound.ogg?v=1" type="audio/ogg">
<source src="<?php echo JWB ?>quaggaJS/sound.mp3?v=1" type="audio/mpeg">
Your browser does not support the audio element.
</audio>
<section id="container">
<div id="interactive" class="viewport"></div>
<div class="controls">
<div class="reader-config-group">

<div class="form-group">
<label>Barcode-Type</label>
<select name="decoder_readers" class="form-control">
<option value="code_128" selected="selected">Code 128</option>
<option value="code_39">Code 39</option>
<option value="code_39_vin">Code 39 VIN</option>
<option value="ean">EAN</option>
<option value="ean_extended">EAN-extended</option>
<option value="ean_8">EAN-8</option>
<option value="upc">UPC</option>
<option value="upc_e">UPC-E</option>
<option value="codabar">Codabar</option>
<option value="i2of5">Interleaved 2 of 5</option>
<option value="2of5">Standard 2 of 5</option>
<option value="code_93">Code 93</option>
</select>
</div>

<div class="form-group">
<label>Resolution (width)</label>
<select name="input-stream_constraints" class="form-control">
<option selected="selected" value="640x480">640px</option>
<option value="320x240">320px</option>
<option value="800x600">800px</option>
<option value="1280x720">1280px</option>
<option value="1600x960">1600px</option>
<option value="1920x1080">1920px</option>
</select>
</div>

<div class="form-group">
<label>Patch-Size</label>
<select name="locator_patch-size" class="form-control">
<option value="x-small">x-small</option>
<option value="small">small</option>
<option selected="selected" value="medium">medium</option>
<option value="large">large</option>
<option value="x-large">x-large</option>
</select>
</div>

<div class="form-group">
<label>Half-Sample</label>
<input type="checkbox" checked="checked" name="locator_half-sample" />
</div>

<div class="form-group">
<label>Workers</label>
<select name="numOfWorkers" class="form-control">
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option selected="selected" value="4">4</option>
<option value="8">8</option>
</select>
</div>

<div class="form-group">
<label>Camera</label>
<select name="input-stream_constraints" id="deviceSelection" class="form-control"></select>
</div>

<div class="form-group" style="display: none">
<label>Zoom</label>
<select name="settings_zoom" class="form-control"></select>
</div>

<div class="form-group" style="display: none">
<label>Torch</label>
<input type="checkbox" name="settings_torch" />
</div>

</div>
</div>
</section>

<script src="<?php echo JWB ?>jquery.js" type="text/javascript"></script>
<script src="<?php echo JWB ?>quaggaJS/adapter.js" type="text/javascript"></script>
<script src="<?php echo JWB ?>quaggaJS/quagga.js" type="text/javascript"></script>
<script src="<?php echo JWB ?>barcodereader.js?v=<?php echo date('this') ?>" type="text/javascript"></script>
<?php if(isset($script)) {
echo '<script>'.$script.'</script>';
} ?>
</body>
</html>
26 changes: 26 additions & 0 deletions admin/admin_template/barcodescannermodal.tpl.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<script src="<?php echo JWB ?>quaggaJS/adapter-latest.js" type="text/javascript"></script>
<script src="<?php echo JWB ?>quaggaJS/quagga.js" type="text/javascript"></script>
<div class="modal fade" id="barcodeModal" tabindex="-1" role="dialog" aria-labelledby="barcodeModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="barcodeModalLabel">Barcode Reader</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body m-0">
<iframe frameborder="0" height="320" id="iframeBarcodeReader"></iframe>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>

<script type="text/javascript">
$('#barcodeModal').on('hidden.bs.modal', function(e){
$('#iframeBarcodeReader').removeAttr('src');
});
</script>
Loading