finalized set of changes as already described via E-Mail #221
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…of entire threads
…ers (e.g., adminstrative account and work account of a single person) to share a single mail address
…o assist debugging on el-cheapo webhosts
… source code, integrate replies into thread view, fix bugs with column display customization, remove thread view options (didn't work properly anyways); this needs a small updates to theme CSS files
Conflicts: lib/sceditor/jquery.sceditor.bbcode.min.js lib/sceditor/jquery.sceditor.default.min.css lib/sceditor/jquery.sceditor.min.js lib/sceditor/jquery.sceditor.xhtml.min.js lib/sceditor/languages/ar.js lib/sceditor/languages/de.js lib/sceditor/languages/en-US.js lib/sceditor/languages/en.js lib/sceditor/languages/es.js lib/sceditor/languages/et.js lib/sceditor/languages/fr.js lib/sceditor/languages/nl.js lib/sceditor/languages/no.js lib/sceditor/languages/pt-BR.js lib/sceditor/languages/ru.js lib/sceditor/languages/sv.js lib/sceditor/languages/template.js lib/sceditor/languages/tr.js lib/sceditor/languages/vi.js lib/sceditor/ocm.css lib/sceditor/plugins/bbcode.js lib/sceditor/plugins/xhtml.js lib/sceditor/themes/default.min.css lib/sceditor/themes/famfamfam.png lib/sceditor/themes/modern.min.css lib/sceditor/themes/monocons/monocons.eot lib/sceditor/themes/monocons/monocons.svg lib/sceditor/themes/monocons/monocons.ttf lib/sceditor/themes/monocons/monocons.woff lib/sceditor/themes/office-toolbar.min.css lib/sceditor/themes/office.min.css lib/sceditor/themes/square.min.css style/ocm/footer.php style/ocm/header.php
…index page, and theming like login.php and lostpass.php; fix SQL injection bug Conflicts: style/ocm/login.php style/ocm/lostpass.php
… fix ISO 8601 date
added 4 commits
April 8, 2013 18:46
|
Many of these changes - except for the translations, sceditor, and a few other things - have been merged into the 4.0 development branch. To merge in the translations, I need you to either rebase off of development and resubmit a pull request or just submit them all as a single commit I can get reviewed. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See the individual commits for details. All three built-in styles are up-to-date with my changes. This should not break anything. It seems to work, but I only superficially checked the built-in styles.
Please take a good look at it, as I am new to git and the way I manage development and branching (developing our customized site on a branch and then cherry-picking commits for master).