1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

2652 Commits

Author SHA1 Message Date
Joas Schilling
e976f7908a Merge pull request #2414 from prototech/ticket/12440
[ticket/12440] Set browser URL to point to specific post when using view=unread

* prototech/ticket/12440:
  [ticket/12440] Use a more generic approach for replacing the URL.
  [ticket/12440] Set browser URL to point to specific post when using view=unread

Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
2014-05-08 13:23:12 +02:00
Joas Schilling
ef99d6fcc5 Merge pull request #2423 from rxu/ticket/12511
[ticket/12511] Add missing titles for profile fields in members group view

* rxu/ticket/12511:
  [ticket/12511] Add missing titles for profile fields in members group view
2014-05-08 12:32:04 +02:00
Joas Schilling
03f3f1141f Merge pull request #2424 from VSEphpbb/ticket/12513
[ticket/12513] Add simple_header head event with support for asset calls

* VSEphpbb/ticket/12513:
  [ticket/12513] Add asset include support to simple header/footer in ACP
  [ticket/12513] Add simple_header head event with support for CSS assets calls
2014-05-08 12:28:53 +02:00
Joas Schilling
077c7cf7aa Merge pull request #2400 from PayBas/ticket/12488
[ticket/12488] Add user warning indication to viewtopic posts

* PayBas/ticket/12488:
  [ticket/12488] subSilver2 fix (no longer displays if warnings = 0)
  [ticket/12488] Typo fix
  [ticket/12488] Removed <em> and removed anonymous check
  [ticket/12488] Add user warning indication to viewtopic posts
2014-05-07 21:17:04 +02:00
Matt Friedman
8fda490050 [ticket/12513] Add simple_header head event with support for CSS assets calls
PHPBB3-12513
2014-05-07 11:53:25 -07:00
rxu
4b54d0b4af [ticket/12511] Add missing titles for profile fields in members group view
For memberlist group view in cases the group is presented with the group leader
and group members, for members profile fields titles are missing: Posts,
Joined, Last active and custom profile fields titles.

PHPBB3-12511
2014-05-07 23:31:09 +08:00
Cesar G
3c86a9bcca Merge remote-tracking branch 'Elsensee/ticket/suheb/12185' into develop-ascraeus
* Elsensee/ticket/suheb/12185:
  [ticket/12185] Fix and increase width
  [ticket/12185] Fixing the width of topic header for translation.
2014-05-06 13:56:09 -07:00
Joas Schilling
c7d29fbdb1 Merge pull request #2373 from Nicofuma/ticket/12459
[ticket/12459] Unapproved posts/topics are not correctly handled in feeds

* Nicofuma/ticket/12459:
  [ticket/12459] Change language strings
  [ticket/12459] Enable related tests
  [ticket/12459] Fix: Differentiating unapproved and deleted posts
  [ticket/12459] Fix: Soft deleted topics should appear in feeds
  [ticket/12459] Fix: the posts were always marked as unapproved
2014-05-06 13:59:09 +02:00
Cesar G
71379c3a0f Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeus
* VSEphpbb/ticket/12332:
  [ticket/12332] Add missing semicolon to inline styling
  [ticket/12332] Adjust size of mark column where too wide
  [ticket/12332] Adjust column widths for responsive changes
  [ticket/12332] Restore some changes back to original state
  [ticket/12332] Add break-word to fixed width table CSS
  [ticket/12332] Accomplish all word creaking in template and CSS
  [ticket/12332] Remove width sizing, as it is already set
  [ticket/12332] Fix displaying attachments with long file names
2014-05-05 16:51:29 -07:00
Cesar G
698d8551cf Merge remote-tracking branch 'Crizz0/ticket/12498' into develop-ascraeus
* Crizz0/ticket/12498:
  [ticket/12498] Adds height-property for IE8 in tweaks.css
2014-05-05 16:45:44 -07:00
Cesar G
7475e05f99 [ticket/12440] Set browser URL to point to specific post when using view=unread
PHPBB3-12440
2014-05-05 16:33:27 -07:00
Tristan Darricau
717f8a6671 [ticket/12459] Change language strings
PHPBB3-12459
2014-05-05 18:58:15 +02:00
PayBas
4d64e09e7a [ticket/12488] subSilver2 fix (no longer displays if warnings = 0)
Don't know what I was thinking with this

PHPBB3-12488
2014-05-05 09:38:00 +02:00
Cesar G
a4aeb91ec0 [ticket/12491] Fix clashing USERNAME_FULL template variable.
The user notes and user warn pages have a variable with the same name.

PHPBB3-12491
2014-05-04 15:31:19 -07:00
PayBas
cefeb7f752 [ticket/12488] Removed <em> and removed anonymous check
PHPBB3-12488
2014-05-04 22:07:03 +02:00
Crizzo
2c8cb4dd60 [ticket/12498] Adds height-property for IE8 in tweaks.css
PHPBB3-12498
2014-05-04 18:58:27 +02:00
Joas Schilling
80d113f688 [prep-release-3.1.0-b3] Update version to 3.1.0-b3 2014-05-04 17:27:20 +02:00
Joas Schilling
541de3281a Merge pull request #2394 from VSEphpbb/ticket/12484
[ticket/12484] Add template event ucp_agreement_terms_before/after

* VSEphpbb/ticket/12484:
  [ticket/12484] Add template event ucp_agreement_terms_before/after
2014-05-04 16:41:19 +02:00
Joas Schilling
b1d30dad5c Merge pull request #2203 from PayBas/ticket/12323
[ticket/12323] Template Event search_results_postprofile_before/after

* PayBas/ticket/12323:
  [ticket/12323] Template Event search_results_postprofile_before

Conflicts:
	phpBB/docs/events.md
2014-05-04 16:23:14 +02:00
Joas Schilling
3674f95e52 Merge pull request #2346 from PayBas/ticket/12438
[ticket/12438] Add Template event memberlist_view_content_prepend

* PayBas/ticket/12438:
  [ticket/12438] Add Template event memberlist_view_content_prepend
2014-05-04 16:14:20 +02:00
Joas Schilling
eb52028334 Merge pull request #2314 from PayBas/ticket/12410
[ticket/12410] Add Template events search_results_post_ b/a

* PayBas/ticket/12410:
  [ticket/12410] Add Template events search_results_post_ b/a
2014-05-04 16:11:56 +02:00
Joas Schilling
f615d46261 Merge pull request #2297 from PayBas/ticket/12396
[ticket/12396] Add Template events viewforum_forum_name_append/prepend

* PayBas/ticket/12396:
  [ticket/12396] Added missing viewtopic_topic_title_append
  [ticket/12396] Add Template events viewforum_forum_name
2014-05-04 16:09:18 +02:00
Joas Schilling
28f2c1eb08 Merge pull request #2273 from PayBas/ticket/12376
[ticket/12376] Add template events viewtopic_body_polls

* PayBas/ticket/12376:
  [ticket/12376] Changed to viewtopic_body_poll_option_before and after
  [ticket/12376] Added viewtopic_body_poll_question_append
  [ticket/12376] Add template events viewtopic_body_polls
2014-05-04 15:58:33 +02:00
Joas Schilling
587a9445cd Merge pull request #2270 from PayBas/ticket/12374
[ticket/12374] Add Template events index_body_block_(name)_append

* PayBas/ticket/12374:
  [ticket/12374] Fixed alphabetical sorting
  [ticket/12374] Added prepend-versions of events
  [ticket/12374] Updated code layout
  [ticket/12374] Add Template events index_body_block_(name)_append
2014-05-04 15:55:44 +02:00
Joas Schilling
96394bb044 Merge pull request #2233 from PayBas/ticket/12346
[ticket/12346] Add Template Event overall_header_navlink_append/prepend

* PayBas/ticket/12346:
  [ticket/12346] Change tabs to spaces
  [ticket/12346] Add Template Event overall_header_navlink_app/pre
2014-05-04 15:52:26 +02:00
Gaëtan Muller
05491b0050 [ticket/12378] Prosilver common.css duplicate entry
https://tracker.phpbb.com/browse/PHPBB3-12378

PHPBB3-12378
2014-05-04 15:40:35 +02:00
PayBas
2c5a2a1390 [ticket/12488] Add user warning indication to viewtopic posts
PHPBB3-12488
2014-05-03 23:07:30 +02:00
PayBas
1a39f5f6b9 [ticket/12346] Add Template Event overall_header_navlink_app/pre
Rebased

PHPBB3-12346
2014-05-03 18:21:15 +02:00
PayBas
1c84cea394 [ticket/12323] Template Event search_results_postprofile_before
PHPBB3-12323
2014-05-03 17:56:13 +02:00
PayBas
8186e282f1 [ticket/12374] Added prepend-versions of events
PHPBB3-12374
2014-05-03 17:50:31 +02:00
PayBas
bb7941a52b [ticket/12374] Updated code layout
PHPBB3-12374
2014-05-03 17:50:30 +02:00
PayBas
a14930466b [ticket/12374] Add Template events index_body_block_(name)_append
Hopefully to the correct branch this time

PHPBB3-12374
2014-05-03 17:50:30 +02:00
PayBas
36aa8ecad8 [ticket/12376] Changed to viewtopic_body_poll_option_before and after
PHPBB3-12376
2014-05-03 17:48:31 +02:00
PayBas
21c11c7b24 [ticket/12376] Added viewtopic_body_poll_question_append
PHPBB3-12376
2014-05-03 17:43:06 +02:00
PayBas
4e79764aca [ticket/12376] Add template events viewtopic_body_polls
PHPBB3-12376
2014-05-03 17:42:13 +02:00
PayBas
59ba62f5d9 [ticket/12396] Added missing viewtopic_topic_title_append
rebased for travis... again

PHPBB3-12396
2014-05-03 17:37:49 +02:00
PayBas
a1b159aa82 [ticket/12396] Add Template events viewforum_forum_name
PHPBB3-12396
2014-05-03 17:29:54 +02:00
PayBas
530d09204c [ticket/12410] Add Template events search_results_post_ b/a
PHPBB3-12410
2014-05-03 17:25:36 +02:00
Joas Schilling
b60108dc78 Merge pull request #2267 from prototech/ticket/10737
[ticket/10737] Add  live member search.

* prototech/ticket/10737:
  [ticket/10737] Remove loading indicator.
  [ticket/10737] Enforce allow_live_searches setting in memberlist.php.
  [ticket/10737] Add config setting to disable live searches.
  [ticket/10737] Add loading indicator and alert box code to simple_footer.html.
  [ticket/10737] Load core.js and ajax.js in simple_footer.html.
  [ticket/10737] Set the username as the input value instead of redirecting.
  [ticket/10737] Drop subsilver2 changes.
  [ticket/10737] Add a more generic live search implementation.
  [ticket/10737] Clean up memberlist.php.
  [ticket/10737] Use dropdown for search results container.
  [ticket/10737] Adding delayed keyup and removing target_blank.
  [ticket/10737] Using UTF-8 aware alternatives in PHP code.
  [ticket/10737] Removing obsolete code.
  [ticket/10737] Avoid hard-coding table row and use case-insensitive search.
  [ticket/10737] Removing unnecessary/obsolete code.
  [ticket/10737] Using JQuery events and JSON response.
  [ticket/10737] Code fixes in AJAX search feature
  [ticket/10737] Improvements over last commit
  [ticket/10737] Adding username suggestions in "Find a member" using AJAX
2014-05-03 16:39:31 +02:00
Oliver Schramm
3f0334c107 [ticket/12185] Fix and increase width
PHPBB3-12185
2014-05-03 16:07:07 +02:00
Matt Friedman
47ff63f823 [ticket/12484] Add template event ucp_agreement_terms_before/after
PHPBB3-12484
2014-05-02 16:41:40 -07:00
Joas Schilling
0d133e483b Merge pull request #2385 from prototech/ticket/12478
Add contact field before/after events.
2014-05-02 23:12:10 +02:00
Cesar G
9431a018cb [ticket/12478] Add contact field events to viewtopic_body.html.
PHPBB3-12478
2014-05-02 12:50:59 -07:00
Cesar G
f34af2669d [ticket/12478] Re-add contact field events in ucp_pm_viewmessage.html.
PHPBB3-12478
2014-05-02 12:50:16 -07:00
Nils Adermann
0fc6b6ac36 Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeus
* github-vse/ticket/12254:
  [ticket/12254] Add subsilver2 support for cookie storage instead of SID
  [ticket/12254] Use a cookie instead of SID to store language selection
  [ticket/12254] No longer need to add change_lang to the URL params
  [ticket/12254] Use 'language' instead of 'set_lang' as the variable name
  [ticket/12254] Persist set_lang after reg only if changed from default
  [ticket/12254] Add set_lang var changes to subsilver2 files
  [ticket/12254] Use new set_lang var to avoid conflict with change_lang
  [ticket/12254] Stop using deprecated request_var in user class
  [ticket/12254] Better language switching on registration page
2014-05-02 21:23:58 +02:00
Matt Friedman
5b0b0d7c66 [ticket/12254] Add subsilver2 support for cookie storage instead of SID
PHPBB3-12254
2014-05-02 12:10:59 -07:00
Matt Friedman
78325736b1 [ticket/12254] Use a cookie instead of SID to store language selection
PHPBB3-12254
2014-05-02 12:08:35 -07:00
Nils Adermann
b187031082 Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus
* github-prototech/ticket/12265:
  [ticket/12265] Actually use $u_pm.
  [ticket/12265] Ensure that dropdown is always at the very left of the container
  [ticket/12265] Define a loop for contact icons.
  [ticket/12265] Break the icons that aren't in loop in case extensions add more
  [ticket/12265] Fix modulo logic.
  [ticket/12265] Adjust alignment of AIM and Jabber icons.
  [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.
  [ticket/12265] Add contact icon and remove border from last row & cells.
  [ticket/12265] Fix issue with dropdown being restricted by the width of parent
  [ticket/12265] Remove ugly logic.
  [ticket/12265] Simplify contact icon design and move to dropdown.

Conflicts:
	phpBB/viewtopic.php
2014-05-02 18:29:50 +02:00
PayBas
173bffb61a [ticket/12438] Add Template event memberlist_view_content_prepend
PHPBB3-12438
2014-05-02 17:58:02 +02:00
Nathaniel Guse
73b950d2f1 Merge remote-tracking branch 'remotes/Crizz0/ticket/12404' into develop-ascraeus
# By Crizzo
# Via Crizzo
* remotes/Crizz0/ticket/12404:
  [ticket/12404] Splits up the line 18 in subsilver2 into more lines
  [ticket/12404] Changes append/prepend to after/before
  [ticket/12404] Adds two new events and changes some places
  [ticket/12404] Adds a new event before and after the Timezone display
2014-05-01 22:24:31 -05:00