Skip to content

Commit

Permalink
Merge branch 'release/0.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
tayfunoziserikan committed Jun 6, 2014
2 parents d958f80 + e8c7f44 commit 1d6d997
Show file tree
Hide file tree
Showing 20 changed files with 250 additions and 570 deletions.
38 changes: 17 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
*.gem
*.rbc
.bundle
.config
coverage
InstalledFiles
lib/bundler/man
pkg
rdoc
spec/reports
test/tmp
test/version_tmp
tmp
# See http://help.github.com/ignore-files/ for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile ~/.gitignore_global

# IDE
.idea
# Ignore bundler config
/.bundle

# YARD artifacts
.yardoc
_yardoc
doc/
*.psd
# Ignore the build directory
/build

build/
# Ignore caches
/.sass-cache
.cache/

# Ignore .DS_store file
.DS_Store

.idea/
Empty file added .nojekyll
Empty file.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@

#### [Current]
* [03ca365](../../commit/03ca365) - __(Tayfun Ozis ERIKAN)__ #TB-40 Middleman updates and improvements - Middleman gems were updated - HAML layout structures were updated - Bootstrap-sass was updated - Middleman-deploy plugin was enabled and rakefile was removed - .gitignore file was updated
* [066dc2e](../../commit/066dc2e) - __(Muhammet Dilek)__ Merge pull request [#48](../../issues/48) from ds82/fix/middleman-sprockets

lock version of middleman-sprockets to 3.3.2 due to a bug
* [62e8249](../../commit/62e8249) - __(Dennis Saenger)__ lock version of middleman-sprockets to 3.3.2 due to a bug

see: https://github.com/middleman/middleman/issues/1265

* [7746060](../../commit/7746060) - __(Onur Ozgur OZKAN)__ Give more information about run and build middleman
* [d23d1f3](../../commit/d23d1f3) - __(Ahmet Sezgin Duran)__ LAB-31 #time 1m Add named logo
* [fabb176](../../commit/fabb176) - __(Ahmet Sezgin Duran)__ LAB-31 #time 2m Update README.md and license
* [5ba05d3](../../commit/5ba05d3) - __(Onur Ozgur OZKAN)__ Add rails hierapolis gem.
* [4a80ca9](../../commit/4a80ca9) - __(Muhammet DILEK)__ github pages settings
* [bb47ca7](../../commit/bb47ca7) - __(Tayfun zi ERKAN)__ [#45](../../issues/45) was done
* [a2ae457](../../commit/a2ae457) - __(Tayfun Ozis ERIKAN)__ [#42](../../issues/42) Bootstrap was updated.
* [a61f895](../../commit/a61f895) - __(Tayfun Ozis ERIKAN)__ [#41](../../issues/41) Middleman, bootstrap-sass were updated.
* [5fef629](../../commit/5fef629) - __(Tayfun Ozis ERIKAN)__ [#41](../../issues/41) Screenshots was added.

#### 0.4.0
* [1791946](../../commit/1791946) - __(Tayfun Ozis ERIKAN)__ bump version 0.4.0
* [ae6428e](../../commit/ae6428e) - __(Tayfun Ozis ERIKAN)__ 31 Add more content view helpers - Navbar variables were fixed - Panel tools was fixed - Dropdown launcher menu position was fixed
* [371d9d1](../../commit/371d9d1) - __(Tayfun Ozis ERIKAN)__ 31 Add more content view helpers - Panel dimensions and colors was fixed - Font files was removed
* [b6f0f0f](../../commit/b6f0f0f) - __(Tayfun Ozis ERIKAN)__ 31 Add more content view helpers - Toolbar yield content was added - Font-family was added to global variables
Expand Down
27 changes: 24 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
source 'https://rubygems.org'
# If you have OpenSSL installed, we recommend updating
# the following line to use "https"
source 'http://rubygems.org'

gem 'middleman', '~> 3.1.4'
gem 'middleman', '~>3.3.3'

# Live-reloading plugin
gem 'middleman-livereload', '~> 3.1.0'
gem 'bootstrap-sass', :git => 'git://github.com/thomas-mcdonald/bootstrap-sass.git', :branch => '3'

# Middleman-sprockets
gem 'middleman-sprockets', '3.3.2'

# Middleman-deploy
gem 'middleman-deploy', '~> 0.2.4'

# For faster file watcher updates on Windows:
gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw]

# Windows does not come with time zone data
gem 'tzinfo-data', platforms: [:mswin, :mingw]

# Compass
gem 'compass', '~> 0.12.6'

# Twitter Bootstrap
gem 'bootstrap-sass', '~> 3.1.1.1'
153 changes: 90 additions & 63 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,108 +1,135 @@
GIT
remote: git://github.com/thomas-mcdonald/bootstrap-sass.git
revision: 0e88056ac5d58fb0bbd23d3fe929eac01712d964
branch: 3
specs:
bootstrap-sass (3.0.0.0)
sass (~> 3.2)

GEM
remote: https://rubygems.org/
remote: http://rubygems.org/
specs:
activesupport (3.2.14)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
chunky_png (1.2.8)
activesupport (4.1.1)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
bootstrap-sass (3.1.1.1)
sass (~> 3.2)
chunky_png (1.3.1)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.3)
compass (0.12.2)
coffee-script-source (1.7.0)
compass (0.12.6)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
em-websocket (0.5.0)
sass (~> 3.2.19)
compass-import-once (1.0.4)
sass (>= 3.2, < 3.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.5.3)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
ffi (1.9.0)
execjs (2.1.0)
ffi (1.9.3)
fssm (0.2.10)
haml (4.0.3)
haml (4.0.5)
tilt
hike (1.2.3)
http_parser.rb (0.5.3)
i18n (0.6.4)
kramdown (1.1.0)
listen (1.2.2)
hooks (0.4.0)
uber (~> 0.0.4)
http_parser.rb (0.6.0)
i18n (0.6.9)
json (1.8.1)
kramdown (1.3.3)
listen (1.3.1)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
middleman (3.1.4)
middleman (3.3.3)
coffee-script (~> 2.2.0)
compass (>= 0.12.2)
execjs (~> 1.4.0)
haml (>= 3.1.6)
kramdown (~> 1.1.0)
middleman-core (= 3.1.4)
middleman-more (= 3.1.4)
compass (>= 0.12.4)
compass-import-once (= 1.0.4)
execjs (~> 2.0)
haml (>= 4.0.5)
kramdown (~> 1.2)
middleman-core (= 3.3.3)
middleman-sprockets (>= 3.1.2)
sass (>= 3.1.20)
uglifier (~> 2.1.0)
middleman-core (3.1.4)
activesupport (~> 3.2.6)
sass (>= 3.2.17, < 4.0)
uglifier (~> 2.5)
middleman-core (3.3.3)
activesupport (~> 4.1.0)
bundler (~> 1.1)
i18n (~> 0.6.1)
listen (~> 1.2.2)
rack (>= 1.4.5)
rack-test (~> 0.6.1)
erubis
hooks (~> 0.3)
i18n (~> 0.6.9)
listen (~> 1.1)
padrino-helpers (~> 0.12.1)
rack (>= 1.4.5, < 2.0)
rack-test (~> 0.6.2)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.3.6)
middleman-livereload (3.1.0)
tilt (~> 1.4.1, < 2.0)
middleman-deploy (0.2.4)
middleman-core (>= 3.0.0)
net-sftp
ptools
middleman-livereload (3.1.1)
em-websocket (>= 0.2.0)
middleman-core (>= 3.0.2)
multi_json (~> 1.0)
rack-livereload
middleman-more (3.1.4)
middleman-sprockets (3.1.4)
middleman-core (>= 3.0.14)
middleman-more (>= 3.0.14)
sprockets (~> 2.1)
sprockets-helpers (~> 1.0.0)
middleman-sprockets (3.3.2)
middleman-core (>= 3.2)
sprockets (~> 2.2)
sprockets-helpers (~> 1.1.0)
sprockets-sass (~> 1.0.0)
multi_json (1.7.8)
minitest (5.3.4)
multi_json (1.10.1)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
padrino-helpers (0.12.2)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.2)
tilt (~> 1.4.1)
padrino-support (0.12.2)
activesupport (>= 3.1)
ptools (1.2.4)
rack (1.5.2)
rack-livereload (0.3.15)
rack
rack-test (0.6.2)
rack (>= 1.0)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.4)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
rb-kqueue (0.2.3)
ffi (>= 0.5.0)
sass (3.2.9)
sprockets (2.10.0)
sass (3.2.19)
sprockets (2.12.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.0.1)
sprockets-helpers (1.1.0)
sprockets (~> 2.0)
sprockets-sass (1.0.1)
sprockets-sass (1.0.3)
sprockets (~> 2.0)
tilt (~> 1.1)
thor (0.18.1)
tilt (1.3.7)
uglifier (2.1.2)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
tzinfo (1.2.1)
thread_safe (~> 0.1)
uber (0.0.6)
uglifier (2.5.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
json (>= 1.8.0)

PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass!
middleman (~> 3.1.4)
bootstrap-sass (~> 3.1.1.1)
compass (~> 0.12.6)
middleman (~> 3.3.3)
middleman-deploy (~> 0.2.4)
middleman-livereload (~> 3.1.0)
middleman-sprockets (= 3.3.2)
tzinfo-data
wdm (~> 0.1.0)
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2013 lab2023 - internet technologies
Copyright (c) 2014 lab2023 - information technologies

MIT License

Expand Down
37 changes: 34 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,42 @@ This is yet an other private admin template which base on Twitter Bootstrap 3 wi

NOTE: Don't use this theme until v1.0.0

## Screenshots

### Login screen
![hierapolis_login](https://f.cloud.github.com/assets/310691/1653859/8cc7597e-5b3e-11e3-9efa-40ce52c63f3f.png)
### Forgot password
![hierapolis_forgot_password](https://f.cloud.github.com/assets/310691/1653860/95295568-5b3e-11e3-827d-998a3ad93b8b.png)
### Dashboard
![hierapolis_dashboard](https://f.cloud.github.com/assets/310691/1653862/99fe359a-5b3e-11e3-99b0-2aefce46f99a.png)
### Tables
![hierapolis_tables](https://f.cloud.github.com/assets/310691/1653863/a58d5a8a-5b3e-11e3-9650-68617b2c7631.png)
### Forms
![hierapolis_forms](https://f.cloud.github.com/assets/310691/1653864/ac4d1720-5b3e-11e3-9465-18984b9f151b.png)

## Requirements

TODO

## Usage

TODO
For see in action

1. `git clone [email protected]:lab2023/hierapolis.git`
2. `bundle install`
3. `middleman`
4. Open `0.0.0.0:4567`

Get html, css, js output

1. `middleman build`
2. `cd build`

You can see outputs in build folder.

**NOTE**

* There is also [Rails Hierapolis Gem](https://github.com/kebab-project/hierapolis-rails) for Rails developer.

## What Hierapolis included?

Expand All @@ -36,12 +65,14 @@ Once you've made your great commits:

## Credits

Hierapolis is maintained and funded by [lab2023 - internet technologies](http://lab2023.com/)
![lab2023](http://lab2023.com/assets/images/named-logo.png)

Hierapolis is maintained and funded by [lab2023 - information technologies](http://lab2023.com/)

Thank you to all the [contributors!](https://github.com/kebab-project/hierapolis/graphs/contributors)

The names and logos for lab2023 are trademarks of lab2023, inc.

## License

Copyright 2013 lab2023 – internet technologies
Copyright 2014 lab2023 – information technologies
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.0
0.5.0
Loading

0 comments on commit 1d6d997

Please sign in to comment.