github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity
1,668 Commits
13 Branches
80 Tags
169 MiB
Commit Graph

1668 Commits (ba3bf5380907625a462931ee48bdcf8eda5b8449)

Author SHA1 Message Date
Michael ead60ced86 Fix typo in forms/general.php 2015-07-05 14:32:19 +02:00
Brian 24722d195e Update ChartJS to 1.0.2 
Update ChartJS to 1.0.2
 2015-07-02 09:25:41 +02:00
Brian 229ac9a996 Update ChartJS to 1.0.2 
Update ChartJS to 1.0.2
 2015-07-02 09:25:20 +02:00
Abdullah Almsaeed 1e21624ddd Merge pull request #543 from danielsum/patch-1 
Update Bootstrap-social.less
 2015-07-02 00:35:05 -04:00
Abdullah Almsaeed d74cec4227 Merge pull request #540 from fschaeffer/patch-3 
enable font awesome in form controls
 2015-07-02 00:32:56 -04:00
Abdullah Almsaeed 175d349e64 Merge pull request #533 from Dennis14e/master 
More Formatting Pages
 2015-07-02 00:30:05 -04:00
Daniel Sum 4e9daad75e Update Bootstrap Less 
Hi Abdullah, 

I've seen that bootstrap-social.less is not up to date as Pinterest for instance was not in the list... May I suggest to use the import from bower package to keep up to date this little stylesheet or use a little script to update this vendor package : 

````bash
#!/usr/bin/env bash

curl -o build/less/bootstrap-social.less https://raw.githubusercontent.com/lipis/bootstrap-social/gh-pages/bootstrap-social.less
````

PS: I've just discovered your package and make a little donation, great work !
 2015-06-27 17:23:31 +02:00
Florian Schaeffer 17fbe16151 enable font awesome in form controls 
the form controls are preconfigured to use glyhicons but lack the support for FA icons
 2015-06-25 07:17:51 +02:00
Abdullah Almsaeed e5771daaf5 Added posibility to add image to info-box instead of icon #522 2015-06-23 16:18:07 +03:00
Dennis Neufeld 7ddea34311 Formatting Pages 2/2 2015-06-22 19:54:28 +02:00
Dennis Neufeld 6220d2c4fd Formatting Pages 1/2 2015-06-22 19:29:03 +02:00
Abdullah Almsaeed c7c3381856 Updated local clone 2015-06-22 17:11:18 +03:00
Abdullah Almsaeed 4b1e5f1e42 Merge pull request #524 from fschaeffer/patch-1 
Allow collapsible form in box
 2015-06-22 16:47:03 +03:00
Abdullah Almsaeed eb8012df48 Fixed issue #531 2015-06-22 16:39:50 +03:00
Abdullah Almsaeed 1411dda538 Merge pull request #527 from Dennis14e/master 
Formatting Pages
 2015-06-21 03:40:46 +03:00
Dennis Neufeld 7a2181964d Format pages - UI 2015-06-20 14:40:29 +02:00
Dennis Neufeld 6c795e84e9 Format pages - tables 2015-06-20 13:39:59 +02:00
Dennis Neufeld 23adb8661c Format pages - mailbox 2015-06-20 13:32:34 +02:00
Dennis Neufeld 57d18a266a Format pages - layout 2015-06-20 13:21:20 +02:00
Dennis Neufeld 65d99c7b6c Format pages - forms 2015-06-20 13:11:32 +02:00
Dennis Neufeld 4ce12b818c Format pages - examples 2015-06-20 12:59:38 +02:00
Dennis Neufeld 14cb228dcb Format pages - charts 2015-06-20 12:39:14 +02:00
Dennis Neufeld 68e1d9d7d5 Format pages 2015-06-20 12:38:52 +02:00
Dennis Neufeld 2c0e0af494 Format index pages 2015-06-20 12:22:30 +02:00
Abdullah Almsaeed ab07ef8c92 Merge pull request #510 from 01-Scripts/patch-1 
Wrong color code provided for orange class.
 2015-06-19 15:44:27 +03:00
Abdullah Almsaeed 3c031bccde Merge pull request #509 from YasserHassan/patch-1 
Trigger expand/collapse events for right sidebar
 2015-06-19 15:44:08 +03:00
Florian Schaeffer 3e48dba688 Allow collapsible form in box 
See issue #523
 2015-06-19 12:29:00 +02:00
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