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

340 commits

Author SHA1 Message Date
Oleg Pudeyev
1fa39ea722 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8636] Add resync option to topic_view moderation page
 2012-03-16 06:18:35 -04:00
Oleg Pudeyev
81eeafbb8d Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympus 
* nickvergessen/ticket/8636:
  [ticket/8636] Add resync option to topic_view moderation page
 2012-03-16 06:18:29 -04:00
Joas Schilling
33dce916e2 [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue 
PHPBB3-10690
 2012-03-14 22:22:22 +01:00
Andreas Fischer
ad3bbcf466 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10456] Add tabindex to subsilver2 captcha
 2012-02-25 20:26:29 +01:00
Joas Schilling
8e1e48a7b6 [ticket/8636] Add resync option to topic_view moderation page 
PHPBB3-8636
 2012-02-23 10:55:57 +01:00
Joas Schilling
340a8f19d6 [ticket/10456] Add tabindex to subsilver2 captcha 
Did not set tabindex on registration page, as the hole page does not have any.

PHPBB3-10456
 2012-02-21 11:25:22 +01:00
Patrick Webster
2a5e30db9e [ticket/10641] Update MCP template with new plurality forms 
Updates the MCP template according to PHPBB3-10345

PHPBB3-10641
 2012-02-11 01:40:01 -06:00
Oleg Pudeyev
598e022d4c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10569] Invalid string comparison in prosilver
  [ticket/10569] Invalid string comparison in subsilver2
 2012-02-10 21:00:51 -05:00
Oleg Pudeyev
ed6bd50ab8 Merge remote-tracking branch 'cyberalien/ticket/10569' into develop-olympus 
* cyberalien/ticket/10569:
  [ticket/10569] Invalid string comparison in prosilver
  [ticket/10569] Invalid string comparison in subsilver2
 2012-02-10 21:00:36 -05:00
Igor Wiedler
d4e00b6c0d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10616] Add template inheritance to exported template
  [ticket/10616] Ignore template inheritance that points to self
  [ticket/10616] Add template inheritance to default styles
 2012-02-07 16:57:09 +01:00
Oleg Pudeyev
cddd63aae0 Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop 
* imkingdavid/ticket/10535:
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/10535] Delete email confirm from installer
  [ticket/10535] Removed email confirm field from acp_users module
  [ticket/10535] Forgot a subsilver2 change. *doh*
  [ticket/10535] Removed email confirm from UCP, removed unused language entries
  [ticket/10535] Remove email confirm check on registration form
 2012-02-03 16:21:51 -05:00
Vjacheslav Trushkin
d2a3496149 [ticket/10616] Add template inheritance to default styles 
Adding template inheritance field to prosilver and subsilver2

PHPBB3-10616
 2012-02-03 16:00:14 +02:00
Vjacheslav Trushkin
879c92e8a2 [ticket/10569] Invalid string comparison in subsilver2 
Fixing invalid string comparison in ucp_main_front.html in subsilver2

PHPBB3-10569
 2012-02-03 15:38:52 +02:00
Unknown
656a8ece6f [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2012-01-02 19:10:27 +01:00
Andreas Fischer
0f974f9494 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10542] Remove class="postlink" in subsilver2 faq_body.html
 2011-12-25 00:58:11 +01:00
Richard Foote
fa003bb5fd [ticket/10542] Remove class="postlink" in subsilver2 faq_body.html 
class="postlink" is not defined in stylesheet.css so remove it from
styles/subsilver2/template/faq_body.html

PHPBB3-10542
 2011-12-24 11:30:17 -05:00
Andreas Fischer
93701adf02 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection
 2011-12-16 15:50:11 +01:00
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
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
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
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
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