* shibulijack/ticket/10688:
[ticket/10688] Update install.html for 3.1 and current practices.
[ticket/10688] Update readme for 3.1 and current practices.
[ticket/10688] Changed version 3.0 to 3.1
[ticket/10688] Updated version to 3.1
[ticket/10688] Changed 3.0 to 3.1 in docs
Conflicts:
phpBB/docs/INSTALL.html
phpBB/docs/README.html
* develop: (175 commits)
[feature/ajax] Remove strange non-breaking spaces from approve button
[feature/ajax] Add entirely unrelated but nice newlines
[feature/ajax] Unify phpbb_json_response instantiation
[feature/ajax] Fix acp_styles activate_deactivate ajax callback name
[feature/ajax] Send correct activate/deactivate JSON response in acp_profile
[ticket/10270] Alter background colors for posts
[feature/ajax] Remove not working module enable/disable ajax code
[feature/ajax] Replace static call to phpbb_request with OO
[feature/ajax] Remove quick-reply AJAX handling until we have something good
[ticket/10270] Changing close button for ajax popups
[ticket/10270] Disabling links in disappearing content
[ticket/10291] Fixed an AJAX bug on quick reply form submit.
[ticket/10273] Fixed accepting / denying posts AJAX.
[ticket/10272] Removed code that was prevent event propogation in AJAX.
[ticket/10291] Fixed a bug in the quick reply AJAX.
[feature/ajax] Handle acp_modules error cases with JSON response
[feature/ajax] Fix filter check, quick mod tools data-attribute
[feature/ajax] Use the error handler
[feature/ajax] Generic error handling with a phpbb.alert box
[feature/ajax] Change filter semantics, some minor adjustments
...
Conflicts:
phpBB/adm/style/acp_styles.html
phpBB/includes/acp/acp_styles.php
- also try to not capitalize (uppercase is only giving problems sometimes; but able to be solved by translators, capitalize just does not work for some languages)
git-svn-id: file:///svn/phpbb/trunk@7568 89ea8834-ac86-4346-8a33-228a782c2dd0
E_USER_ERROR now using language keys if available [related to #10445]
UCP/MCP title tags [#10441]
Check $start parameter in viewforum [#10435]
Check for postable forum for moving user posts within users ACP [#10433]
Show error if admin tries to put forums beneath linked forums [related to #10433]
Correctly catch attachments while moving posts [#10431]
language change in install.html [#10425]
Updated AUTHORS file
git-svn-id: file:///svn/phpbb/trunk@7456 89ea8834-ac86-4346-8a33-228a782c2dd0
prosilver adjustments for important announcements in ucp - #9995
MCP fixes for user notes/warnings - #9981
Preserving imageset values on save/edit
find a member link for Mass PM's - #9925
syndicate window.onload events where necessary - #9878
Duplicate topics in forums with announcements - #9840
Email template for forced re-activation - #9808
Topic pagination adjustment - #9763
Changed compose message layout in UCP - #9706, #9702
Fixed inline attachment font size (hopefully)
git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
Numerous minimal test-cases and re-ordering of markup to attempt to get the same effect (way to spend 6 hours... thanks Internet Explorer @_@), it seems IE will randomly destroy the ability of <span>'s with "display: block" to have negative margin when they are children of blocks which have padding.
Have removed said padding from the offending parent and change the left-corner image to one that is _5000px_ wide (should cover QHDTV resolutions? :P), which creates the "double-border" effect top and bottom via a kind of a "sliding doors" way. IE7 works now, though there's some weird footer "flicker" when the menu is hovered (IE6 just does this al the while @_@). Better than nothing for now. Alternatively, nuke every PC which has IE installed. @_@
git-svn-id: file:///svn/phpbb/trunk@7292 89ea8834-ac86-4346-8a33-228a782c2dd0
