12 Commits

Author SHA1 Message Date
dependabot[bot]
bc00c28f5a chore(deps): bump moment from 2.3.1 to 2.24.0 in /docs
Bumps [moment](https://github.com/moment/moment) from 2.3.1 to 2.24.0.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.3.1...2.24.0)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-01 21:38:05 +00:00
nixa
7f2596f4ab chore: update google analytics to GTM 2019-01-19 21:51:00 +03:00
Denis Strigo
2415308399 chore: add google analytics (#416) 2018-10-25 19:45:18 +03:00
Denis Strigo
8df048bf51 chore(update): updated dependencies, update node.js version on CI server (#395) 2018-05-08 13:43:12 +03:00
Vladimir Lugovsky
837cab6ec9 fix(docs): fix type in docs 2018-04-11 19:58:15 +03:00
ESadouski
1f81f3b1c1 docs(zip): add new zip to docs 2016-12-15 13:09:59 +03:00
ESadouski
55e1c26fee chore(version): update version 2016-12-15 12:50:58 +03:00
ESadouski
24e06af05a fix(datePicker) - fixed datePicker position 2016-12-14 15:00:10 +03:00
ESadouski
6b7ba30e49 fix(path) - fixed progressbar and datepicker path 2016-12-14 14:09:40 +03:00
ESadouski
59573260b7 fix(menu) - fixed dependencies 2016-12-13 15:17:39 +03:00
ESadouski
7bb38dd564 fix(gulp) - fixed gulp build 2016-12-13 15:16:35 +03:00
ESadouski
0b75c2d18f fix(uglify) - rollback uglify 2016-12-10 16:49:08 +03:00
13 changed files with 47 additions and 24 deletions

View File

@@ -3,7 +3,7 @@ sudo: false
language: node_js
node_js:
- "4"
- "8"
addons:
apt:
@@ -14,9 +14,7 @@ addons:
install:
- npm config set spin false
- npm install -g npm@3
- npm install -g gulp
- npm install -g bower
- npm install

View File

@@ -1,3 +1,9 @@
v1.3.1 - 15 Dec 2016
--------------------
- Fix gulp build
- Update dependencies
- Fix datepicker position
v1.3.0 - 10 Dec 2016
--------------------
- Update bower dependencies

View File

@@ -1,6 +1,6 @@
{
"name": "blur-admin",
"version": "1.3.0",
"version": "1.3.1",
"homepage": "https://github.com/1itvinka/blur-admin",
"authors": [
"akveo"
@@ -39,16 +39,16 @@
"font-awesome": "fontawesome#~4.4.0",
"fullcalendar": "~3.0.1",
"highlight": "~8.8.0",
"leaflet": "~1.0.2",
"leaflet": "~0.7.5",
"moment": "~2.17.0",
"slimScroll": "jquery-slimscroll#~1.3.6",
"angular-progress-button-styles": "~0.1.0",
"angular-ui-router": "~0.3.2",
"angular-chart.js": "~1.0.3",
"angular-chartist.js": "~3.3.12",
"chartist": "~0.9.5",
"chartist": "0.9.5",
"angular-morris-chart": "~1.1.0",
"ionrangeslider": "~2.1.2",
"ionrangeslider": "2.1.4",
"angular-bootstrap": "~1.3.3",
"angular-animate": "~1.5.8",
"textAngular": "~1.4.6",

View File

@@ -33,5 +33,6 @@ start chrome --user-data-dir="C:/Chrome dev session" --disable-web-security
## Links for downloads
[BlurAdmin 1.3.1](/blur-admin/downloads/blur-admin-1.3.1.zip)
[BlurAdmin 1.2.0](/blur-admin/downloads/blur-admin-1.2.0.zip)

View File

@@ -1,6 +1,6 @@
{
"dependencies": {
"moment": "2.3.x",
"moment": "2.24.x",
"underscore": "1.4.x",
"typogr": "0.5.x"
},

View File

@@ -18,7 +18,18 @@ html(lang='en')
link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900italic,900|Anonymous+Pro:400,700,400italic,700italic&subset=latin,greek,greek-ext,vietnamese,cyrillic-ext,latin-ext,cyrillic')
link(rel='stylesheet', href=contents.css['main.css'].url)
link(rel='shortcut icon', href=contents.images['favicon.png'].url)
| <!-- Google Tag Manager -->
| <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
| new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
| j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
| 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
| })(window,document,'script','dataLayer','GTM-K8MXX5F');</script>
| <!-- End Google Tag Manager -->
body(class=bodyclass)
| <!-- Google Tag Manager (noscript) -->
| <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-K8MXX5F"
| height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
| <!-- End Google Tag Manager (noscript) -->
div.container
div.nav-main
div.wrap
@@ -35,13 +46,9 @@ html(lang='en')
block content
h2 Welcome to blur admin!
footer.wrap
div.left Powered by Angular, Bootsrap, Gulp and more...
div.left Powered by Angular, Bootstrap, Gulp and more...
div.right
| © 20152016 Akveo LLC<br />
| Documentation licensed under #[a(href='https://creativecommons.org/licenses/by/4.0/') CC BY 4.0].
a(href='https://github.com/akveo/blur-admin')
img(style='position: fixed; top: 0; right: 0; border: 0; z-index: 1000;',src='https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67',alt='Fork me on GitHub',data-canonical-src='https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png')
script.
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q || []).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-61945105-3', 'auto');
ga('send', 'pageview');

View File

@@ -33,9 +33,9 @@ gulp.task('html', ['inject', 'partials'], function () {
addRootSlash: false
};
var htmlFilter = $.filter('*.html', { restore: true });
var jsFilter = $.filter('**/*.js', { restore: true });
var cssFilter = $.filter('**/*.css', { restore: true });
var htmlFilter = $.filter('*.html', { restore: true, dot:true});
var jsFilter = $.filter('**/*.js', { restore: true, dot:true});
var cssFilter = $.filter('**/*.css', { restore: true, dot:true});
var assets;
return gulp.src(path.join(conf.paths.tmp, '/serve/*.html'))

View File

@@ -1,7 +1,8 @@
{
"name": "blur_admin",
"version": "1.3.0",
"version": "1.3.1",
"devDependencies": {
"bower": "~1.8.4",
"browser-sync": "~2.18.2",
"browser-sync-spa": "~1.0.3",
"chalk": "~1.1.1",
@@ -27,10 +28,10 @@
"gulp-replace": "~0.5.4",
"gulp-rev": "~7.1.2",
"gulp-rev-replace": "~0.4.2",
"gulp-sass": "~2.3.2",
"gulp-sass": "^4.0.1",
"gulp-shell": "^0.5.2",
"gulp-size": "~2.1.0",
"gulp-sourcemaps": "~1.9.1",
"gulp-sourcemaps": "~1.6.0",
"gulp-uglify": "~2.0.0",
"gulp-useref": "~1.3.0",
"gulp-util": "~3.0.6",

View File

@@ -38,7 +38,7 @@
ba-panel
ba-panel-title="Datepicker"
ba-panel-class="with-scroll">
<div ng-include="'app/pages/form/inputs/widgets/datepickers/datepickers.html'"></div>
<div ng-include="'app/pages/form/inputs/widgets/datePickers/datePickers.html'"></div>
</div>
</div>

View File

@@ -1,5 +1,5 @@
<div class="datepicker row">
<div class="col-sm-6" ng-controller="datepickerCtrl">
<div class="col-xlg-6 col-md-12 col-sm-6" ng-controller="datepickerCtrl">
<h4>Inline</h4>
<label>Selected date is: <em>{{dt | date:'fullDate' }}</em></label>
<div class="uib-datepicker-wrap">
@@ -7,7 +7,7 @@
</div>
</div>
<div class="col-sm-6" ng-controller="datepickerpopupCtrl">
<div class="col-xlg-6 col-md-12 col-sm-6" ng-controller="datepickerpopupCtrl">
<h4>Popup</h4>
<label>Selected date is: <em>{{dt | date:'fullDate' }}</em></label>
<p class="input-group">

View File

@@ -29,7 +29,7 @@
if (!opened) {
methods = $uibModal.open({
animation: true,
templateUrl: 'app/pages/ui/modals/progressmodal/progressModal.html',
templateUrl: 'app/pages/ui/modals/progressModal/progressModal.html',
size: 'sm',
keyboard: false,
backdrop: 'static'

View File

@@ -1,6 +1,13 @@
<!DOCTYPE html>
<html lang="en" ng-app="BlurAdmin">
<head>
<!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-KT9L237');</script>
<!-- End Google Tag Manager -->
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -25,6 +32,10 @@
<!-- endbuild -->
</head>
<body>
<!-- Google Tag Manager (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KT9L237"
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) -->
<div class="body-bg"></div>
<main ng-if="$pageFinishedLoading" ng-class="{ 'menu-collapsed': $baSidebarService.isMenuCollapsed() }">

View File

@@ -18,7 +18,6 @@
}
.uib-datepicker-wrap {
display:inline-block;
min-height:270px;
}