mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
19,731 Commits 17 Branches 190 Tags
Commit Graph

19731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cesar G
d002d31b86 [ticket/12160] Add function to check if phpBB is installed. 
PHPBB3-12160
 2014-02-15 17:09:13 -08:00
Andreas Fischer
ccf12ba166 Merge pull request #1964 from prototech/ticket/12136 
[ticket/12136] Use new pagination class in generate_smilies().

* prototech/ticket/12136:
  [ticket/12136] Use new pagination class in generate_smilies().
 2014-02-15 02:35:19 +01:00
Nils Adermann
06581ba927 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12188] Add php 5.6 to travis enviroments

Conflicts:
	.travis.yml
 2014-02-13 15:43:31 +01:00
Nils Adermann
f245198652 Merge remote-tracking branch 'github-nickvergessen/ticket/12188' into develop-olympus 
* github-nickvergessen/ticket/12188:
  [ticket/12188] Add php 5.6 to travis enviroments
 2014-02-13 15:42:50 +01:00
Joas Schilling
9d1d90e336 [ticket/12188] Add php 5.6 to travis enviroments 
PHPBB3-12188
 2014-02-13 14:47:51 +01:00
Cesar G
13e7bd76a5 Merge remote-tracking branch 'vinny/ticket/12134' into develop 
* vinny/ticket/12134:
  [ticket/12134] Add ucp_pm_viewmessage_print_head_append event to subsilver2
 2014-02-12 18:39:39 -08:00
Cesar G
965b3365fe Merge remote-tracking branch 'vinny/ticket/12132' into develop 
* vinny/ticket/12132:
  [ticket/12132] Add the event to events.md doc
  [ticket/12132] Add viewtopic_print_head_append event to subsilver2
 2014-02-12 18:38:40 -08:00
Joas Schilling
75fa467b7b Merge remote-tracking branch 'bantu/ticket/12180' into develop 
* bantu/ticket/12180:
  [ticket/12180] Add "Each file MUST end with exactly one newline character" rule
 2014-02-12 22:12:30 +01:00
Andreas Fischer
0888df9520 Merge pull request #2026 from nickvergessen/ticket/12184 
[ticket/12184] Fix undefined variable tpl_fields in profile field manager

* nickvergessen/ticket/12184:
  [ticket/12184] Fix undefined variable tpl_fields in profile field manager
 2014-02-11 20:04:22 +01:00
Joas Schilling
30fbaab8de [ticket/12184] Fix undefined variable tpl_fields in profile field manager 
PHPBB3-12184
 2014-02-11 19:17:24 +01:00
Nils Adermann
0b2b76f951 Merge pull request #2010 from nickvergessen/ticket/12169 
Ticket/12169  Convert location user field to profile field
 2014-02-11 02:18:16 +01:00
Joas Schilling
5550f0fa87 [ticket/12169] Split mode==headline into it's own function 
PHPBB3-12169
 2014-02-10 19:04:10 +01:00
Joas Schilling
995019a992 [ticket/12169] Add new option to display profile fields on memberlist 
PHPBB3-12169
 2014-02-10 16:28:21 +01:00
Joas Schilling
3c46aeb005 [ticket/12169] Allow displaying profile fields on memberlist 
We can not sort by profile field values atm. And also I'm not sure
whether this is possible at all.

PHPBB3-12169
 2014-02-10 15:58:55 +01:00
Andreas Fischer
1e86f71133 [ticket/12180] Add "Each file MUST end with exactly one newline character" rule 
PHPBB3-12180
 2014-02-10 15:01:50 +01:00
Joas Schilling
6bee91c429 [ticket/12169] Convert user_from to profile field location 
Missing changes on memberlist view due to missing functionality

PHPBB3-12169
 2014-02-10 14:38:43 +01:00
Joas Schilling
b088bf864b Merge remote-tracking branch 'Marc/ticket/12170' into develop 
* Marc/ticket/12170:
  [ticket/12170] Test for 12170
  [ticket/12170] Assign schema keys in migration helper with data_depth 1
 2014-02-10 14:23:09 +01:00
Nils Adermann
840ab75520 Merge pull request #1988 from nickvergessen/ticket/12115 
[ticket/12115] Convert occupation profile field to custom field
 2014-02-10 13:52:12 +01:00
Andreas Fischer
02674de893 Merge pull request #2022 from nickvergessen/ticket/12175 
Ticket/12175 Fix and run functional upload tests

* nickvergessen/ticket/12175:
  [ticket/12175] Do not use admin account for file size limit test
  [ticket/12175] Fix test for uploading a valid file
  [ticket/12175] Fix upload test for empty file
 2014-02-10 02:16:27 +01:00
Joas Schilling
1fdd01275e [ticket/12175] Do not use admin account for file size limit test 
PHPBB3-12175
 2014-02-09 23:48:34 +01:00
Joas Schilling
07f19647f4 [ticket/12175] Fix test for uploading a valid file 
PHPBB3-12175
 2014-02-09 23:47:20 +01:00
Joas Schilling
ff57ecf0bc [ticket/12175] Fix upload test for empty file 
PHPBB3-12175
 2014-02-09 23:45:41 +01:00
Andreas Fischer
eb2d8fe6d8 Merge pull request #2017 from nickvergessen/ticket/12141 
[ticket/12141] Disable opcache on travis for php 5.5.8 aswell

* nickvergessen/ticket/12141:
  [ticket/12141] Disable opcache on travis for php 5.5.8 aswell
 2014-02-08 14:00:30 +01:00
Joas Schilling
81c6ca7e4c [ticket/12141] Disable opcache on travis for php 5.5.8 aswell 
PHPBB3-12141
 2014-02-08 12:52:22 +01:00
Marc Alexander
9b1b6bd477 Merge remote-tracking branch 'exreaction/ticket/12170' into ticket/12170 2014-02-07 22:35:04 +01:00
Nathan Guse
344fde7f06 [ticket/12170] Test for 12170 
PHPBB3-12170
 2014-02-07 14:37:45 -06:00
Marc Alexander
e8f8dcf0ea [ticket/12170] Assign schema keys in migration helper with data_depth 1 
The migration helper currently drops any keys with schema changes that have
the data_depth 1. This change will correctly assign the keys to the steps
array without dropping the keys that might contain important info like the
actual table that should be created.

PHPBB3-12170
 2014-02-07 21:13:50 +01:00
Joas Schilling
4663ea7c82 [ticket/12115] Remove space from line ending 
PHPBB3-12115
 2014-02-06 14:18:30 +01:00
Joas Schilling
26640bad3d [ticket/12115] Add migration file to remove old user columns 
PHPBB3-12115
 2014-02-06 11:32:13 +01:00
Joas Schilling
190301021b [ticket/12115] Use base class to reduce duplicate code 
PHPBB3-12115
 2014-02-06 11:32:12 +01:00
Joas Schilling
c2cf294be5 [ticket/12115] Add a new migration for profilefield_interests 
With this we avoid missing to copy one, when the admin already created
a phpbb_* profile field.

PHPBB3-12115
 2014-02-06 11:32:12 +01:00
Joas Schilling
bbada27ee9 [ticket/12115] Also port user interests to profile fields 
PHPBB3-12115
 2014-02-06 11:32:11 +01:00
Joas Schilling
0ad726768c [ticket/12115] Remove old language strings 
PHPBB3-12115
 2014-02-06 11:32:09 +01:00
Joas Schilling
8dab016a7b [ticket/12115] Add methods to interface 
PHPBB3-12115
 2014-02-06 11:32:09 +01:00
Joas Schilling
f97d268a79 [ticket/12115] Translate profile field name before displaying it in errors 
PHPBB3-12115
 2014-02-06 11:32:08 +01:00
Joas Schilling
38608bfa62 [ticket/12115] Remove occupation field from html files 
PHPBB3-12115
 2014-02-06 11:32:07 +01:00
Joas Schilling
7d04961919 [ticket/12115] Add language entries for the profile fields 
PHPBB3-12115
 2014-02-06 11:32:06 +01:00
Joas Schilling
3c640e57c5 [ticket/12115] Convert user occupation to a profile field 
PHPBB3-12115
 2014-02-06 11:32:06 +01:00
Joas Schilling
344baf9180 Merge branch 'prep-release-3.1.0-a3' into develop 2014-02-05 22:25:45 +01:00
Joas Schilling
bf93e20afb [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development 2014-02-05 22:23:33 +01:00
Nils Adermann
32bc5d72e4 Merge pull request #1995 from EXreaction/ticket/11880 
Schema changes can take too long and cause a timeout
 2014-02-05 17:52:17 +01:00
Nathan Guse
be28445b66 [ticket/11880] migration helper file 
PHPBB3-11880
 2014-02-05 10:00:01 -06:00
Joas Schilling
11d5f49adb [prep-release-3.1.0-a3] Commit changelog for 3.1.0-a3 release-3.1.0-a3 2014-02-05 16:58:05 +01:00
Nathan Guse
38eb6b0e13 [ticket/11880] Move get_schema_steps function to a migrator helper class 
PHPBB3-11880
 2014-02-05 09:57:36 -06:00
Joas Schilling
36c41d8848 [prep-release-3.1.0-a3] Prepare Changelog 2014-02-05 16:55:21 +01:00
Joas Schilling
7f70a73634 [prep-release-3.1.0-a3] Add migration for 3.1.0-a3 2014-02-05 16:55:21 +01:00
Joas Schilling
127c0c4493 [prep-release-3.1.0-a3] Update version to 3.1.0-a3 2014-02-05 16:55:21 +01:00
Andreas Fischer
0b6b7fc486 Merge pull request #2004 from prototech/ticket/12163 
[ticket/12163] Use posts_per_page to calculate current page in viewtopic.php

* prototech/ticket/12163:
  [ticket/12163] Use posts_per_page to calculate current page in viewtopic.php
 2014-02-04 17:40:57 +01:00
Cesar G
32ddbf374f [ticket/12163] Use posts_per_page to calculate current page in viewtopic.php 
PHPBB3-12163
 2014-02-04 07:15:15 -08:00
Nils Adermann
f5f6b834f8 [develop] Remove left over conflict marker from merge 1a31f03 2014-02-04 16:01:49 +01:00