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

3287 commits

Author SHA1 Message Date
Nils Adermann
3f3c8d74e8 [prep-release-3.1.1] Update version number to 3.1.1 2014-11-01 18:47:56 +01:00
Andreas Fischer
e4277525a0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13193] Swap ternary condition members
  [ticket/13193] Make template more readable
  [ticket/13193] Add load_search config check
  [ticket/13193] Add link to post count in PMs
 2014-10-26 14:20:34 +01:00
Andreas Fischer
69cf5782d4 Merge pull request #3054 from Senky/ticket/13193 
[ticket/13193] Post count in PMs not a link

* Senky/ticket/13193:
  [ticket/13193] Swap ternary condition members
  [ticket/13193] Make template more readable
  [ticket/13193] Add load_search config check
  [ticket/13193] Add link to post count in PMs
 2014-10-26 14:20:33 +01:00
Joas Schilling
80a9c24b6b [prep-release-3.1.0] Update version to 3.1.0 2014-10-23 12:22:02 +02:00
Joas Schilling
d640a37984 [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6 2014-10-23 01:48:38 +02:00
Marc Alexander
378fef022f Merge branch 'develop-ascraeus' into develop 2014-10-22 17:42:51 -05:00
Nils Adermann
48dc4c02ae [ticket/13205] Add a mark all messages read link to PM folders 
PHPBB3-13205
 2014-10-22 18:02:43 -04:00
Jakub Senko
5581a30f58 [ticket/13193] Make template more readable 
PHPBB3-13193
 2014-10-21 23:12:00 +02:00
Jakub Senko
92f077a4e9 [ticket/13193] Add link to post count in PMs 
PHPBB3-13193
 2014-10-21 22:32:57 +02:00
Oliver Schramm
30213816ae [ticket/13100] Display only confirmation buttons when deleting shadow topic 
PHPBB3-13100
 2014-10-20 00:24:16 +02:00
Cesar G
b22650d323 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12796] Use dedicated lang vars
  [ticket/12796] Use & in path
  [ticket/12796] Add view own profile to UCP (and vice versa)
 2014-10-16 19:32:28 -07:00
Cesar G
39e51e5599 Merge remote-tracking branch 'PayBas/ticket/12796' into develop-ascraeus 
* PayBas/ticket/12796:
  [ticket/12796] Use dedicated lang vars
  [ticket/12796] Use & in path
  [ticket/12796] Add view own profile to UCP (and vice versa)
 2014-10-16 19:32:11 -07:00
Cesar G
1dbc5fc092 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13163] Check for images
  [ticket/13163] Terminate timely when no data-last links exist
  [ticket/13163] Fix responsive link lists
 2014-10-16 19:20:17 -07:00
Cesar G
6768490f69 Merge remote-tracking branch 'PayBas/ticket/13163' into develop-ascraeus 
* PayBas/ticket/13163:
  [ticket/13163] Check for images
  [ticket/13163] Terminate timely when no data-last links exist
  [ticket/13163] Fix responsive link lists
 2014-10-16 19:19:53 -07:00
Joas Schilling
819ba38a79 Merge branch 'develop-ascraeus' into develop 2014-10-15 21:15:13 +02:00
Cesar G
23a513baec [ticket/12530] Move style and class to parent <a>. 
PHPBB3-12530
 2014-10-15 10:35:13 -07:00
Joas Schilling
9b6ac5e938 Merge branch 'develop-ascraeus' into develop 2014-10-15 18:56:51 +02:00
Joas Schilling
b343bf783a Merge pull request #3037 from PayBas/ticket/13169 
[ticket/13169] Fix RTL forms in responsive mode
 2014-10-15 18:56:11 +02:00
Joas Schilling
2fbaffa561 Merge branch 'develop-ascraeus' into develop 2014-10-15 18:47:53 +02:00
Joas Schilling
8be701db0a Merge pull request #2938 from PayBas/ticket/12530 
[ticket/12530] Fix captcha challange image breaking responsive layout
 2014-10-15 18:47:45 +02:00
PayBas
205be67622 [ticket/13169] Fix RTL forms in responsive mode 
PHPBB3-13169
 2014-10-15 17:08:11 +02:00
PayBas
1a128f9a76 [ticket/12796] Use dedicated lang vars 
PHPBB3-12796
 2014-10-15 16:07:01 +02:00
PayBas
223ae1dfc2 [ticket/13163] Check for images 
PHPBB3-13163
 2014-10-15 13:06:54 +02:00
PayBas
965894a875 [ticket/12530] Combine logo and TOS link into one 
PHPBB3-12530
 2014-10-15 12:08:55 +02:00
Cesar G
f8019464c7 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13174] Add missing closing </div> to ucp_pm_viewmessage
 2014-10-14 07:33:15 -07:00
PayBas
253c6e1fc1 [ticket/12796] Add view own profile to UCP (and vice versa) 
PHPBB3-12796
 2014-10-14 10:59:03 +02:00
PayBas
9c4ba813d4 [ticket/13174] Add missing closing </div> to ucp_pm_viewmessage 
PHPBB3-13174
 2014-10-14 10:08:48 +02:00
PayBas
41d660dd98 [ticket/13163] Terminate timely when no data-last links exist 
PHPBB3-13163
 2014-10-14 00:05:22 +02:00
PayBas
36d1f87c5a [ticket/13163] Fix responsive link lists 
PHPBB3-13163
 2014-10-13 23:29:01 +02:00
Joas Schilling
7137dc387a [prep-release-3.1.0-RC5] Update version to 3.1.0-RC5 2014-10-07 21:10:14 +02:00
PayBas
757c67b7d8 [ticket/12530] Show logo and policy in responsive 
PHPBB3-12530
 2014-10-07 20:49:39 +02:00
PayBas
66ecbd8545 [ticket/12530] Fix captcha challange image breaking responsive layout 
PHPBB3-12530
 2014-10-07 18:30:20 +02:00
Joas Schilling
1ed3eb7b0b Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
 2014-10-06 22:22:05 +02:00
Jakub Senko
4193bf5641 [ticket/13025] Add button template events 
PHPBB3-13025
 2014-10-03 13:16:44 +02:00
Joas Schilling
d3ee8d24bc Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/forumlist_body.html
 2014-10-01 09:53:08 +02:00
rxu
cee8ac9dbe [ticket/13107] Add template events to forum row in forumlist_body.html 
PHPBB3-13107
 2014-09-27 09:26:35 +08:00
Joas Schilling
573c2af336 Merge branch 'develop-ascraeus' into develop 2014-09-25 22:03:01 +02:00
Jakub Senko
a1683dfb67 [ticket/13104] inline-block -> block 
PHPBB3-13104
 2014-09-25 20:07:06 +02:00
Marc Alexander
0b0e00edd7 Merge branch 'develop-ascraeus' into develop 2014-09-24 18:29:12 +02:00
Joas Schilling
b51b4c92e2 [ticket/13087] Correctly link to user profile when contact field has no URL 
Broken by 975c5655f0

PHPBB3-13087
 2014-09-24 17:33:54 +02:00
Joas Schilling
77ed437b79 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/timezone_option.html
 2014-09-24 14:49:50 +02:00
Joas Schilling
85bc9b69ae Merge pull request #2844 from marc1706/ticket/12858 
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
 2014-09-24 13:47:59 +02:00
Joas Schilling
9717d860da Merge branch 'develop-ascraeus' into develop 2014-09-24 10:34:08 +02:00
Joas Schilling
43279ee010 Merge pull request #2983 from Senky/ticket/13094 
[ticket/13094] Remove the search box if there are no new posts to search for
 2014-09-24 10:33:58 +02:00
Cesar G
b57f050d8e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12889] Fix multiple select lists
  [ticket/13082] Repair fix
  [ticket/13082] Join classes
  [ticket/13082] move style to css file
  [ticket/13082] Replace float by text-align
 2014-09-23 12:49:28 -07:00
Cesar G
f2a98339e2 Merge remote-tracking branch 'hanakin/ticket/12889' into develop-ascraeus 
* hanakin/ticket/12889:
  [ticket/12889] Fix multiple select lists
 2014-09-23 12:49:04 -07:00
Cesar G
ead5276106 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13097] Add missing unit type
 2014-09-23 10:06:33 -07:00
hanakin
fb610f99df [ticket/12889] Fix multiple select lists 
PHPBB3-12889
 2014-09-23 17:24:26 +02:00
hanakin
aa1ffc9319 [ticket/13097] Add missing unit type 
PHPBB3-13097
 2014-09-23 17:11:51 +02:00
Joas Schilling
d5691431ef Merge branch 'develop-ascraeus' into develop 2014-09-23 14:43:17 +02:00