1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 21:13:50 +01:00

15 Commits

Author SHA1 Message Date
Joas Schilling
42c062cedf Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (480 commits)
  [ticket/6723] Show info that message has been deleted before delivery
  [ticket/11385] Fix issue with migration module tool not getting extension module info
  [ticket/11386] Fix failing tests from constructor changes
  [ticket/11386] Fix circular reference error & serialize error
  [ticket/11386] Remove tests that check if finder cache is working
  [ticket/11386] Forgot to get the migration classes
  [ticket/11386] Update tests with new constructors for ext.manager/migrator
  [ticket/11386] Use finder to find migration files
  [ticket/11363] Fix to make get_module_infos get from all extensions
  [ticket/11381] Make finder able to search in all available extensions
  [ticket/11103] Revert whitespace changes
  [ticket/11103] Few more minor language things
  [ticket/11103] Don't call generate_board_url many times
  [ticket/11103] Case time in queries as an int
  [ticket/11103] Fix effectively installed check
  [ticket/11103] Remove padding from notifications for now.
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11372] Migrator should only check if effectively installed if not
  [ticket/11363] Load module info files for extensions too
  [ticket/11103] Notifications Migration file
  ...

Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/includes/mcp/mcp_queue.php
	phpBB/includes/search/fulltext_mysql.php
	phpBB/includes/search/fulltext_native.php
	phpBB/includes/search/fulltext_postgres.php
	phpBB/includes/search/fulltext_sphinx.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ajax.js
2013-03-03 20:06:52 +01:00
Vjacheslav Trushkin
3e03f95cb7 [ticket/10431] CSS3 buttons
CSS3 replacements for big buttons

PHPBB3-10431
2012-11-11 19:07:00 +01:00
Joas Schilling
03821ad2a2 [feature/soft-delete] Use a beautiful recycle icon for softdeleted topics
PHPBB3-9567
2012-11-10 12:16:45 +01:00
Joas Schilling
9300ff4c6e [feature/soft-delete] Remove imageset/ which was created by merge conflict
We don't have imagesets in 3.1 anymore.

PHPBB3-9657
2012-08-29 17:50:13 +02:00
Shibu Lijack
fa04c3712b [ticket/10734] Moved style elements and fixed minor bugs
Moved color related style elements to colours.css and other elements to
common.css
Also added an empty display for corners span.
Removed unwanted space in mcp_topic
Removed DS_Store

PHPBB-10734
2012-04-09 18:43:54 +05:30
Shibu Lijack
05cbecb558 [ticket/10734] Removed unnecessary images
Deleted the corner_left and corner_right images.

PHPBB-10734
2012-03-31 22:30:00 +05:30
Vjacheslav Trushkin
6145e0ba65 [ticket/10270] Changing close button for ajax popups
Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css

PHPBB3-10270
2012-03-31 02:10:16 +02:00
Callum Macrae
db7c4f938e [ticket/10270] Added close buttons to phpbb.alert and phpbb.confirm.
PHPBB3-10270
2012-03-31 02:09:17 +02:00
Vjacheslav Trushkin
e5daccdf33 [feature/remove-imagesets] Moving images
Removing imagesets. Moving images

PHPBB3-10336
2011-09-03 18:51:33 +03:00
Igor Wiedler
45dc1c2eff [ticket/10260] Remove the icon_fontsize.gif image (thanks Vinny)
PHPBB3-10260
2011-07-15 23:05:47 +02:00
Meik Sievertsen
2e17e448de Copy 3.0.x branch to trunk
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:14:59 +00:00
Meik Sievertsen
bf8ac19eaa Move trunk/phpBB to old_trunk/phpBB
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:13:59 +00:00
Meik Sievertsen
e85f9f79bc remove no longer necessary files... hooray
git-svn-id: file:///svn/phpbb/trunk@9221 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-24 13:14:24 +00:00
Dominik Dröscher
39f8ef287a #8669
#8745
#8762
#5417
#9525
#9568
#9574
#9577
#9640
#9641
#9644


git-svn-id: file:///svn/phpbb/trunk@7291 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-06 23:09:00 +00:00
Meik Sievertsen
f610ed82cb say hello to prosilver... YAAAYEEEE
git-svn-id: file:///svn/phpbb/trunk@7260 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-01 22:05:42 +00:00