Commit graph

37 commits

Author SHA1 Message Date
Callum Macrae
6ad58c7e04 [ticket/10783] Added assets_version to ACP and simple_*.html.
PHPBB3-10783
2012-04-11 14:37:15 +01:00
Oleg Pudeyev
7d6b289671 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
2012-04-04 15:33:51 -04:00
Fyorl
0ceb77fb99 [ticket/10607] Added 'Powered by' translation string.
Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
2012-04-04 11:38:15 +08:00
Vjacheslav Trushkin
37480e5594 [ticket/10665] Adding includejs to acp templates
Adding includejs to acp overall_footer.html

PHPBB3-10665
2012-04-01 20:50:59 +03:00
Vjacheslav Trushkin
6145e0ba65 [ticket/10270] Changing close button for ajax popups
Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css

PHPBB3-10270
2012-03-31 02:10:16 +02:00
Igor Wiedler
27199bb509 [feature/ajax] Generic error handling with a phpbb.alert box
PHPBB3-10270
2012-03-31 02:09:26 +02:00
Callum Macrae
2189efadc6 [ticket/10270] Moved the AJAX error langyage entries to the footer.
PHPBB3-10270
2012-03-31 02:09:22 +02:00
Callum Macrae
885c2914db [ticket/10270] Fixed JavaScript alerts in the ACP.
PHPBB3-10270
2012-03-31 02:09:21 +02:00
Callum Macrae
3166cbb33d [ticket/10270] Replaced find by tag names with class names in the js.
What it was before (selecting by tag name) could have caused some
problems for style authors.

PHPBB3-10270
2012-03-31 02:09:18 +02:00
Callum Macrae
5b2352613e [ticket/10270] Added the alerts to the ACP footer.
I had forgotten to do it previously.

PHPBB3-10270
2012-03-31 02:09:18 +02:00
Callum Macrae
818d989168 [feature/ajax] Moved script.js into a few different files.
Seperated it into: assets/javascript/core.js,
styles/prosilver/template/ajax.js and adm/style/ajax.js.

PHPBB3-10270
2012-03-31 02:09:17 +02:00
Callum Macrae
431a78f346 [ticket/10270] Got rid of the temporary jQuery for the AJAX changes.
The jQuery library wasn't included before, so a temporary one was
included. Now that igorws jQuery patch has been merged, the temporary
library can be removed.

PHPBB3-10270
2012-03-31 02:09:16 +02:00
Callum Macrae
420de9c9a0 [ticket/10270] Moved some HTML from the JavaScript to overall_footer.
PHPBB3-10270
2012-03-31 02:09:14 +02:00
Callum Macrae
bb7a03f738 [ticket/10281] AJAXified reordering forums in the ACP.
PHPBB3-10281
2012-03-31 02:09:12 +02:00
Matt Friedman
2d0f96e8cc [ticket/10390] Revert back to escaped script tags inside document.write
Revert all script tags inside a document.write back to the escaped
version so they won't trip up any XML parsers.

PHPBB3-10390
2011-10-05 21:24:34 -07:00
Matt Friedman
2a28b6fc40 [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
HTML5 styles (ACP / Prosilver) do not need to use escaped javascript
wrapped in an unescape function, so we can simplify it! Only subsilver2 will
use the escaped version of the fallback code, because it is still XHTML.

PHPBB3-10390
2011-09-27 11:11:42 -07:00
Matt Friedman
56c6476233 [ticket/10390] Allow option for jQuery to be hosted by a remote CDN
Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.

PHPBB3-10390
2011-09-26 11:15:22 -07:00
Igor Wiedler
17bf983cdc [ticket/10155] Move jQuery inclusion to footer
PHPBB3-10155
2011-07-17 10:05:40 +02:00
Nils Adermann
3fb9b62c69 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9859] Changing all phpBB footers to match the new credit line
  [ticket/9859] New footer copyright line with registered symbol
2011-07-06 21:52:05 -04:00
Yuriy Rusko
a275d17625 [ticket/9859] Changing all phpBB footers to match the new credit line
PHPBB3-9859
2011-07-06 21:46:33 -04:00
Andreas Fischer
c617400f95 [ticket/9859] Remove the credit line comment from all html files.
PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
2a703b4055 [ticket/9859] Remove years in credit line from some more files.
Standard HTML output now includes:
Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group

Print output now includes:
Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/

This also fixes an inconsistency where "phpBB Group" was linked instead of
"phpBB".

PHPBB3-9859
2011-01-16 17:53:30 +01:00
Meik Sievertsen
cc1b91bb92 Fix cosmetic ACP bug showing on hover elements in IE7 (Bug #16109 - Patch by prototech)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9736 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-08 14:04:55 +00:00
Meik Sievertsen
d4a3e6e470 small template fix
git-svn-id: file:///svn/phpbb/trunk@7896 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-16 15:04:20 +00:00
Jonathan Stanley
c0cc8cf609 The Grand Copyright Year Unification... breakdown of years, of re-copyrighting due to major changes:
2000 - phpBB1.0.0 released
2002 - phpBB2.0.0 released & phpBB2.2.x commenced
2005 - phpBB2.2.x is canned with phpBB3.0.0 to succeed it, prosilver also starts development proper
2007 - phpBB3.0.x...

Anyone that so much as whimpers "OMG copyright year is wrong!!!1~"... read: http://en.wikipedia.org/wiki/Copyright

Considering copyright (from the year started) last for at least 50 years, and up to 70 years after the author's _death_, even phpBB1.x.x will remain copyrighted well into the 22nd century.


git-svn-id: file:///svn/phpbb/trunk@7624 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-17 21:12:17 +00:00
Meik Sievertsen
e206d63ed4 hmm
git-svn-id: file:///svn/phpbb/trunk@7622 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-17 17:40:01 +00:00
Meik Sievertsen
4ed8b3a62c ahhh, there are you. I can see a new haircut... looks good.
git-svn-id: file:///svn/phpbb/trunk@7263 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-01 22:46:14 +00:00
Jonathan Stanley
fe0a81d270 #7990
... yeah, that's it.


git-svn-id: file:///svn/phpbb/trunk@7126 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-03-05 18:38:56 +00:00
Nils Adermann
cde423591e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9859] Remove the years from the copyright statements in docs files.
  [ticket/9859] Remove the year from the copyright meta tag in docs/*.html
  [ticket/9859] Remove the meta copyright tag as well.
  [ticket/9859] Remove the credit line comment from all html files.
  [ticket/9859] Remove years in credit line from some more files.
2011-01-16 22:26:27 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Meik Sievertsen
2e17e448de Copy 3.0.x branch to trunk
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:14:59 +00:00
Meik Sievertsen
bf8ac19eaa Move trunk/phpBB to old_trunk/phpBB
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:13:59 +00:00
Meik Sievertsen
548cc2c10b - fixes for the following bugs:
#5326
#5318
#5304
#5290
#5288
#5278
#5276
#5272
#5266
- also fixed the "Call-time pass-by-reference" bug #5252
- within this step changed the normalize calls to require references.
- added captcha size variables to the class scope (suggestion was posted at area51)


git-svn-id: file:///svn/phpbb/trunk@6584 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-15 15:35:50 +00:00
Nils Adermann
4448249a44 - correctly display subcategories
- use L_TRANSLATION_INFO [Bug #2357]
- always begin with ACL_UNSET in permission trace
- allow copy permissions when editing a forum
- default to parent forum for copying permissions
- no duplication of the breadcrumps on registration [Bug #2307]


git-svn-id: file:///svn/phpbb/trunk@6107 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-20 19:00:30 +00:00
Meik Sievertsen
dd9ad539fd ok, this one is rather large... the most important change:
re-introduce append_sid: old style continues to work, not a performance hog as it was in 2.0.x -> structure is different

apart from this, code cleanage, bug fixing, etc.


git-svn-id: file:///svn/phpbb/trunk@6015 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-06 20:53:46 +00:00
Tom Beddard
3cfaa92631 First update of the new admin style to being it in line with the new frontend style. Note - this is still based on subsilver, the final admin will use the much nicer style of the new frontend - but that is secret until the final release ;)
git-svn-id: file:///svn/phpbb/trunk@5420 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-01-03 13:44:47 +00:00
Meik Sievertsen
1855c017e9 - drop in the new administration panel
- not finished yet: some user related items, style admin, database admin and permissions
- Graham: Please add your MCP schema data to the schema data file. ;)


git-svn-id: file:///svn/phpbb/trunk@5357 89ea8834-ac86-4346-8a33-228a782c2dd0
2005-12-19 18:55:52 +00:00