Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Conflicts:
	CHANGELOG.md
	install/changes/2.3.3.txt
  • Loading branch information
dleffler committed Jan 12, 2015
2 parents 2e19460 + 0d00476 commit df55097
Show file tree
Hide file tree
Showing 148 changed files with 3,102 additions and 2,996 deletions.
5 changes: 5 additions & 0 deletions exponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@
// Validate the session and populate the $user variable
if ($db->havedb) {
$user = new user();
//the default user is anonymous?
// if (!expSession::loggedIn()) {
//TODO: Maxims initial anonymous user implementation, we need an anonymous user record
//user::login("anonymous", "anonymous");
// }
expSession::validate();
}

Expand Down
10 changes: 5 additions & 5 deletions external/ExtPrograms.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ Adminer,4.1.0,www.adminer.org,4.1.0,we add some system user checks in design.inc
SimpleAjaxUploader,1.11.0-exp,https://github.com/LPology/Simple-Ajax-Uploader,1.11.0,also converted to yui module
normalize.css,3.0.2,necolas.github.com/normalize.css/,3.0.2,auto included w/ bootstrap 3
MediaElement.js,2.16.3,mediaelementjs.com/,2.16.3,
Facebook PHP SDK,3.2.3,https://github.com/facebook/facebook-php-sdk,4.0.11,
Facebook PHP SDK,3.2.3,https://github.com/facebook/facebook-php-sdk,4.0.15,
Respond,1.4.2,https://github.com/scottjehl/Respond,1.4.2,IE6-8 shim
html5shiv,3.7.2,https://github.com/aFarkas/html5shiv,3.7.2,IE6-8 shim
csshover.htc,3.11,http://peterned.home.xs4all.nl/csshover.html,3.11,IE6 shim
excanvas,r3,https://code.google.com/p/explorercanvas/,r3,IE6-8 shim needed by TimesCircle
dompdf,0.6.0b3,https://github.com/dompdf/dompdf,0.6.1,"optional, patched to display our images"
mPDF,5.7.1,mpdf1.com,5.7.2,optional
mPDF,5.7.1,mpdf1.com,6.0.0/5.7.4,optional
CKEditor,4.4.6,ckeditor.com,4.4.6,"Adds fieldinsert (exp), tableresize, stylesheetparser, sourcedialog, image2 widget & kama skin"
TinyMCE,4.1.7,tinymce.com,4.1.7,add xenmce skin
elFinder,2.1xn,elfinder.org,2.1xn,"use https://github.com/nao-pon/elFinder and added Exponent classes, plus some customized files"
Expand All @@ -58,11 +58,11 @@ colorbox,1.5.14,http://www.jacklmoore.com/colorbox,1.5.14,using style #5 renamed
Searcher,0.2.0,https://github.com/lloiser/jquery-searcher/,0.2.0,
DateTimePicker,2.4.1exp,http://xdsoft.net/jqplugins/datetimepicker/,2.4.1,added additional 'update' method and click update if inline
TimeCircles,1.5.3,https://github.com/wimbarelds/TimeCircles,1.5.3,
pwstrength-bootstrap,1.2.2,https://github.com/ablanco/jquery.pwstrength.bootstrap,1.2.2,
pwstrength-bootstrap,1.2.3,https://github.com/ablanco/jquery.pwstrength.bootstrap,1.2.3,
Sortable,1.0.0,https://github.com/RubaXa/Sortable,1.0.0,
jstree,3.0.8,https://github.com/vakata/jstree,3.0.8,added nav menu icons to stylesheet
jstree,3.0.9,https://github.com/vakata/jstree,3.0.9,added nav menu icons to stylesheet
bootstrap3-dialog,1.34.0,https://github.com/nakupanda/bootstrap3-dialog,1.34.1,
impromptu,5.3.0,http://trentrichardson.com/Impromptu,5.3.0,
impromptu,6.0.0,http://trentrichardson.com/Impromptu,6.0.0,
bootstrap-touch-carousel,0.8.0,https://github.com/ixisio/bootstrap-touch-carousel,0.8.0,
bootstrap-tagsinput,0.4.2,https://github.com/timschlechter/bootstrap-tagsinput,0.4.2,
Typeahead,0.10.5,http://twitter.github.io/typeahead.js/,0.10.5,needed by bootstrap-tagsinput
Expand Down
3 changes: 2 additions & 1 deletion external/jquery/addons/css/jquery-impromptu.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! jQuery-Impromptu - v5.3.0 - 2014-11-16
/*! jQuery-Impromptu - v6.0.0 - 2014-12-27
* http://trentrichardson.com/Impromptu
* Copyright (c) 2014 Trent Richardson; Licensed MIT */
.jqifade{
Expand Down Expand Up @@ -42,6 +42,7 @@ div.jqi .jqimessage{
padding: 10px;
line-height: 20px;
color: #444444;
overflow: auto;
}
div.jqi .jqibuttons{
text-align: right;
Expand Down
Loading

0 comments on commit df55097

Please sign in to comment.