Commit graph

1052 commits

Author SHA1 Message Date
Abdullah Almsaeed 278785ad49 Add semicolons to support webpack 2017-10-26 16:53:11 -04:00
Abdullah Almsaeed d4ed1e435a Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2017-10-26 16:50:17 -04:00
Abdullah Almsaeed 55d120a0b1 save 2017-10-26 16:50:13 -04:00
ADmad 53393404f1 Don't hardcode slimscroll options. (#1605) 2017-10-26 16:48:52 -04:00
msalasch c3fb2e2bcd corrected error in the chart path in the charts pages (#1581) 2017-10-26 16:39:28 -04:00
Howard Gehring f0421f5b36 Composer installer support (#1619)
* Update composer.json

Adding support for composer custom install path

* Update composer.json
2017-10-26 16:31:13 -04:00
bmanifold a667b95b8d Fix box inside box collapsing error (#1681) (#1685)
* Previously, with a .box inside a .box, any clicking on a
  collapse/expand button in either .box would cause both of them to
  collapse/expand.  This commit makes sure parent and child boxes
  do not interfere with each other.
2017-10-26 16:30:08 -04:00
Joël Gaujard b98b5914e7 Change JS comment for better parsing (#1693) 2017-10-26 16:27:57 -04:00
Abdullah Almsaeed d7f2e977f5 Fix issue #1692 2017-10-15 15:46:02 -04:00
Abdullah Almsaeed d53319e56f Upgrade yarn.lock 2017-10-09 12:36:16 -04:00
Abdullah Almsaeed 156f56c3c1 Fix background color 2017-10-09 12:32:18 -04:00
Abdullah Almsaeed cc4654239b Fix issue #1664 and update bower plugins 2017-10-08 18:36:36 -04:00
Abdullah Almsaeed f14e4aaccb Fix issue #1665 2017-10-08 18:25:37 -04:00
Abdullah Almsaeed 6157c7bc77 Fix issue #1567 2017-07-08 13:45:57 -04:00
Abdullah Almsaeed 4cae976a39 Fix issue #1512 2017-07-08 13:31:59 -04:00
Abdullah Almsaeed 1ee1030db2 We do not need the iCheck option anymore 2017-07-02 11:38:16 -04:00
Abdullah Almsaeed f8c4a40c8b Update documentation links 2017-07-01 17:03:49 -04:00
Abdullah Almsaeed 857b15a275 Update plugins 2017-07-01 16:49:59 -04:00
linxuhua 9ccb1f6b68 managed jquery-ui by bower (#1558) 2017-07-01 16:33:53 -04:00
Abdullah Almsaeed e47823e6f1 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2017-07-01 16:17:06 -04:00
Abdullah Almsaeed 06bb8c2be1 Add bower_components for direct downloads but ignore them when installing using npm or bower 2017-07-01 16:16:47 -04:00
Abdullah Almsaeed 76ce5a9c1f Fix box widget icons and chart js version in bower issue 2017-07-01 16:15:59 -04:00
Chadwick Johnson a780269957 grammatical fix (#1553) 2017-06-27 16:11:06 -04:00
Abdullah Almsaeed 7cfbe94b7e Update npmignore 2017-06-25 14:56:15 -04:00
Abdullah Almsaeed 187dcfae4d add npmignore 2017-06-25 14:53:15 -04:00
Abdullah Almsaeed f4ee8fba68 Use dependecy manager when applicable issue #1532 2017-06-25 14:46:09 -04:00
Abdullah Almsaeed fbbc450c41 Fix issue #1547 2017-06-25 09:33:22 -04:00
Abdullah Almsaeed 4b0d73bab9 Fix issue #1536 2017-06-25 09:13:29 -04:00
Abdullah Almsaeed 41d3db21ed Fix issue #1549 2017-06-24 11:02:54 -04:00
Alexander Wunschik 9431039bf5 replaced boxed-bg images with static color 2017-06-06 10:51:25 +02:00
Abdullah Almsaeed 6f77ce584e Fix #1490 disabled nav tab 2017-05-18 17:52:37 -04:00
Abdullah Almsaeed 87209a984a Update docs links 2017-05-18 17:36:54 -04:00
Abdullah Almsaeed 406cda26d9 Update links 2017-05-18 17:36:20 -04:00
Abdullah Almsaeed c6b45cdfa0 Resolve conflict 2017-05-18 08:22:52 -04:00
Abdullah Almsaeed a60df9f050 Merge branch 'v2.4.0-dev' 2017-05-18 08:12:45 -04:00
Abdullah Almsaeed 4169db0857 Resolve conflicts 2017-05-18 08:11:54 -04:00
Abdullah Almsaeed 342a0ac17f Update dependencies 2017-05-17 19:23:47 -04:00
Abdullah Almsaeed ec245fd46e Update README 2017-05-17 19:23:05 -04:00
Abdullah Almsaeed ccb00ccdad Update modal page to add buttons and animation 2017-05-17 19:21:12 -04:00
Abdullah Almsaeed 7089f63213 Update README.md 2017-05-16 18:46:37 -04:00
Michaël Arnauts bf174bfcb0 Fix typo in collapsed-sidebar.html (#1422) 2017-04-30 08:44:44 -04:00
Gavin Gilmour 1f797fd5f7 Fix README headers (#1425)
As title.
2017-04-16 08:55:27 -04:00
Gabor Mojzes b12cc7d9e4 Updated changelog with already released versions (#1438)
* Fix style

* Updated changelog with already released versions
2017-04-16 08:53:16 -04:00
Gabor Mojzes 26a56938ce Fix Bootstrap version number (#1447) 2017-04-16 08:51:12 -04:00
Abdullah Almsaeed 4c25d55149 Refromat code 2017-04-04 18:54:18 -04:00
Gil Ferreira eb782d743b Added CoPilot to example implementations. (#1359)
* Added CoPilot to example implementations. This is a version of AdminLTE that makes it easy to use Vue.js

* Added copilot into implementation page so it isn't overridden by grunt
2017-03-23 22:12:33 -04:00
Abdullah Almsaeed b7da81b3d3 Merge pull request #1355 from utsman/fix-comment
Fix Comment
2017-03-23 19:18:25 -04:00
Abdullah Almsaeed 6f754362f5 Merge pull request #1398 from MrMitch/MrMitch-patch-name
fix name attribute in bower.json, fix #1397
2017-03-23 19:12:24 -04:00
Abdullah Almsaeed d1dd9b8013 Merge pull request #1417 from wandersonwhcr/fix-screenshot-markdown
Fix Screenshot Mardown
2017-03-23 19:10:17 -04:00
Wanderson 936302b847 Fix screenshot mardown 2017-03-20 18:03:01 -03:00