Marc Alexander
87446452f5
Merge branch '3.1.x'
2015-11-12 08:46:09 +01:00
Marc Alexander
13133b359b
Merge pull request #4022 from RMcGirr83/3.1.x
...
[ticket/14276] Adjust function get_folder_status
2015-11-12 08:46:05 +01:00
brunoais
335be2e59f
[feature/sql-bool-builder] Fixing typos in previous commit
...
PHPBB3-13652
2015-11-12 06:52:34 +00:00
Marc Alexander
a11b900de4
[ticket/14284] Correctly remove link to first unread post
...
PHPBB3-14284
2015-11-11 17:19:10 +01:00
brunoais
9725f5757e
[feature/sql-bool-builder] Changing syntax pt3. Don't use magic numbers
...
PHPBB3-13652
2015-11-11 08:38:38 +00:00
brunoais
bb260f02e0
[feature/sql-bool-builder] Changing syntax
...
Changing the syntax used to the one Nicofuma suggested.
PHPBB3-13652
2015-11-11 08:38:37 +00:00
Michael Miday
34cf357599
[ticket/14229] fix inline-block link on row-item
...
PHPBB3-14229
2015-11-11 09:26:51 +01:00
Michael Miday
39f1c24af9
[ticket/14229] fix paging spacing
...
PHPBB3-14229
2015-11-11 09:26:51 +01:00
Michael Miday
c3c41d409b
[ticket/14229]Responsive changes to topic paging
2015-11-11 09:26:50 +01:00
Michael Miday
0e22521aab
[ticket/14229]topictitle should be inline
...
PHPBB3-14229
2015-11-11 09:26:50 +01:00
Máté Bartus
6806c20bce
Merge pull request #4025 from marc1706/ticket/14280
...
[ticket/14280] Add missing language strings for version check
2015-11-10 19:18:50 +01:00
Marc Alexander
fc1008f6a3
Merge branch '3.1.x'
2015-11-10 17:40:41 +01:00
Marc Alexander
1c1fe43e16
Merge pull request #3930 from rxu/ticket/14201
...
[ticket/14201] Add multiple ACP template events
2015-11-10 17:40:04 +01:00
Marc Alexander
a1abf8253f
[ticket/14281] Correctly pass parameters to add_error_message
...
PHPBB3-14281
2015-11-10 16:49:30 +01:00
Marc Alexander
079b3d074d
[ticket/14281] Fix installer CLI after recent changes
...
PHPBB3-14281
2015-11-10 15:01:18 +01:00
Marc Alexander
fd6c28f103
[ticket/14280] Add missing language strings for version check
...
PHPBB3-14280
2015-11-10 12:00:30 +01:00
Marc Alexander
966c34d0ad
[ticket/14271] Properly use try_files in nginx sample config
...
PHPBB3-14271
2015-11-10 08:32:51 +01:00
Tristan Darricau
67f43b1a06
[prep-release-3.2.0-a1] Add changelog for 3.2.0-a1
2015-11-09 20:24:46 +01:00
Tristan Darricau
2144f35e9d
[prep-release-3.2.0-a1] Add migration for 3.2.0-a1
2015-11-09 20:20:26 +01:00
Tristan Darricau
f8236cc907
[prep-release-3.2.0-a1] Update version to 3.2.0-a1
2015-11-09 20:20:26 +01:00
Marc Alexander
d77455309b
[ticket/14278] Check if user_id is set and fall back to ANONYMOUS
...
PHPBB3-14278
2015-11-09 18:23:38 +01:00
Marc Alexander
b27be0b857
[ticket/14271] Improve try_files and use split path info
...
PHPBB3-14271
2015-11-09 09:26:05 +01:00
Mate Bartus
671598656c
[ticket/14277] Fix CS
...
PHPBB3-14277
2015-11-09 09:15:17 +01:00
Mate Bartus
d04c7687c0
[ticket/14277] Use user_id if available
...
PHPBB3-14277
2015-11-09 09:11:03 +01:00
Mate Bartus
e02432ec82
[ticket/14277] Fix undefined index error in migrations
...
PHPBB3-14277
2015-11-08 22:11:14 +01:00
Mate Bartus
8d178f15f0
[ticket/14270] Purge cache when the installer is finished
...
PHPBB3-14270
2015-11-08 18:09:04 +01:00
Marc Alexander
c99386e155
[ticket/14272] Remove useless check
...
PHPBB3-14272
2015-11-08 13:11:16 +01:00
Oliver Schramm
900ccd79af
[ticket/14257] Fix CLI reparser and set cron interval
...
PHPBB3-14257
2015-11-08 03:29:37 +01:00
Richard McGirr
865c16cf26
[ticket/14276] Adjust function get_folder_status
...
PHPBB3-14276
2015-11-07 15:33:24 -05:00
Marc Alexander
d8760568b6
Merge pull request #4019 from prototech/ticket/14273
...
[ticket/14273] Remove unused core.root_path dependency in files.upload service
2015-11-06 21:47:05 +01:00
Oliver Schramm
022c271caf
Merge pull request #4020 from VSEphpbb/ticket/14274
...
[ticket/14274] Include user functions during installer
2015-11-06 18:36:17 +01:00
Oliver Schramm
fbb9f8859a
Merge branch '3.1.x'
...
Conflicts:
phpBB/includes/acp/acp_captcha.php
2015-11-06 13:28:24 +01:00
Oliver Schramm
854ee0b04d
Merge pull request #3975 from prototech/ticket/11971
...
[ticket/11971] Validate "Spambot countermeasures" settings before saving
2015-11-06 12:06:47 +01:00
Marc Alexander
685449bfe3
[ticket/14272] Fix invalid or missing min/max settings
...
PHPBB3-14272
2015-11-06 10:31:56 +01:00
Marc Alexander
be5a40f6a9
[ticket/14272] Assign min/max for all allowed types
...
PHPBB3-14272
2015-11-06 10:25:31 +01:00
Marc Alexander
aca6e64669
[ticket/14272] Only use maxlength and size for allowed input elements
...
PHPBB3-14272
2015-11-06 10:20:05 +01:00
Matt Friedman
50d102c975
[ticket/14274] Include user functions during installer
...
PHPBB3-14274
2015-11-05 16:32:19 -08:00
Cesar G
a92083169a
[ticket/14273] Remove unused core.root_path dependency in files.upload service
...
PHPBB3-14273
2015-11-05 13:52:04 -08:00
Máté Bartus
402f36e42d
Merge pull request #4010 from Elsensee/ticket/14264
...
[ticket/14264] Don't use constants as return values
2015-11-05 21:43:00 +01:00
Marc Alexander
27e95864a8
[ticket/14271] Update sample config
...
PHPBB3-14271
2015-11-05 16:55:19 +01:00
RMcGirr83
ffc4b5a6df
[ticket/12649] Fix buttons css file
...
PHPBB3-12649
2015-11-04 13:14:22 -05:00
RMcGirr83
32d6d2a94e
[ticket/12649] Restore missing css and fix html file
...
PHPBB3-12649
2015-11-04 13:11:15 -05:00
RMcGirr83
b0660c47df
Merge remote-tracking branch 'origin/ticket_12649' into ticket_12649
2015-11-04 11:05:51 -05:00
RMcGirr83
de984caf98
Merge remote-tracking branch 'origin/ticket_12649' into ticket_12649
...
PHPBB3-12649
2015-11-04 11:05:25 -05:00
RMcGirr83
f518a57d0d
[ticket/12649] Fix bidi.css
...
PHPBB3-12649
2015-11-03 14:48:06 -05:00
RMcGirr83
9a4e998f70
[ticket/12649] Change sort & display options in footers to dropdown menu
...
PHPBB3-12649
2015-11-03 14:48:05 -05:00
Tristan Darricau
c783c37c73
Merge pull request #3995 from CHItA/ticket/14044
...
[ticket/14044] Deduplicate the installers
* CHItA/ticket/14044:
[ticket/14044] Add config as global in notify user
[ticket/14044] Fix language selection data loss
[ticket/14044] Patch language::set_fallback_array()
[ticket/14044] Fix tests
[ticket/14044] Fix wrong descriptions in install
[ticket/14044] Solve missing email template error
[ticket/14044] global $table_prefix in constants.php
[ticket/14044] Try to fix missing table prefix
[ticket/14044] Use the correct language file version
[ticket/14044] Automatically trigger rollback on insert in transaction
[ticket/14044] Use empty instead of !count
[ticket/14044] Fix Sqlite error in tests
[ticket/14044] Deduplicate the installers
2015-11-03 20:35:24 +01:00
Oliver Schramm
2016550a32
[ticket/14264] Don't use constants as return values
...
This will prevent BC breaking in the future if we decide to
get rid of constants.
PHPBB3-14264
2015-11-03 16:35:53 +01:00
Marc Alexander
8b7f711a18
Merge branch '3.1.x'
2015-11-03 09:36:43 +01:00
Marc Alexander
8dbf3976fd
Merge pull request #4012 from RMcGirr83/ticket_14228
...
[ticket/14228] Vertical align of numbers in polls
2015-11-03 09:36:14 +01:00
