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

377 Commits (229600ba4c7233e4ed2844ff567deada745b1ecc)

Author SHA1 Message Date
Abdullah Almsaeed 4cd707a49e Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2015-09-29 07:34:35 -04:00
Abdullah Almsaeed 8a7a7ae527 Add new map and implementation reference 2015-09-26 16:22:57 -04:00
Yasser Lotfy 9c0d5d8c03 - Update to Pace v1.0.2 so there is no errors appears on Safari browsers. 
- Modified one of the original styles to be matched with AdminLTE and Works good on both Desktop and Mobile versions.
- Minified .js and .css files
- Created new pace page for Pace preview
- Added Pace page to navigation to the whole theme files
 2015-09-22 12:42:36 +03:00
Abdullah Almsaeed 0748343f22 Update version 2015-09-19 14:28:07 -04:00
Abdullah Almsaeed ee1782c007 Reformat code 2015-09-19 14:05:54 -04:00
Abdullah Almsaeed 2f72188c28 Merge master 2015-09-07 13:29:42 -04:00
Abdullah Almsaeed 9e93fa988e Correct sidebar link 2015-09-07 13:29:07 -04:00
Abdullah Almsaeed 080e4da6e8 Add instructions link to modals 2015-09-06 17:20:42 -04:00
Dennis Neufeld 91f47a8b7a Formatting 2015-08-28 15:55:13 +02:00
Abdullah Almsaeed 685ba27900 Fix input group size 2015-08-24 18:08:24 -04:00
Abdullah Almsaeed 996444f55b Fix bootlint W008 2015-08-24 18:05:38 -04:00
Abdullah Almsaeed b747fdf973 Fix bootlint E009 2015-08-24 18:00:33 -04:00
Abdullah Almsaeed 396b319c7e Fix bootlint E014 2015-08-24 17:52:49 -04:00
Abdullah Almsaeed 283355e533 Remove unwated JS script 2015-08-24 17:36:51 -04:00
Abdullah Almsaeed 86387efc8f Merge pull request #656 from freezy-sk/652-fix-E029 
Fixed Bootlint error E029
 2015-08-24 17:32:06 -04:00
Abdullah Almsaeed 18691817cf Merge pull request #655 from freezy-sk/652-fix-E033 
Fixed Bootlint error E033
 2015-08-24 17:29:04 -04:00
freezy ec43144a62 Fixed Bootlint error E029 2015-08-24 23:15:13 +02:00
freezy be2ca6a21e Fixed Bootlint error E033 2015-08-24 23:10:49 +02:00
freezy 8c7fc61559 Fixed Bootlint warning W007 2015-08-24 22:54:49 +02:00
Dennis Neufeld 3c05a7858f Fix Photo URL 2015-08-17 07:42:55 +02:00
Dennis Neufeld 81e784af15 Formatting and stuff 2015-08-17 07:39:25 +02:00
Abdullah Almsaeed dde604023b Fix issue #430 2015-08-16 16:31:59 -04:00
Abdullah Almsaeed 31af666ccc Merge pull request #635 from Dennis14e/patch_head 
head-changes
 2015-08-16 16:11:54 -04:00
Abdullah Almsaeed 393bb3ca1f Merge pull request #632 from Dennis14e/patch_glyphicons 
Updated Glyphicons page
 2015-08-16 16:10:21 -04:00
Abdullah Almsaeed 746ecd5cd3 Format 2015-08-16 16:09:31 -04:00
Abdullah Almsaeed 36f31d1448 Fixed typo attachemnt to attachment 2015-08-16 16:06:20 -04:00
Abdullah Almsaeed 738252af74 Merge feature/profile 2015-08-16 15:58:11 -04:00
Abdullah Almsaeed 1555830bc6 Add activity tab to profile 2015-08-16 15:51:13 -04:00
Abdullah Almsaeed ac99249af7 Add new profile page link to sidebar 2015-08-16 13:21:18 -04:00
Abdullah Almsaeed 2f390152bc Created and updated the profile page 2015-08-15 21:47:49 -04:00
Dennis Neufeld 71657fc0bc Some asset changes 2015-08-13 18:03:46 +02:00
Dennis Neufeld c38df88d5a Updated page titles 2015-08-13 17:55:46 +02:00
Dennis Neufeld a1c8225c2e Add meta X-UA-Compatible 2015-08-13 17:50:04 +02:00
Dennis Neufeld 1ba31abdc6 Lowercase charset ("UTF-8" to "utf-8") 2015-08-13 17:41:23 +02:00
Dennis Neufeld 418f73e2a8 Updated Glyphicons page 2015-08-13 08:27:09 +02:00
Abdullah Almsaeed e13db59eb3 Updated version 2015-08-12 18:53:37 -04:00
Abdullah Almsaeed 7df333d8b6 Merge social widgets feature 2015-08-12 18:39:36 -04:00
Abdullah Almsaeed e7653c8655 Add box-comment feature 2015-08-12 18:35:20 -04:00
Abdullah Almsaeed af4deafa7c Add social widgets 2015-08-12 15:30:28 -04:00
Abdullah Almsaeed a0a4a3207a Merge pull request #627 from Dennis14e/patch_version 
Update files to v2.2.1
 2015-08-12 14:55:42 -04:00
Dennis Neufeld 4e6e19a9f7 Updated Bootstrap version comment to v3.3.5 2015-08-12 07:50:02 +02:00
Dennis Neufeld 648d682618 Update files to v2.2.1 2015-08-12 07:40:05 +02:00
Dennis Neufeld 7860607b5b Update html5shiv v3.7.3 2015-08-10 20:07:11 +02:00
Dennis Neufeld 87534fa1f0 Updated Font Awesome v4.4.0 2015-08-08 11:58:28 +02:00
Dennis Neufeld 0fce8ad2db HTML5 Pages - UI 2015-08-04 20:08:42 +02:00
Dennis Neufeld ade5e66851 HTML5 Pages - Tables 2015-08-04 19:43:19 +02:00
Dennis Neufeld 5cb4f2840b HTML5 Pages - Mailbox 2015-08-04 19:39:07 +02:00
Dennis Neufeld ccebf2492a HTML5 Pages - Layout 2015-08-04 19:30:38 +02:00
Dennis Neufeld 560b79e884 HTML5 Pages - Forms 2015-08-04 19:25:06 +02:00
Dennis Neufeld d311cc0ab2 HTML5 Pages - Examples 2015-08-04 19:16:41 +02:00
Dennis Neufeld 502b6e6b2d HTML5 Pages - Charts 2015-08-04 18:59:18 +02:00
Dennis Neufeld 63230ebf57 HTML5 Pages 2015-08-04 18:48:08 +02:00
Dennis Neufeld 9837243bc9 Formatting files (newline, trailing spaces, ...) 2015-08-04 18:21:03 +02:00
Abdullah Almsaeed 7760b0d516 Bootstrap social plugin changed google-plus button to google 2015-07-20 23:03:49 -04:00
Abdullah Almsaeed a8406b4102 Removed unnecessary \!important 2015-07-20 22:36:04 -04:00
Abdullah Almsaeed 7c93106626 Updated select2 implementation to be responsive 2015-07-20 18:17:52 -04:00
Abdullah Almsaeed 2ceb6e19b8 Updates 2015-07-20 18:08:01 -04:00
Abdullah Almsaeed d75e3e18c9 ChartJS requires css height in newer version 2015-07-20 18:07:07 -04:00
Dennis Neufeld 9fae8c8a00 Fix typo in pages/layout/top-nav.html 2015-07-12 15:36:36 +02:00
Abdullah Almsaeed a6c2500da3 Updated version in footer 2015-07-08 17:18:12 -04:00
Michael ead60ced86 Fix typo in forms/general.php 2015-07-05 14:32:19 +02:00
Abdullah Almsaeed 175d349e64 Merge pull request #533 from Dennis14e/master 
More Formatting Pages
 2015-07-02 00:30:05 -04: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 eb8012df48 Fixed issue #531 2015-06-22 16:39:50 +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
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 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 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
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
Angelito M. Goulart 14600d7016 Duplicated iCheck call removed 2015-06-08 11:43:45 -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
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
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
Brian 3fee45b583 Update compose.html 
Commented metatag
 2015-06-01 09:24:32 +02:00
Brian 8c4cfbf887 Update mailbox.html 
Commented metatag
 2015-06-01 09:24:22 +02:00
Brian 8dc6a9d021 Update read-mail.html 
Commented metatag
 2015-06-01 09:24:08 +02:00
Brian 7ee63f97bd Update data.html 
Commented metatag
 2015-06-01 09:23:46 +02:00
Brian 1a62467472 Update simple.html 
Commented the metatag
 2015-06-01 09:23:39 +02:00
Brian 00de9b4e8d Update widgets.html 
Commented the metatag
 2015-06-01 09:23:18 +02:00
Brian 1428e23c28 Update calendar.html 
Commented the meta tag.
 2015-06-01 09:23:08 +02:00
Brian 6015ecef25 Update buttons.html 
Commented the meta tag.
 2015-06-01 09:22:10 +02:00
Abdullah Almsaeed 1bccec3bca Merge pull request #459 from suvjunmd/momentjs 
Fixed Moment.js deprecation warning
 2015-05-27 14:07:23 +03:00
Dmitri Suvorov f6c3fb88d1 Fixed Moment.js deprecation warning 2015-05-24 17:40:05 +03:00
Dmitri Suvorov d0ac3e7922 Updated jQuery UI to 1.11.4 2015-05-24 16:40:57 +03:00
Abdullah Almsaeed aa6552502d Added animation speed option to app.js 2015-05-23 13:09:35 +03:00
Abdullah Almsaeed 81fabc38c8 Merge pull request #411 from suvjunmd/breadcrumbs 
Fixed text inside breadcrumbs
 2015-05-17 02:16:43 +03:00
Abdullah Almsaeed 493ce24f47 Fixed issue #422 2015-05-17 01:46:29 +03:00
Dmitri Suvorov b219c57f9e Fixed text inside breadcrumbs 2015-05-09 18:40:19 +03:00
Abdullah Almsaeed e55c2b85aa Fix issue #405 2015-05-09 00:02:45 -04:00
Dmitri Suvorov 02c04ca12d Updated jQuery to 2.1.4 2015-05-07 21:56:39 +03:00
Abdullah Almsaeed 2af6d6ee45 Added border to box 2015-05-04 23:10:29 -04:00
Abdullah Almsaeed f2c3bd47aa Fixed custom tabs issue #378 2015-05-04 22:56:42 -04:00
Abdullah Almsaeed c8ef738577 Merge pull request #391 from suvjunmd/breadcrumb 
Fixed text inside breadcrumbs
 2015-05-04 21:19:29 -04:00
Dmitri Suvorov a89298e29c Fixed text inside breadcrumbs 2015-05-01 23:07:29 +03:00
Dmitri Suvorov bb7d6e72d5 Updated links to the latest versions of HTML5 Shiv and Respond.js 2015-05-01 21:44:04 +03:00
Dmitri Suvorov 064de16cdd Changed input type from text to email 2015-05-01 17:41:15 +03:00
Abdullah Almsaeed 01c0071459 Updates 2015-04-30 20:17:35 -04:00
Dmitri Suvorov 38dbc01055 Updated Icons page to Font Awesome 4.3 2015-04-25 22:07:35 +03:00
Abdullah Almsaeed e419815b34 Updated Bootstrap version in comments 2015-04-22 22:21:14 -04:00
Abdullah Almsaeed 1277b22ebe Updated dataTables plugin and added extensions 2015-04-22 22:03:13 -04:00
Abdullah Almsaeed 75d1407041 Implemented suggestion in issue #341 2015-04-20 21:50:36 -04:00
Abdullah Almsaeed f23da45064 Updated mailbox iCheck plugin 2015-04-19 11:21:04 -04:00
Abdullah Almsaeed 0f46cb356b Added demo to blank page 2015-04-19 11:16:32 -04:00
Abdullah Almsaeed bd926b06ac Add collapse option for labels and folders in mailbox 2015-04-19 11:15:42 -04:00
Abdullah Almsaeed 811d1f3dbe Fix for sidebar mini and fixed layout 2015-04-19 08:21:03 -04:00
Abdullah Almsaeed 6eb0cefc4f changed control sidebar icon 2015-04-15 19:05:23 -04:00
Abdullah Almsaeed 9a4adb7546 Updated daterangepicker plugin 2015-04-15 18:26:56 -04:00
Abdullah Almsaeed 436856b1c3 Removed unused mixins 2015-04-14 19:14:34 -04:00
Abdullah Almsaeed a1f496be11 Added default dark skin to control sidebar 2015-04-13 21:43:45 -04:00
Abdullah Almsaeed 5a97938d81 Update demo 2015-04-03 23:19:41 -04:00
Abdullah Almsaeed 85b64ef0e7 Updated top layout 2015-04-03 22:55:30 -04:00
Abdullah Almsaeed 467d442c22 Added new chartjs preview page 2015-04-03 21:33:33 -04:00
Abdullah Almsaeed b71df6e81c Added control sidebar to all pages 2015-04-03 21:19:55 -04:00
Abdullah Almsaeed 09463c8db2 updated text colors for labels menu in sidebar 2015-04-03 11:59:05 -04:00
Abdullah Almsaeed 4dacac85ec Updated broken links 2015-03-28 17:33:02 -04:00
Abdullah Almsaeed 7cc7d81ad9 Created light sidebar and added new skin mixins 2015-03-28 11:14:54 -04:00
Abdullah Almsaeed 2f7f43109d Updatd collapsed sidebar support 2015-03-27 19:30:02 -04:00
Abdullah Almsaeed 919fba82f6 Added logo support for sidebar-mini 2015-03-25 19:05:57 -04:00
Abdullah Almsaeed d0664b2695 Added https to CDN link 2015-03-25 18:59:50 -04:00
Abdullah Almsaeed 993aff4e31 Prettified the charts and added chartjs 2015-03-23 10:13:35 -04:00
Abdullah Almsaeed 1ad2394ff4 Added sidebar mini support to pages 2015-03-23 00:29:33 -04:00
Abdullah Almsaeed e9b5020cc1 removed deprecated mailbox 2015-03-23 00:25:49 -04:00
Abdullah Almsaeed df02e559cb Updated ion icons http to https 2015-03-22 22:49:04 -04:00
Abdullah Almsaeed 4abde39635 Added span to sidebar links to be compatible with sidebar mini 2015-03-22 21:17:14 -04:00
Abdullah Almsaeed d83809c4e9 Update Ion Icons 2015-03-22 08:45:38 -04:00
Abdullah Almsaeed ab57813844 Updated color pallete style 2015-03-21 22:37:23 -04:00
Abdullah Almsaeed 0391457ff5 Removed execution permissions from all files 2015-03-03 20:36:58 -05:00
Abdullah Almsaeed 7165c78c3c modified permissions 2015-03-02 18:41:47 -05:00
Abdullah Almsaeed ed51f8b0ef Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2015-02-27 22:06:26 -05:00
Abdullah Almsaeed b81fd035f6 Updated widgets page to include AdminLTE2.0 components 2015-02-27 22:06:16 -05:00
Silvestr Hašek 7534497535 Calendar: add missing protocols for external lib 2015-02-27 11:11:43 +01:00
Abdullah Almsaeed 52777c1e2a Fixed comment typo 2015-02-25 13:40:23 -05:00
Abdullah Almsaeed 8a49ac4816 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2015-02-22 14:12:29 -05:00
Abdullah Almsaeed 3850d5a89a Removed demo.js 2015-02-22 11:29:34 -05:00
Shai Alon fca08b462a Fix typo 2015-02-22 00:10:29 +02:00
Abdullah Almsaeed ffb2731764 Cleaned code 2015-02-20 16:46:03 -05:00
Abdullah Almsaeed 2c215d004d Update 2015-02-16 15:00:27 -05:00
Abdullah Almsaeed f67bf85a40 Locally hosted jQuery & Bootstrap files 2015-02-16 13:33:56 -05:00
Abdullah Almsaeed 174be54e9b Reorganized color palette 2015-02-16 00:44:30 -05:00
Abdullah Almsaeed 5f18b60e56 Updated color palette 2015-02-16 00:32:31 -05:00
Abdullah Almsaeed cf4ab6fa0d ; 2015-02-15 21:54:55 -05:00
Abdullah Almsaeed 2370bd873e Modifed layout-top-nav to have a better look 2015-02-15 21:45:16 -05:00
Abdullah Almsaeed ebc66a896e Updated calendar side widgets box style to solid 2015-02-15 21:33:44 -05:00
Abdullah Almsaeed 3efb12b93f Updated the style of Timeline to match the rest of the template 2015-02-15 21:30:35 -05:00
Abdullah Almsaeed ba74d2f179 Added tooltips 2015-02-15 20:49:16 -05:00
Abdullah Almsaeed 745fd328bf Updated bootstrap js files 2015-02-15 20:41:17 -05:00
Abdullah Almsaeed f388f54538 Added target _blank to print button 2015-02-15 19:47:14 -05:00
Abdullah Almsaeed ac94f181a9 Added chartjs page 2015-02-15 19:46:50 -05:00
Abdullah Almsaeed 51822ddcb0 Modifed links and add check all button 2015-02-15 19:46:13 -05:00
Abdullah Almsaeed 78ac2fe031 Merge pull request #235 from homebysix/master 
Fixed a few typos.
 2015-02-14 17:08:57 -05:00
Abdullah Almsaeed 2dd4d573f4 Fixed mailbox link 2015-02-13 19:06:07 -05:00
Abdullah Almsaeed 09a8ac4573 Added new mailbox/inbox/read/compose 2015-02-13 19:04:03 -05:00
Abdullah Almsaeed 79e8c7395a fixed transition issues 2015-02-10 19:53:16 -05:00
Elliot Jordan 26381847ce Fixed a few typos. 2015-02-10 09:14:32 -08:00
Abdullah Almsaeed acbb2f4020 Added fastclick.js to deal with touch screen click lag time 2015-02-07 16:34:25 -05:00
Abdullah Almsaeed 79c250d7ba Modified tips 2015-02-07 12:54:22 -05:00
Abdullah Almsaeed 5fb6d42a2b Added tips to how to create a cretain layout in the layout options pages 2015-02-07 12:51:34 -05:00
Abdullah Almsaeed 1e9e9b8f9b Added sidebar collapsed layout example 2015-02-07 12:37:42 -05:00
Abdullah Almsaeed 61b38618ad Added warning to morris.js 2015-02-07 11:48:16 -05:00
Abdullah Almsaeed dd8bfbc5d6 Fixed broken links 2015-02-07 11:44:45 -05:00
Abdullah Almsaeed 10bde1cf79 Added links to layout options 2015-02-07 11:35:34 -05:00
Abdullah Almsaeed eccd2b521d Changed notification menu style 2015-02-06 19:00:29 -05:00
Abdullah Almsaeed 18529ffaef Added layout pages 2015-02-06 18:40:49 -05:00