aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [task/restore-subsilver2] Reapply commit 6221ba4Andreas Fischer2010-08-201-1/+1
* [task/restore-subsilver2] Reapply commit 9e24993Joas Schilling2010-08-201-0/+3
* [task/restore-subsilver2] Reapply commit b6df5bdJoas Schilling2010-08-201-0/+1
* [task/restore-subsilver2] Revert removing subsilver2 for Ascraeus development.Nils Adermann2010-08-20198-1/+9410
* Merge branch 'feature/naderman/auto-loading' into developAndreas Fischer2010-08-203-1/+13
|\
| * [feature/auto-loading] Only check subdir if there is another name part.Nils Adermann2010-08-193-1/+13
* | Merge branch 'develop-olympus' into developAndreas Fischer2010-07-124-2/+9
|\ \
| * \ Merge branch 'ticket/nickvergessen/9531' into develop-olympusAndreas Fischer2010-07-126-4/+16
| |\ \
| | * | [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"Joas Schilling2010-07-116-4/+16
| * | | Merge branch 'ticket/adamreyher/9012' into develop-olympusAndreas Fischer2010-07-111-0/+1
| |\ \ \
| | * | | [ticket/9012] Adjust shadow topic title to the title at the time it was moved.Adam Reyher2010-07-111-0/+1
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-07-1115-36/+77
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ticket/jellydoughnut/9637' into develop-olympusAndreas Fischer2010-07-1110-25/+52
| |\ \ \ \
| | * | | | [ticket/9637] Do not cache SQL server version in all casesJosh Woody2010-07-1110-25/+52
| * | | | | Merge branch 'ticket/jellydoughnut/9629' into develop-olympusAndreas Fischer2010-07-112-8/+15
| |\ \ \ \ \
| | * | | | | [ticket/9629] Allow style.php to retrieve its session ID from cookiesJosh Woody2010-07-112-8/+15
| |/ / / / /
| * | | | | Merge branch 'ticket/nickvergessen/9678' into develop-olympusAndreas Fischer2010-07-101-2/+2
| |\ \ \ \ \
| | * | | | | [ticket/9678] Flash attachments are not displayed in subsilver2.Joas Schilling2010-07-081-2/+2
| * | | | | | Merge branch 'ticket/nickvergessen/9677' into develop-olympusAndreas Fischer2010-07-101-0/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.Joas Schilling2010-07-081-0/+1
| | |/ / / / /
| * | | | | | Merge branch 'ticket/jellydoughnut/9650' into develop-olympusAndreas Fischer2010-07-103-3/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | [ticket/9650] Do not allow banning the anonymous user by usernameJosh Woody2010-07-083-3/+10
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-07-0810-7/+167
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'ticket/p/9570' into develop-olympusAndreas Fischer2010-07-082-2/+3
| |\ \ \ \ \ \
| | * | | | | | [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.Oleg Pudeyev2010-07-062-2/+3
| | |/ / / / /
| * | | | | | Merge branch 'ticket/p/9589' into develop-olympusAndreas Fischer2010-07-081-0/+70
| |\ \ \ \ \ \
| | * | | | | | [ticket/9589] Added sample nginx configuration file for phpbb.Oleg Pudeyev2010-06-101-0/+70
| * | | | | | | Merge branch 'ticket/p/9593' into develop-olympusAndreas Fischer2010-07-081-0/+33
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/9593] A readme file for unit tests and running unit tests.Oleg Pudeyev2010-07-071-0/+33
| * | | | | | | | Merge branch 'ticket/bantu/9451' into develop-olympusAndreas Fischer2010-07-083-4/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/9451] Add optional $can_upload parameter to avatar_process_user().Thatbitextra2010-07-073-4/+7
| * | | | | | | | | Merge branch 'ticket/jellydoughnut/9690' into develop-olympusAndreas Fischer2010-07-082-0/+53
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/9690] Add forthcoming Bing Bot to list of recognized botsJosh Woody2010-07-072-0/+53
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'ticket/evil3/9704' into develop-olympusAndreas Fischer2010-07-081-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/9704] Fix minor typo in coding guidelines.Igor Wiedler2010-07-081-1/+1
| | |/ / / / / / / /
* | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-07-088-11/+26
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Merge branch 'ticket/nickvergessen/9578' into develop-olympusAndreas Fischer2010-07-082-1/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/9578] ACP Posting tab is missing "Post settings" module.Joas Schilling2010-05-282-1/+14
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'ticket/nickvergessen/9628' into develop-olympusAndreas Fischer2010-07-081-1/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/9628] _add_module 'after'-parameter does not work correctly.Joas Schilling2010-05-281-1/+0
| | |/ / / / / / /
| * | | | | | | | Merge branch 'ticket/jellydoughnut/9695' into develop-olympusAndreas Fischer2010-07-082-5/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/9695] Correct the improper display of user input in mcp_ban.phpJosh Woody2010-07-012-5/+5
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'ticket/nickvergessen/9697' into develop-olympusAndreas Fischer2010-07-081-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/9697] Backlink broken when the select parent forum does not exist.Joas Schilling2010-07-021-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge branch 'ticket/jellydoughnut/9703' into develop-olympusAndreas Fischer2010-07-081-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/9703] Correct database leak where deleting user did not rm some PM dataJosh Woody2010-07-031-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge branch 'ticket/cs278/9712' into develop-olympusAndreas Fischer2010-07-081-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | [ticket/9712] Future dates can be formatted as 'less than one minute ago'Chris Smith2010-07-071-2/+2
| |/ / / / / / /
| * | | | | | | Merge branch 'ticket/naderman/9659' into develop-olympusAndreas Fischer2010-07-071-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | [ticket/9659] Signature options in set_user_optionsRichard Foote2010-07-061-0/+3
| |/ / / / / /