Commit Graph

791 Commits (30f991680289b36f5db200ac6057250c96400454)

Author SHA1 Message Date
Abdullah Almsaeed 8feef037b7 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-06-17 14:40:15 +03:00
Abdullah Almsaeed f19c8f619e Fix sidebar-mini with Safari issue #410 2015-06-17 14:39:11 +03:00
Abdullah Almsaeed 6b234f1186 Updated change log and removed rtl.html 2015-06-17 14:31:49 +03:00
Michael a16d1478eb Wrong color code provided for orange class. 2015-06-15 19:50:35 +02:00
Yasser Hassan 3058ba125c Trigger expand/collapse events for right sidebar
This commit will trigger the events `expanded.pushMenu` and `collapsed.pushMenu` on expanding and collapsing the right sidebar respectively as mentioned in #444.
2015-06-14 15:00:29 +02:00
Abdullah Almsaeed bf2f7223aa Merge pull request #497 from angelitomg/master
Duplicated iCheck call removed
2015-06-14 01:51:03 +03:00
Abdullah Almsaeed ad68d5e466 Added support for Select2 2015-06-13 02:36:04 +03:00
Abdullah Almsaeed 13f00afa61 Updated support email on bower.json 2015-06-11 11:39:24 +03:00
Abdullah Almsaeed b7c4e32abe Merge pull request #503 from kkirsche/patch-1
Remove moot `version` property from bower.json
2015-06-11 11:38:13 +03:00
Kevin Kirsche c2c97171dd Remove moot `version` property from bower.json
Per bower/bower.json-spec@a325da3
2015-06-10 19:05:17 -04:00
Abdullah Almsaeed 406de4e708 pull from master 2015-06-09 01:41:48 +03:00
Abdullah Almsaeed 586db744f7 Milestone 2.1.2 2015-06-09 01:41:18 +03:00
Angelito M. Goulart 14600d7016 Duplicated iCheck call removed 2015-06-08 11:43:45 -03:00
Abdullah Almsaeed e8553fd402 Merge pull request #491 from ivantcholakov/master
Datatables, examples, switching to the new 1.10 API.
2015-06-08 01:26:10 +03:00
Ivan Tcholakov 1e096c9eec Datatables, examples, switching to the new 1.10 API. 2015-06-07 05:10:41 +03:00
Abdullah Almsaeed 8ae58fe1f6 Merge pull request #483 from masteradhoc/masteradhoc-patch-typo
Patch - Typo waring -> warning
2015-06-02 17:05:14 +03:00
Abdullah Almsaeed a676363cf6 Merge pull request #481 from Green-Cat/patch-1
Fixes typo. Symphony -> Symfony
2015-06-02 16:50:24 +03:00
Brian 381d380797 Fixed typo (waring -> warning)
This fixes a typo in multiple files.
See #482

This shouldn affect the website, cause the typo got fixed in .css and
.html files.
2015-06-02 14:10:26 +02:00
Green Cat a5cb88e44f Same fix in the build folder 2015-06-01 18:03:14 +01:00
Green Cat 6f02bcd6c5 Fixes typo. Symphony -> Symfony 2015-06-01 17:59:32 +01:00
Abdullah Almsaeed 13ec90f533 Fix typo in core.less 2015-06-01 13:18:35 +03:00
Abdullah Almsaeed fd58f76090 Merge pull request #476 from masteradhoc/patch-1
Typo in AdminLTE.css
2015-06-01 13:16:41 +03:00
Abdullah Almsaeed b8b837ad4d Merge pull request #475 from masteradhoc/masteradhoc-patch-1
Added comment to viewport meta
2015-06-01 13:06:49 +03:00
Brian aa1e07b564 Update AdminLTE.css
Typo
2015-06-01 10:31:02 +02:00
Brian 75919217fd Update buttons.html
Commented metatag
2015-06-01 09:29:32 +02:00
Brian a9d1889cc8 Update general.html
Commented metatag
2015-06-01 09:29:29 +02:00
Brian a94a21dc52 Update icons.html
Commented metatag
2015-06-01 09:29:26 +02:00
Brian e37ea9d383 Update modals.html
Commented metatag
2015-06-01 09:29:24 +02:00
Brian 1ea7dea2ec Update sliders.html
Commented metatag
2015-06-01 09:29:20 +02:00
Brian 0cdbdca0cb Update timeline.html
Commented metatag
2015-06-01 09:29:17 +02:00
Brian 9023977238 Update inline.html
Commented metatag
2015-06-01 09:28:37 +02:00
Brian 35912a5a6d Update morris.html
Commented metatag
2015-06-01 09:28:31 +02:00
Brian 1bfa07d562 Update flot.html
Commented metatag
2015-06-01 09:28:17 +02:00
Brian c1298a0eab Update chartjs.html
Commented metatag
2015-06-01 09:28:04 +02:00
Brian b98e09f88a Update register.html
Commented metatag
2015-06-01 09:27:47 +02:00
Brian 2860bc0fdb Update login.html
Commented metatag
2015-06-01 09:27:38 +02:00
Brian e9ff619013 Update lockscreen.html
Commented metatag
2015-06-01 09:27:29 +02:00
Brian 4c8d3b929a Update invoice.html
Commented metatag
2015-06-01 09:27:18 +02:00
Brian 88d8a6fd9b Update invoice-print.html
Commented metatag
2015-06-01 09:27:07 +02:00
Brian 615c1707be Update blank.html
Commented metatag
2015-06-01 09:26:57 +02:00
Brian d87ac0306b Update 500.html
Commented metatag
2015-06-01 09:26:44 +02:00
Brian f501a96712 Update 404.html
Commented metatag
2015-06-01 09:26:33 +02:00
Brian f520388da9 Update advanced.html
Commented metatag
2015-06-01 09:26:04 +02:00
Brian 05ace29173 Update editors.html
Commented metatag
2015-06-01 09:26:01 +02:00
Brian cb091b7094 Update general.html
Commented metatag
2015-06-01 09:25:55 +02:00
Brian 32c6fc147d Update top-nav.html
Commented metatag
2015-06-01 09:25:23 +02:00
Brian 0561cecd77 Update rtl.html
Commented metatag
2015-06-01 09:25:15 +02:00
Brian 73c403b796 Update fixed.html
Commented metatag
2015-06-01 09:25:08 +02:00
Brian 1cc2f8be47 Update collapsed-sidebar.html
Commented metatag
2015-06-01 09:25:02 +02:00
Brian 110da40511 Update boxed.html
Commented metatag
2015-06-01 09:24:55 +02:00