mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
16,558 Commits 17 Branches 190 Tags
Commit Graph

1903 Commits

Author SHA1 Message Date
Vinny
ce6ae9a7eb [ticket/11010] Changing email and url input types in prosilver templates 
PHPBB3-11010
 2013-05-20 18:39:46 +02:00
Nathan Guse
f26257dc51 Merge remote-tracking branch 'remotes/cyberalien/ticket/11558' into develop 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11558:
  [ticket/11558] Adjustments for notification link
  [ticket/11558] Fix styling for notifications link
 2013-05-20 11:07:54 -05:00
Nathan Guse
71c1973db9 Merge remote-tracking branch 'remotes/cyberalien/ticket/11489' into develop 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11489:
  [ticket/11489] IE7 adjustments
  [ticket/11489] Template changes for new topiclist layout
  [ticket/11489] CSS changes for topiclist lists
 2013-05-20 10:08:49 -05:00
Nathan Guse
ee89a706f9 Merge remote-tracking branch 'remotes/cyberalien/ticket/11556' into develop 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11556:
  [ticket/11556] Load apply_onkeypress_event() correctly
  [ticket/11556] Remove fallback JS
 2013-05-20 09:59:28 -05:00
Vjacheslav Trushkin
9954657712 [ticket/11558] Adjustments for notification link 
PHPBB3-11558
 2013-05-20 10:13:03 +03:00
Vjacheslav Trushkin
c29257f732 [ticket/11556] Load apply_onkeypress_event() correctly 
PHPBB3-11556
 2013-05-20 10:04:03 +03:00
Vjacheslav Trushkin
d09c6660a8 [ticket/11489] IE7 adjustments 
PHPBB3-11489
 2013-05-20 09:52:09 +03:00
Nathaniel Guse
c34118f93b Merge remote-tracking branch 'remotes/cyberalien/ticket/11554' into develop 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11554:
  [ticket/11554] Move forum_fn.js to footer
 2013-05-19 18:33:56 -05:00
Vjacheslav Trushkin
ac122cbb4e [ticket/11558] Fix styling for notifications link 
PHPBB3-11558
 2013-05-19 20:16:45 +03:00
Andreas Fischer
f49be85859 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp

Conflicts:
	phpBB/styles/prosilver/template/ucp_groups_manage.html
 2013-05-19 15:44:25 +02:00
Vjacheslav Trushkin
a2a6357fd5 [ticket/11556] Remove fallback JS 
PHPBB3-11556
 2013-05-19 11:19:57 +03:00
Vjacheslav Trushkin
b8afef5df0 [ticket/11554] Move forum_fn.js to footer 
Move forum_fn.js to footer, move find_username to forum_fn.js

PHPBB3-11554
 2013-05-19 11:07:29 +03:00
Vjacheslav Trushkin
9435f16f59 [ticket/11555] Fix page comparison 
Strict comparison should not be used to compare string and number

PHPBB3-11555
 2013-05-19 10:56:15 +03:00
Marc Alexander
84cfacf1f2 [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp 
The current look highly differed from the rest of the UCP. Additionally,
this caused the error message to be hardly noticeable at all.

PHPBB3-11537
 2013-05-14 12:18:40 +02:00
Vjacheslav Trushkin
0d8ba50b64 [ticket/11489] Template changes for new topiclist layout 
PHPBB3-11489
 2013-05-14 09:17:43 +03:00
Vjacheslav Trushkin
33521310c7 [ticket/11489] CSS changes for topiclist lists 
PHPBB3-11489
 2013-05-14 09:17:43 +03:00
Nathan Guse
bcf7ea3310 Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into develop 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11533:
  [ticket/11533] Update unit tests
  [ticket/11533] Fix colspan and unnecessary tables
  [ticket/11533] Change list to table for notification settings
  [ticket/11533] Columns counter for notification settings
 2013-05-12 18:56:34 -05:00
Nathaniel Guse
393ed4a2d0 Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into develop 2013-05-11 20:15:53 -05:00
Vjacheslav Trushkin
858f644c38 [ticket/11533] Fix colspan and unnecessary tables 
Fix colspan and remove unnecessary tables in notification
settings page in subsilver2.

PHPBB3-11533
 2013-05-11 23:32:55 +03:00
Vjacheslav Trushkin
f129fdb559 [ticket/11533] Change list to table for notification settings 
PHPBB3-11533
 2013-05-11 23:32:23 +03:00
Joas Schilling
665352d0d1 [ticket/11442] Do not suggest an option on ajax confirm box 
Reverting commit cb13add269b78e1a9ac84a80c78557bb7695df09
Also fixing in prosilver and subsilver2

PHPBB3-11442
 2013-05-08 00:07:13 +02:00
Andreas Fischer
a97d9d4b89 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable

Conflicts:
	phpBB/download/file.php
	phpBB/styles/prosilver/template/login_forum.html
 2013-05-06 22:11:33 +02:00
Gaëtan Muller
828d3b6b68 [ticket/11144] Add missing {FORUM_NAME} variable 
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum

PHPBB3-11144
 2013-05-06 21:31:16 +02:00
Nathaniel Guse
c057141ea6 Merge remote-tracking branch 'remotes/cyberalien/ticket/11275' into develop 2013-04-25 16:33:30 -05:00
Nathaniel Guse
ad1a4919d6 Merge remote-tracking branch 'remotes/cyberalien/ticket/4412' into develop 2013-04-25 16:21:14 -05:00
asperous
0f41cc34dd [ticket/11129] Added headers to empty subscription state 
Added a newline to better seperate the two headers.

PHPBB3-11129
 2013-04-23 15:02:38 -07:00
asperous
51a869b13a [ticket/11129] Added headers to empty subscription state 
"You are not subscribed to any forums".
While correct, could lead to confusion. What's missing is a header right above the message that says "Watched Topics" to match the "Watched Forums" header above. This will assert the idea that there are two separate watchable sections.
As is, it looks like that message is talking about the "Watched Forums" section, since it's listed under that header.

PHPBB3-11129
 2013-04-23 11:27:36 -07:00
Andreas Fischer
ec33bada93 Merge remote-tracking branch 'hjpotter92/ticket/11225' into develop 
* hjpotter92/ticket/11225:
  [ticket/11225] Deletion of unused mcp_jumpbox.html file
 2013-04-13 00:23:22 -04:00
Vjacheslav Trushkin
67f0e19128 [ticket/10741] Do not resize textarea.no-auto-resize 
Do not auto-resize textareas with class .no-auto-resize

PHPBB3-10741
 2013-04-12 16:46:54 +03:00
Vjacheslav Trushkin
316efcbbbb [ticket/10741] Automatically resize textareas in prosilver and ACP 
Automatically resize textareas in prosilver and ACP.

PHPBB3-10741
 2013-04-12 16:46:54 +03:00
Vjacheslav Trushkin
2387e7eb41 [ticket/11275] Do not use spacer.gif in color picker 
PHPBB3-11275
 2013-04-12 16:42:36 +03:00
Vjacheslav Trushkin
fafbce8124 [ticket/11275] Do not use document.write() for color palette 
Replace document.write() for color palette function

PHPBB3-11275
 2013-04-12 16:40:32 +03:00
Nils Adermann
c25dfef770 Merge pull request #1184 from marc1706/ticket/11314 
[ticket/11314] Improve readability and code cleanup in new JavaScript files
 2013-04-12 06:32:13 -07:00
Vjacheslav Trushkin
f89b80e183 [ticket/4412] Shorten long profile fields 
Shorten long profile fields using CSS

PHPBB3-4412
 2013-04-11 14:31:17 +03:00
hjpotter92
effc8a9bd0 [ticket/11225] Deletion of unused mcp_jumpbox.html file 
The file/template is no longer used(as mentioned in it).

PHPBB3-11225
 2013-04-11 00:00:48 +05:30
Nils Adermann
52a0f32d99 Merge pull request #1312 from VSEphpbb/ticket/11463 
[ticket/11463] Add title attribute to topics in search results
 2013-04-04 01:39:37 -07:00
Marc Alexander
34cdbd0360 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314 
Conflicts:
	phpBB/styles/prosilver/template/timezone.js
 2013-03-26 13:18:54 +01:00
Marc Alexander
f0b0978538 [ticket/11314] Modify files to comply with coding standards 
PHPBB3-11314
 2013-03-26 13:13:33 +01:00
Marc Alexander
36168b311e [ticket/11314] Fix issues mentioned in jshint report 
Additionally, the editor.js files are now the same file in both
subsilver2, prosilver, and the acp.

PHPBB3-11314
 2013-03-26 10:31:28 +01:00
Matt Friedman
940d16b585 [ticket/11463] Add title attribute to topics in search results 
We use this title attribute in viewforum_body.html, but not in
search_results.html. Perhaps we should, as this will maintain
consitency between all these topic view pages.

PHPBB3-11463
 2013-03-20 11:39:06 -07:00
Matt Friedman
433fbfd4d9 [ticket/11461] Add template event in the footer of view topic pages 
PHPBB3-11461
 2013-03-19 13:32:17 -07:00
Marc Alexander
d378f5ac32 [ticket/11433] Rename CSS class "jalert" to "phpbb_alert" 
This missing change caused the loading info to appear during ajax
requests. With this patch it will be properly hidden as it should.

PHPBB3-11433
 2013-03-12 15:15:21 +01:00
Nathaniel Guse
d6930df7a2 Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into develop 
# By Dhruv
# Via Dhruv
* remotes/dhruv/ticket/11303:
  [ticket/11303] rename attribute to timezone-preselect
  [ticket/11303] remove additional brackets
  [ticket/11303] use S_TZ_PRESELECT in subsilver
  [ticket/11303] add S_TZ_PRESELECT template var
 2013-03-09 19:08:51 -06:00
Nathan Guse
7bb32d27ac Merge remote-tracking branch 'remotes/nickv/ticket/11421' into develop 
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11421:
  [ticket/11421] Correctly display submit button when needed
 2013-03-07 11:33:33 -06:00
Nathan Guse
683e17c403 Merge remote-tracking branch 'remotes/nickv/ticket/11417' into develop 
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11417:
  [ticket/11417] FIx submit button description on notifications options page
 2013-03-07 11:33:02 -06:00
Nathan Guse
e826edb6fe Merge remote-tracking branch 'remotes/nickv/ticket/11390' into develop 
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11390:
  [ticket/11390] Correctly separate list of notifications from header
  [ticket/11390] Hide pagination when there are no notifications
 2013-03-07 11:32:17 -06:00
Joas Schilling
d219eafa16 [ticket/11407] Fix <dfn> description of "notification" option. 
PHPBB3-11407
 2013-03-07 12:18:53 +01:00
Joas Schilling
7ac945358e [ticket/11390] Correctly separate list of notifications from header 
PHPBB3-11390
 2013-03-07 11:39:55 +01:00
Joas Schilling
899d857929 [ticket/11390] Hide pagination when there are no notifications 
PHPBB3-11390
 2013-03-07 11:39:33 +01:00
Joas Schilling
2caf7fbf12 [ticket/11417] FIx submit button description on notifications options page 
PHPBB3-11417
 2013-03-07 11:30:02 +01:00