Disable .gitattributes ident (#2324)

This commit is contained in:
jekkos committed 2019-02-02 14:08:20 +01:00
1 parent a36bfdd32d
commit 2674fbd03f
5 files changed
+4 -5

No files matched your search

-2
View File
@@ -1,5 +1,3 @@
dist/ merge=ours
application/language/**/*.php merge=ours
text=auto
application/config/config.php ident
application/views/partial/footer.php ident
+1
View File
@@ -17,6 +17,7 @@ script:
- docker run --rm -v $(pwd):/app composer/composer install
- docker run --rm -v $(pwd):/app -w /app lucor/php7-cli php bin/install.php translations
develop
- HEAD=$(git rev-parse HEAD) sed -i "s/\(\$Id\)/$HEAD/g" application/config/config.php
- docker run --rm -it -v $(pwd):/app -w /app digitallyseamless/nodejs-bower-grunt
sh -c "npm install && bower install && grunt package"
- docker-compose build
+1 -1
View File
@@ -19,7 +19,7 @@ $config['application_version'] = '3.3.0';
|
|
*/
$config['commit_sha1'] = '$Id $';
$config['commit_sha1'] = '$Id';
/*
|--------------------------------------------------------------------------
+1 -1
View File
@@ -4,7 +4,7 @@
<div id="footer">
<div class="jumbotron push-spaces">
<strong><?php echo $this->lang->line('common_you_are_using_ospos'); ?>
<?php echo $this->config->item('application_version'); ?> - <?php echo substr('$Id$', 5, 7); ?></strong>.
<?php echo $this->config->item('application_version'); ?> - <?php echo substr($this->config->item('commit_sha1'), 0, 5); ?></strong>.
<?php echo $this->lang->line('common_please_visit_my'); ?>
<a href="https://github.com/jekkos/opensourcepos" target="_blank"><?php echo $this->lang->line('common_website'); ?></a>
<?php echo $this->lang->line('common_learn_about_project'); ?>
+1 -1
View File
@@ -77,7 +77,7 @@
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=c729835075"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=b9e3a39941"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=aaf585bba7"></script>
<!-- end minjs template tags -->
<?php endif; ?>