makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-22 03:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
21140 commits 18 branches 192 tags 207 MiB
Commit graph

735 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
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
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
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
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
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
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
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
Matt Friedman
47ff63f823 [ticket/12484] Add template event ucp_agreement_terms_before/after 
PHPBB3-12484
 2014-05-02 16:41:40 -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
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
Crizzo
df47cbb254 [ticket/12404] Splits up the line 18 in subsilver2 into more lines 
PHPBB3-12404
 2014-04-25 22:15:13 +02:00
Crizzo
600ab46a93 [ticket/12404] Changes append/prepend to after/before 
PHPBB3-12404
 2014-04-22 22:06:31 +02:00
Crizzo
94c21684ff [ticket/12404] Adds two new events and changes some places 
PHPBB3-12404
 2014-04-22 21:28:10 +02:00
Cesar G
889f6673b2 Merge remote-tracking branch 'PayBas/ticket/12363' into develop-ascraeus 
* PayBas/ticket/12363:
  [ticket/12363] Fix typo
  [ticket/12363] changed _winner_ to _most-votes_
  [ticket/12363] Mark winning (most votes) results bar
 2014-04-20 10:17:08 -07:00
Crizzo
23bf9d0c42 [ticket/12404] Adds a new event before and after the Timezone display 
PHPBB3-12404
 2014-04-16 21:03:03 +02:00
Joas Schilling
aebf2cc5cd Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeus 
* marc/ticket/12372:
  [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
  [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
  [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
  [ticket/12372] Move dE() function core.js
  [ticket/12372] Unify definition of function dE() across all files
  [ticket/12372] Use jQuery in javascript dE() function
 2014-04-14 12:33:33 +02:00
Matt Friedman
60be502190 [ticket/12254] Use 'language' instead of 'set_lang' as the variable name 
PHPBB3-12254
 2014-04-11 08:50:15 -07:00
Matt Friedman
80bc30214f [ticket/11098] Fix error reporting on the autologin key pages 
PHPBB3-11098
 2014-04-09 23:17:30 -07:00
Matt Friedman
150a45b943 [ticket/11098] Update subsilver2 to also include mark/unmark all buttons 
PHPBB3-11098
 2014-04-09 19:16:45 -07:00
Marc Alexander
91a1c3af90 [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay() 
PHPBB3-12372
 2014-04-07 21:42:30 +02:00
Marc Alexander
966a2b4892 [ticket/12372] Move dE() function core.js 
PHPBB3-12372
 2014-04-07 21:27:48 +02:00
Marc Alexander
ad98a070c3 [ticket/12372] Unify definition of function dE() across all files 
PHPBB3-12372
 2014-04-07 20:43:32 +02:00
Matt Friedman
8af9092cf6 [ticket/12254] Add set_lang var changes to subsilver2 files 
PHPBB3-12254
 2014-04-07 09:21:28 -07:00
PayBas
5bb0c65c24 [ticket/12369] Add template var {BODY_CLASS} to HTML body 
http://tracker.phpbb.com/browse/PHPBB3-12369

PHPBB3-12369
 2014-04-07 08:16:39 +02:00
PayBas
b64c5f84ab [ticket/12363] changed _winner_ to _most-votes_ 
PHPBB3-12363
 2014-04-06 22:18:52 +02:00
PayBas
3384e87b6f [ticket/12363] Mark winning (most votes) results bar 
PHPBB3-12363
 2014-04-06 16:43:25 +02:00
Joas Schilling
bd36ca1016 Merge remote-tracking branch 'paybas/ticket/12338' into develop-ascraeus 
* paybas/ticket/12338:
  [ticket/12338] Add Template Event overall_footer_page_body_after

Conflicts:
	phpBB/docs/events.md
 2014-04-04 23:57:06 +02:00
Joas Schilling
b5db7d49a8 Merge remote-tracking branch 'paybas/ticket/12333' into develop-ascraeus 
* paybas/ticket/12333:
  [ticket/12333] Change event name
  [ticket/12333] Add Template Event overall_header_body_after
 2014-04-04 23:55:36 +02:00
Joas Schilling
82fa935d5d Merge remote-tracking branch 'vsephpbb/ticket/11962' into develop-ascraeus 
* vsephpbb/ticket/11962:
  [ticket/11962] Resize posted images to fit and give them a class
 2014-04-04 18:25:01 +02:00
PayBas
069e515747 [ticket/12338] Add Template Event overall_footer_page_body_after 
implement

PHPBB3-12338
 2014-04-04 13:12:33 +02:00
Matt Friedman
0f3e6ca676 [ticket/12342] Use prop() instead of attr() for boolean properties 
PHPBB3-12342
 2014-04-01 17:58:56 -07:00
Joas Schilling
5a3d4109bb Merge remote-tracking branch 'paybas/ticket/12329' into develop-ascraeus 
* paybas/ticket/12329:
  [ticket/12329] changed all CSS classes to ".stat-block"
  [ticket/12329] Add <div> container to index blocks (stats, etc.)
 2014-04-01 15:07:19 +02:00