makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 12:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
13165 commits 18 branches 192 tags 206 MiB
Commit graph

397 commits

Author SHA1 Message Date
David King
fd58a0ad37 [ticket/10535] Forgot a subsilver2 change. *doh* 
PHPBB3-10535
 2011-12-15 23:17:21 +00:00
Joas Schilling
730d2d5d19 [ticket/8996] Revert initial fix to keep old behaviour on empty selection 
Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp"

This reverts commit eb1f15bc8b.

PHPBB3-8996
 2011-12-15 22:14:59 +01:00
David King
18aa4e4ecd [ticket/10535] Remove email confirm check on registration form 
PHPBB3-10535
 2011-12-15 15:13:11 +00:00
Andreas Fischer
06ae98b1e5 [develop-olympus] Bumping version numbers to final for 3.0.10 releases. 2011-11-20 21:41:24 +01:00
Oleg Pudeyev
08032068c0 Merge remote-tracking branch 'nickvergessen/ticket/10344' into develop 
* nickvergessen/ticket/10344:
  [ticket/10344] Add attachment icons to list of reported and queued posts/topics
 2011-11-20 00:46:45 -05:00
Oleg Pudeyev
f5b009158c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8996] Also fix the BBCode bug in subsilver2 and acp
  [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
 2011-11-19 21:25:58 -05:00
Oleg Pudeyev
d03366fba2 Merge remote-tracking branch 'nickvergessen/ticket/8996' into develop-olympus 
* nickvergessen/ticket/8996:
  [ticket/8996] Also fix the BBCode bug in subsilver2 and acp
  [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
 2011-11-19 21:15:25 -05:00
Joas Schilling
eb1f15bc8b [ticket/8996] Also fix the BBCode bug in subsilver2 and acp 2011-11-18 23:27:25 +01:00
Andreas Fischer
08827fa733 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10452] Fix xHTML errors when print-viewing PMs

Conflicts:
	phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
 2011-11-14 22:01:36 +01:00
Andreas Fischer
f7286e1abe Merge remote-tracking branch 'nickvergessen/ticket/10452' into develop-olympus 
* nickvergessen/ticket/10452:
  [ticket/10452] Fix xHTML errors when print-viewing PMs
 2011-11-14 21:57:00 +01:00
Joas Schilling
9830453487 [ticket/10452] Fix xHTML errors when print-viewing PMs 
Also changed the layout of prosilvers PM print-view, so it looks like the post
print-view and not like the subsilver2 print-view.

PHPBB3-10452
 2011-11-14 18:41:19 +01:00
Andreas Fischer
b21e343b5e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
  [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
  [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
  [ticket/10254] Remove subsilver2 as default style on theme.
  [ticket/10254] Remove style names from themes and fix some informations on it.
 2011-11-14 13:45:01 +01:00
maelsoucaze
cf044c363b [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com. 
PHPBB3-10254
 2011-11-14 13:29:38 +01:00
maelsoucaze
c79992d1cc [ticket/10254] Remove subsilver2 as default style on theme. 
PHPBB3-10254
 2011-11-14 13:29:18 +01:00
maelsoucaze
dee836315c [ticket/10254] Remove style names from themes and fix some informations on it. 
PHPBB3-10254
 2011-11-14 13:28:42 +01: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
Chris Smith
b1df91db80 [feature/remove-db-styles] Remove parse_css_file option from themes. 
PHPBB3-9741
 2011-09-20 21:06:52 +01:00
Vjacheslav Trushkin
e38fd2b9f2 [ticket/10371] Removing last mentions of imageset 
Removing last mentions of imageset

PHPBB3-10371
 2011-09-20 22:56:53 +03:00
Nils Adermann
4e8e31c10b Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' into develop 
* github-cyberalien/feature/remove-imagesets:
  [feature/remove-imagesets] Script for converting imageset to css
  [feature/remove-imagesets] Changing subsilver
  [feature/remove-imagesets] Changing prosilver
  [feature/remove-imagesets] Adjustments to php files
  [feature/remove-imagesets] Changing admin control panel styles module
  [feature/remove-imagesets] Changing database structure
  [feature/remove-imagesets] Removing imageset files
  [feature/remove-imagesets] Moving images
 2011-09-20 21:26:37 +02:00
Oleg Pudeyev
145bc23044 Merge remote-tracking branch 'igorw/ticket/10155' into develop 
* igorw/ticket/10155:
  [ticket/10155] Briefly explain assets in coding-guidelines
  [ticket/10155] Move jQuery inclusion to footer
  [ticket/10155] Update to jQuery 1.6.2
  [ticket/10155] Add jQuery to AUTHORS
  [ticket/10155] Add jQuery, introduce global assets path
 2011-09-05 06:03:19 -04:00
Oleg Pudeyev
93b892d24a Merge remote-tracking branch 'bantu/ticket/9474' into develop 
* bantu/ticket/9474:
  [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
 2011-09-05 02:53:13 -04:00
Vjacheslav Trushkin
4035f3f6c8 [feature/remove-imagesets] Changing subsilver 
Removing imagesets. Changing subsilver

PHPBB3-10336
 2011-09-04 11:05:10 +03:00
Vjacheslav Trushkin
929c13a52b [feature/remove-imagesets] Removing imageset files 
Removing imagesets. Removing imageset files

PHPBB3-10336
 2011-09-03 18:53:23 +03:00
Vjacheslav Trushkin
e5daccdf33 [feature/remove-imagesets] Moving images 
Removing imagesets. Moving images

PHPBB3-10336
 2011-09-03 18:51:33 +03:00
Joas Schilling
57f7c24806 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
 2011-08-29 22:28:44 +02:00
Joas Schilling
a73bc353d6 Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ticket/bantu/10341 
* remotes/bantu/ticket/10341:
  [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
 2011-08-29 22:27:20 +02:00
Oleg Pudeyev
37a659513e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
 2011-08-27 17:49:09 -04:00
Oleg Pudeyev
0d41385344 Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympus 
* nickvergessen/ticket/10253:
  [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
 2011-08-27 17:38:27 -04:00
Joas Schilling
6a2b13632d [ticket/10344] Add attachment icons to list of reported and queued posts/topics 
PHPBB3-10344
 2011-08-27 00:25:38 +02:00
Andreas Fischer
4499be5795 [ticket/10341] Also show forum/topic name of "0" as most active forum/topic. 
PHPBB3-10341
 2011-08-25 17:44:45 +02:00
Andreas Fischer
ad20758916 [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files. 
PHPBB3-9474
 2011-08-23 00:11:15 +02:00
Nils Adermann
d06dcd69e6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8571] Show age as 0 in birthday list when birthday is in the future.
  [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
  [ticket/8571] Also display age on memberlist/viewprofile when age is 0.

Conflicts:
	phpBB/index.php
 2011-08-18 17:46:31 -04:00
Nils Adermann
6330153937 Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympus 
* github-bantu/ticket/8571:
  [ticket/8571] Show age as 0 in birthday list when birthday is in the future.
  [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
  [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
 2011-08-18 17:43:24 -04:00
Andreas Fischer
9589fbffe4 Merge remote-tracking branch 'erikfrerejean/ticket/10312' into develop 
* erikfrerejean/ticket/10312:
  [ticket/10312] Un-check the shadow option while moving.
 2011-08-16 18:36:22 +02:00
Erik Frèrejean
bf2b4a81d3 [ticket/10316] Resolve inconsistent move topic behavior 
When moving a topic you can straight away lock it, when using proSilver
this checkbox is unchecked by default. subSilver2 however has this
checked.
Change subSilver2 to not check the box by default and behave as
proSilver does.

PHPBB3-10316
 2011-08-15 14:05:34 +02:00
Erik Frèrejean
e9c4370444 [ticket/10312] Un-check the shadow option while moving. 
Don't create a shadow topic by default when moving a topic
the user should have the option to do this but it shouldn't
be done by default.

PHPBB3-10312
 2011-08-10 14:42:05 +02:00
Oleg Pudeyev
c7115a2f01 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
 2011-08-07 16:40:56 -04:00
Oleg Pudeyev
04e8468d28 Merge remote-tracking branch 'bantu/ticket/10298' into develop-olympus 
* bantu/ticket/10298:
  [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
 2011-08-07 16:35:31 -04:00
Oleg Pudeyev
124b8a92ec Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.
 2011-07-30 19:37:24 -04:00
Oleg Pudeyev
edb745e951 Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympus 
* callumacrae/ticket/8173:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.

Conflicts:
	phpBB/adm/style/acp_users_signature.html
 2011-07-30 19:33:41 -04:00
Joas Schilling
e0bb46c852 [ticket/10253] Fix IE9 handling in javascript, to correctly quote text. 
Since IE9 IE supports textarea.selectionStart and window.getSelection.
The only problem is, that the values are still incorrect.
Therefore we need to ensure that it is still treated the old way,
until IE fixes this completely.

PHPBB3-10253
 2011-07-30 19:35:45 +02:00
Andreas Fischer
d59a894cd3 [ticket/10298] Properly close embed tag for QuickTime in subsilver2. 
PHPBB3-10298
 2011-07-30 16:58:33 +02:00
Andreas Fischer
366b14b6c5 Merge remote-tracking branch 'igorw/ticket/10258' into develop 
* igorw/ticket/10258:
  [ticket/10258] Add HTML5 meta charset tag
 2011-07-30 16:49:39 +02:00
Callum Macrae
9c6339fb57 [ticket/8173] Removed some redundant code in the BBCode JavaScript. 
The following code can be found in the ACP, when changing a user's
signature:

t: '{ BBCODE_T_HELP }',

The code that uses it and the code that produces it were changed or
removed a while ago, but this code remained. In 2c4c1f9, the accesskey
for the list item button was changed to y from t, explaining the origin of
the redundant code - although it wasn't being used then, either.

This commit also changes the helpline code of "[*]" to y, as the access
key is y, so this makes it more consistent.

PHPBB3-8173
 2011-07-30 08:57:17 +01:00
Oleg Pudeyev
b960dd4e0d Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympus 
* callumacrae/ticket/10032:
  [ticket/10032] Fixed typos in bbcode button name.
 2011-07-30 00:48:03 -04:00
Oleg Pudeyev
45b19e6419 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10032] Fixed typos in bbcode button name.
 2011-07-30 00:45:31 -04:00
Oleg Pudeyev
43b5ca32be Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympus 
* callumacrae/ticket/10032:
  [ticket/10032] Fixed typos in bbcode button name.
 2011-07-30 00:45:17 -04:00
Igor Wiedler
681c4a478d [ticket/10258] Add HTML5 meta charset tag 
This allows knowing the charset when saving web pages to disk. Also, this is
supported by all browsers.

PHPBB3-10258
 2011-07-29 16:32:22 +02:00
Nils Adermann
ddbad5551d Merge remote-tracking branch 'github-igorw/ticket/10258' into develop 
* github-igorw/ticket/10258:
  [ticket/10258] Remove the meta charset tag
  [ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines
  [ticket/10258] Remove copyright meta tag from docs
  [ticket/10258] Remove resource-type and distribution meta tags
  [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags
  [ticket/10258] Change the DOCTYPE to HTML5
 2011-07-20 09:21:16 -04:00
Andreas Fischer
b4949675bf [ticket/8571] Also display age on memberlist/viewprofile when age is 0. 
PHPBB3-8571
 2011-07-20 00:31:45 +02:00