mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-18 02:06:12 +02:00
Code Issues Releases Wiki Activity
24,061 Commits 10 Branches 193 Tags
b22650d3236e98ac4f3cb79167f54fe508112238
Commit Graph

20562 Commits

Author SHA1 Message Date
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
Joas Schilling
7de0e17711 Merge branch 'develop-ascraeus' into develop 2014-10-15 18:31:55 +02:00
Joas Schilling
90771c1762 Merge pull request #3024 from marc1706/ticket/13124 
[ticket/13124] Also trim spaces in front of comments except for first line
 2014-10-15 18:31:46 +02:00
Joas Schilling
e64c2b275d Merge branch 'develop-ascraeus' into develop 2014-10-15 18:29:43 +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
5c54e96aab [ticket/13177] Fix display of post count-based ranks in viewtopic. 
PHPBB3-13177
 2014-10-14 15:24:57 -07: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
4bdae294cb [ticket/12796] Use &amp; in path 
PHPBB3-12796
 2014-10-14 12:58:07 +02: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
9d6cef2225 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-10-07 22:12:37 +02:00
Joas Schilling
eed4d0d30f [prep-release-3.1.0-RC5] Update phpBB Version for RC6 development 2014-10-07 22:10:45 +02:00
Joas Schilling
366451c11c [prep-release-3.1.0-RC5] Add changelog for 3.1.0-RC5 2014-10-07 21:16:34 +02:00
Joas Schilling
9d13b91f46 [prep-release-3.1.0-RC5] Prepare Changelog 2014-10-07 21:14:55 +02:00
Joas Schilling
7f692e7b28 [prep-release-3.1.0-RC5] Add migration for 3.1.0-RC5 2014-10-07 21:12:06 +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
Andreas Fischer
10e99b018a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file
 2014-10-07 20:30:40 +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
34a9ed3587 [ticket/13137] Improve output of create_schema_files.php 
PHPBB3-13137
 2014-10-07 17:17:59 +02:00
Joas Schilling
4fe95d6870 [ticket/13137] Generate the schema when the schema.json file is not available 
PHPBB3-13137
 2014-10-07 14:55:08 +02:00
Joas Schilling
943f2e1a7b [ticket/13137] Remove schema.json file 
PHPBB3-13137
 2014-10-07 14:55:05 +02:00
Nils Adermann
c8c50b3c89 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13136] Update schema.json with latest changes
 2014-10-07 13:58:12 +02:00
Joas Schilling
7bd5c793bb [ticket/13136] Update schema.json with latest changes 
PHPBB3-13136
 2014-10-07 13:14:33 +02:00
Joas Schilling
202e43b11b Merge branch 'develop-ascraeus' into develop 2014-10-07 11:42:05 +02:00
Joas Schilling
61601a052c Merge pull request #2942 from Senky/ticket/12489 
[ticket/12489] Description for Contact link in custom profile fields
 2014-10-07 11:41:47 +02:00
Jakub Senko
0c0024497d [ticket/12489] Language correction 
PHPBB3-12489
 2014-10-07 10:24:30 +02:00
Andreas Fischer
441db59db0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12987] Cleanup the services.yml file

Conflicts:
	phpBB/config/services.yml
 2014-10-07 00:52:00 +02:00
Andreas Fischer
46a9e5657f Merge pull request #3002 from Nicofuma/ticket/12987 
[ticket/12987] Cleanup the services.yml file

* Nicofuma/ticket/12987:
  [ticket/12987] Cleanup the services.yml file
 2014-10-07 00:51:11 +02:00
Joas Schilling
1fa0c861b7 Merge branch 'develop-ascraeus' into develop 2014-10-06 23:45:18 +02:00
Joas Schilling
4b90357d79 Merge pull request #2307 from PayBas/ticket/12408 
[ticket/12408] Add quick setting for "default guest style" to ACP
 2014-10-06 23:43:27 +02:00
Andreas Fischer
01e200d49a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13077] Move extension module to the top of the Customise tab
 2014-10-06 23:35:35 +02:00
Andreas Fischer
38ac0bcc8e Merge pull request #2991 from nickvergessen/ticket/13077 
[ticket/13077] Move extension module to the top of the Customise tab

* nickvergessen/ticket/13077:
  [ticket/13077] Move extension module to the top of the Customise tab
 2014-10-06 23:35:35 +02:00
Joas Schilling
8d9e6653b4 Merge branch 'develop-ascraeus' into develop 2014-10-06 23:21:35 +02:00
Joas Schilling
f3eaf6fe04 Merge pull request #3016 from Nicofuma/ticket/11224-ascraeus 
[ticket/11224][ascraeus] SQL cache destroy does not destroy queries to tables joined
 2014-10-06 23:21:13 +02:00
Joas Schilling
af530b65ce Merge branch 'develop-ascraeus' into develop 2014-10-06 22:38:12 +02:00