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

23865 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nils Adermann
e64c1b463e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
 2014-09-30 14:00:25 +02:00
Nils Adermann
f1ab6f31a1 Merge pull request #3003 from nickvergessen/ticket/13117 
[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
 2014-09-30 14:00:02 +02:00
Joas Schilling
bc24c78e06 [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql 
Unintended change from 95ab4b3e93

PHPBB3-13117
 2014-09-29 20:48:47 +02:00
Nils Adermann
8de97b8dbe Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13113] Updates the base url only when the front-end isn't app.php
 2014-09-29 16:17:25 +02:00
Nils Adermann
6f093ade8a Merge pull request #3001 from Nicofuma/ticket/13113 
[ticket/13113] Updates the base url only when the front-end isn't app.php
 2014-09-29 16:16:30 +02:00
Tristan Darricau
a159899d02 [ticket/13113] Updates the base url only when the front-end isn't app.php 
PHPBB3-13113
 2014-09-28 23:32:56 +02:00
Joas Schilling
573c2af336 Merge branch 'develop-ascraeus' into develop 2014-09-25 22:03:01 +02:00
Joas Schilling
71ac6ab2b8 Merge pull request #2996 from Senky/ticket/13104 
[ticket/13104] Responsive tabs display bug in IE11
 2014-09-25 22:02:23 +02:00
Andreas Fischer
b703d1e8df Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
  [ticket/13105] Add a test for relative dates
 2014-09-25 21:52:53 +02:00
Andreas Fischer
be769d4ca6 Merge pull request #2995 from nickvergessen/ticket/13105 
[ticket/13105] Future relative dates are always displayed as "Tomorrow"

* nickvergessen/ticket/13105:
  [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
  [ticket/13105] Add a test for relative dates
 2014-09-25 21:52:53 +02:00
Andreas Fischer
a3e910f23f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
 2014-09-25 21:47:28 +02:00
Andreas Fischer
e802c5f082 Merge pull request #2997 from Senky/ticket/13106 
[ticket/13106] Remove the \phpbb\di\pass\kernel_pass class

* Senky/ticket/13106:
  [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
 2014-09-25 21:47:28 +02:00
Jakub Senko
f64373a29f [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php 
PHPBB3-13106
 2014-09-25 20:12:33 +02:00
Jakub Senko
a1683dfb67 [ticket/13104] inline-block -> block 
PHPBB3-13104
 2014-09-25 20:07:06 +02:00
Joas Schilling
e803efc6fc [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow" 
PHPBB3-13105
 2014-09-25 18:09:32 +02:00
Joas Schilling
459c62b339 [ticket/13105] Add a test for relative dates 
PHPBB3-13105
 2014-09-25 18:09:24 +02:00
Andreas Fischer
c55a666347 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13086] String replaces 50 with 20
 2014-09-24 21:24:42 +02:00
Andreas Fischer
1b3109d650 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13086] String replaces 50 with 20

Conflicts:
	phpBB/language/en/acp/email.php
 2014-09-24 21:24:29 +02:00
Andreas Fischer
ce0c33f62a Merge pull request #2994 from Skouat/ticket/13086-olympus 
[ticket/13086] Update ACP_MASS_EMAIL_EXPLAIN language key

* Skouat/ticket/13086-olympus:
  [ticket/13086] String replaces 50 with 20
 2014-09-24 21:21:53 +02:00
Mario Skouat
077db77259 [ticket/13086] String replaces 50 with 20 
PHPBB3-13086
 2014-09-24 19:03:33 +02:00
Marc Alexander
0b0e00edd7 Merge branch 'develop-ascraeus' into develop 2014-09-24 18:29:12 +02:00
Marc Alexander
30e1d29f58 Merge pull request #2993 from nickvergessen/ticket/13087 
[ticket/13087] Correctly link to user profile when contact field has no URL
 2014-09-24 18:27:37 +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
cb92b4668e Merge branch 'develop-ascraeus' into develop 2014-09-24 12:26:21 +02:00
Joas Schilling
f3fef8934e Merge pull request #2954 from rxu/ticket/13055 
[ticket/13055] Fix string profile fields validation to support unicode
 2014-09-24 12:25:57 +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
Andreas Fischer
a437c8fdfd Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.
 2014-09-23 23:34:03 +02:00
Andreas Fischer
d5128b3e87 Merge pull request #2988 from prototech/ticket/13011 
[ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.

* prototech/ticket/13011:
  [ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.
 2014-09-23 23:34:03 +02:00
Andreas Fischer
138d320960 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13048] Only do not update the session page for ajax requests
 2014-09-23 23:29:52 +02:00
Andreas Fischer
9feb7096ee Merge pull request #2985 from nickvergessen/ticket/13048 
[ticket/13048] Only do not update the session page for ajax requests

* nickvergessen/ticket/13048:
  [ticket/13048] Only do not update the session page for ajax requests
 2014-09-23 23:29:52 +02:00
Andreas Fischer
f20e3e9feb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13070] Use old 'template' class for template class hook
 2014-09-23 23:25:59 +02:00
Andreas Fischer
34aad4046f Merge pull request #2982 from marc1706/ticket/13070 
[ticket/13070] Use old 'template' class for template class hook

* marc1706/ticket/13070:
  [ticket/13070] Use old 'template' class for template class hook
 2014-09-23 23:25:59 +02:00
Andreas Fischer
cdd36f3243 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13096] Add phpbb_ prefix to ldap_escape()
 2014-09-23 22:55:24 +02:00
Andreas Fischer
80f15a41c4 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13096] Add phpbb_ prefix to ldap_escape()

Conflicts:
	phpBB/includes/auth/auth_ldap.php
 2014-09-23 22:55:13 +02:00
Andreas Fischer
2f773fca18 Merge pull request #2989 from Senky/ticket/13096 
[ticket/13096] ldap_escape() added to PHP 5.6.0

* Senky/ticket/13096:
  [ticket/13096] Add phpbb_ prefix to ldap_escape()
 2014-09-23 22:54:27 +02:00
Jakub Senko
ba464ec93a [ticket/13096] Add phpbb_ prefix to ldap_escape() 
PHPBB3-13096
 2014-09-23 22:43:52 +02:00
Cesar G
80d5a1ec1f [ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars. 
PHPBB3-13011
 2014-09-23 12:56:20 -07: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
2478eef550 Merge remote-tracking branch 'Senky/ticket/13082' into develop-ascraeus 
* Senky/ticket/13082:
  [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:48:23 -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
Cesar G
7307380091 Merge remote-tracking branch 'hanakin/ticket/13097' into develop-ascraeus 
* hanakin/ticket/13097:
  [ticket/13097] Add missing unit type
 2014-09-23 10:06:00 -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
c4428a507a Merge branch 'develop-ascraeus' into develop 2014-09-23 15:32:22 +02:00
Joas Schilling
ef9e0e743a Merge pull request #2937 from Senky/ticket/13027 
[ticket/13027] PM folder full percentage could be a bit more accurate
 2014-09-23 15:32:14 +02:00
Joas Schilling
820db008ff [ticket/13048] Only do not update the session page for ajax requests 
The session time still needs to be updated, so e.g. long upload times
with PLupload stop the session from timing out.

PHPBB3-13048
 2014-09-23 15:25:40 +02:00