mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
18,647 Commits 17 Branches 190 Tags
Commit Graph

18647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cesar G
403da5d38d [ticket/11280] Prevent duplicate entry in forums_track table. 
Enforcing a time limit prevents all rows from being selected, thus a new row
is inserted resulting in a duplicate entry.

PHPBB3-11280
 2013-10-16 23:56:45 -07:00
Nathan Guse
852b707b48 Merge pull request #1781 from VSEphpbb/ticket/11921 
Ticket/11921 - Streamline PMs and Notifications in Header Link List
 2013-10-16 10:50:17 -07:00
Matt Friedman
ab8ac5e284 [ticket/11921] Directly inject unread messages count into the template 
PHPBB3-11921
 2013-10-16 10:26:33 -07:00
Matt Friedman
bd58c31ee0 [ticket/11921] Only get the count of unread PMs 
PHPBB3-11921
 2013-10-16 10:08:29 -07:00
Matt Friedman
2867831232 [ticket/11921] Move any HTML for Notifications to the templates 
PHPBB3-11921
 2013-10-16 10:07:54 -07:00
Andreas Fischer
ecc756e12e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11920] Print MariaDB version after successful setup.
  [ticket/11920] Manually purge mysql-common.
  [ticket/11920] Actually call travis/setup-mariadb.sh.
 2013-10-16 02:17:11 +02:00
Nils Adermann
16ab35c1b5 Merge pull request #1782 from bantu/ticket/11920 
[ticket/11920] Actually call travis/setup-mariadb.sh.
 2013-10-15 16:34:32 -07:00
Andreas Fischer
5a481bb176 [ticket/11920] Print MariaDB version after successful setup. 
PHPBB3-11920
 2013-10-16 00:25:07 +02:00
Andreas Fischer
0f64f0edc4 [ticket/11920] Manually purge mysql-common. 
PHPBB3-11920
 2013-10-16 00:24:44 +02:00
Joas Schilling
7afff1e5bd Merge pull request #1783 from bantu/ticket/11926 
[ticket/11926] Fix plupload migration dependency.
 2013-10-15 15:04:38 -07:00
Andreas Fischer
2adbd08714 [ticket/11926] Fix plupload migration dependency. 
PHPBB3-11926
 2013-10-16 00:02:51 +02:00
Matt Friedman
457ca9c763 [ticket/11921] Remove "l_" from non-lang variables 
PHPBB3-11921
 2013-10-15 14:09:47 -07:00
Joas Schilling
3bb93ab2d3 [develop] Update version to 3.1.0-a2-dev 2013-10-15 22:46:02 +02:00
Andreas Fischer
878cb836f5 [ticket/11920] Actually call travis/setup-mariadb.sh. 
PHPBB3-11920
 2013-10-15 22:44:49 +02:00
Nils Adermann
437d38bc05 Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop 
* github-phpbb/develop-olympus:
  [ticket/11920] Have to use empty root password otherwise db creation fails.
  [ticket/11920] Add MariaDB environment to Travis-CI.

Conflicts:
	.travis.yml
 2013-10-15 13:36:42 -07:00
Nils Adermann
8131700330 Merge pull request #1780 from bantu/ticket/11920 
[ticket/11920] Add MariaDB environment to Travis-CI.
 2013-10-15 13:34:51 -07:00
Matt Friedman
8608204097 [ticket/11921] Improve appearance of PM notifications in linklist 
PHPBB3-11921
 2013-10-15 10:29:15 -07:00
Matt Friedman
9363986f43 [ticket/11921] Improve appearance of Notifications in linklist 
PHPBB3-11921
 2013-10-15 10:27:00 -07:00
Joas Schilling
3521dfc278 Merge remote-tracking branch 'p/prep-release-3.1.0-a1' into develop 
* p/prep-release-3.1.0-a1:
  [prep-release-3.1.0-a1] Update changelog with the latest changes
  [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
  [ticket/11918] Make sql_freeresult() consistent across all DB drivers
  [prep-release-3.1.0-a1] Only build packages for the latest olympus versions
  [prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changes
  [prep-release-3.1.0-a1] Update version to 3.1.0-a1
 2013-10-15 18:40:43 +02:00
Andreas Fischer
55e24eb4f8 [ticket/11920] Have to use empty root password otherwise db creation fails. 
PHPBB3-11920
 2013-10-15 16:57:16 +02:00
Andreas Fischer
cdaea7a406 [ticket/11920] Add MariaDB environment to Travis-CI. 
PHPBB3-11920
 2013-10-15 16:28:59 +02:00
Joas Schilling
a35721f68c [prep-release-3.1.0-a1] Update changelog with the latest changes release-3.1.0-a1 2013-10-15 15:46:11 +02:00
Joas Schilling
532b124115 Merge remote-tracking branch 'noxwizard/ticket/11919' into prep-release-3.1.0-a1 
* noxwizard/ticket/11919:
  [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
 2013-10-15 15:41:09 +02:00
Joas Schilling
8dc824d4b3 Merge remote-tracking branch 'noxwizard/ticket/11918' into prep-release-3.1.0-a1 
* noxwizard/ticket/11918:
  [ticket/11918] Make sql_freeresult() consistent across all DB drivers
 2013-10-15 15:39:12 +02:00
Patrick Webster
2b1ee16e4f [ticket/11919] Remove extra argument to notification manager's sql_fetchfield() 
PHPBB3-11919
 2013-10-14 21:18:41 -05:00
Patrick Webster
76ddf1ca41 [ticket/11918] Make sql_freeresult() consistent across all DB drivers 
PHPBB3-11918
 2013-10-14 16:37:23 -05:00
Joas Schilling
7a46976a78 [prep-release-3.1.0-a1] Only build packages for the latest olympus versions 2013-10-14 12:21:54 +02:00
Joas Schilling
a953a65b6c [prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changes 2013-10-14 12:08:00 +02:00
Joas Schilling
4709cbbed3 [prep-release-3.1.0-a1] Update version to 3.1.0-a1 2013-10-14 12:04:18 +02:00
Nils Adermann
40932c26ea Merge pull request #1772 from bantu/feature/plupload/integration 
[ticket/10929] Integration of Plupload
 2013-10-13 16:01:00 -07:00
Nils Adermann
5927f0dbf2 Merge pull request #1582 from bantu/feature/plupload/cron 
[ticket/10929] Cron Job for Plupload Upload Directory Cleaning
 2013-10-13 16:00:43 -07:00
Nils Adermann
b9ca3dc354 Merge pull request #1581 from bantu/feature/plupload/deps 
[ticket/10929] Plupload dependencies
 2013-10-13 16:00:33 -07:00
Fyorl
9f1c627988 [feature/plupload/integration] Add missing javascript file. 
PHPBB3-10929
 2013-10-14 00:52:37 +02:00
Nils Adermann
5f82eccc44 Merge pull request #1776 from bantu/ticket/11913 
[ticket/11913] Better download.phpbb.com directory structure for phpBB 3...
 2013-10-13 15:22:01 -07:00
Andreas Fischer
7e96b663f1 [ticket/11913] Better download.phpbb.com directory structure for phpBB 3.1+ 
PHPBB3-11913
 2013-10-14 00:15:10 +02:00
David King
1769135eaf Merge pull request #1766 from bantu/ticket/11621 
[ticket/11621] Improve MySQL fulltext search indexes
 2013-10-13 13:45:41 -07:00
Andreas Fischer
6ccceca064 [ticket/11621] Add explanation to mysql_fulltext_drop. 
PHPBB3-11621
 2013-10-13 14:25:28 +02:00
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload 
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
 2013-10-11 17:40:16 +02:00
Andreas Fischer
4c56080608 [ticket/11621] Correct GPLv2 link in file header. 
PHPBB3-11621
 2013-10-11 16:02:56 +02:00
Andreas Fischer
beda12c055 [feature/plupload/cron] Namespacification 
PHPBB3-10929
 2013-10-11 15:53:22 +02:00
Dhruv
6bf03cc48c Merge remote-tracking branch 'bantu/ticket/11908' into develop 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11908:
  [ticket/11908] Namespacify phpbb_auth_provider_oauth_service_exception.
 2013-10-11 19:18:17 +05:30
Andreas Fischer
67530d132a [feature/plupload/cron] Add cronjob for cleaning plupload temporary directory. 
PHPBB3-10929
 2013-10-11 15:48:04 +02:00
Andreas Fischer
d310c17c7f [ticket/11908] Namespacify phpbb_auth_provider_oauth_service_exception. 
PHPBB3-11908
 2013-10-11 14:52:07 +02:00
Dhruv
659236a32f Merge remote-tracking branch 'nickvergessen/ticket/11906' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11906:
  [ticket/11906] Fix namespace issues in prune_notifications
  [ticket/11906] Add notification purge cron to cron tasks
  [ticket/11906] Add missing configs from notifications cron to schema_data.sql
 2013-10-11 17:57:16 +05:30
Andreas Fischer
a049c4f0af [ticket/11621] Put mysql_fulltext_drop into alpha1 migration. 
PHPBB3-11621
 2013-10-11 14:16:58 +02:00
Andreas Fischer
cab660f909 Merge remote-tracking branch 'phpbb/develop' into ticket/11621 
* phpbb/develop:
  [ticket/11867] Schema files are not created by create_schema_files.php
  [ticket/11905] 3.1.0-a1 Migration
  [ticket/11903] Speed up paging test
  [ticket/11703] Extend the correct migration class.
  [ticket/11874] Correct when $phpbb_root_path is appended to build_url()
  [ticket/11703] Also use empty() for T_JQUERY_LINK.
  [ticket/11703] Add effectively_installed().
  [ticket/11703] Make jQuery CDN switch more generic.
  [ticket/11874] Fix tests
  [ticket/11874] Do not always prepend the web path; only replace phpbb_root_path
  [ticket/11345] Don't include scheme, so HTTPS is used where necessary.
  [ticket/11345] Wrap remote webfonts in S_ALLOW_CDN.
  [ticket/11345] Move css import to template
  [ticket/11345] Add Droid Sans as fallback font
  [ticket/11345] Change font for buttons
 2013-10-11 14:15:46 +02:00
Andreas Fischer
a30f1729d8 [ticket/11621] Use effectively_installed() instead. 
PHPBB3-11621
 2013-10-11 14:09:29 +02:00
Joas Schilling
9e0fd29820 [ticket/11906] Fix namespace issues in prune_notifications 
PHPBB3-11906
 2013-10-11 13:56:00 +02:00
Dhruv
2198c29c20 Merge remote-tracking branch 'nickvergessen/ticket/11867' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11867:
  [ticket/11867] Schema files are not created by create_schema_files.php
 2013-10-11 15:58:35 +05:30
Joas Schilling
698a2236a5 [ticket/11867] Schema files are not created by create_schema_files.php 
PHPBB3-11867
 2013-10-11 11:59:28 +02:00