aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-091-6/+6
|\
| * Merge remote-tracking branch 'bantu/ticket/10154' into develop-olympusOleg Pudeyev2011-05-091-6/+6
| |\
| | * [ticket/10154] Move "copy permissions from" to below "parent" on forum creationAndreas Fischer2011-05-091-6/+6
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-093-2/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'bantu/ticket/9999' into develop-olympusOleg Pudeyev2011-05-093-2/+1
| |\ \ | | |/ | |/|
| | * [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.Andreas Fischer2011-05-092-1/+1
| | * [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.Andreas Fischer2011-05-091-1/+0
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-081-3/+3
|\ \ | |/
| * Merge remote-tracking branch 'p/ticket/10178' into develop-olympusAndreas Fischer2011-05-081-2/+2
| |\
| | * [ticket/10178] Add path to find command to build packages on FreeBSD.Oleg Pudeyev2011-05-071-2/+2
| * | Merge remote-tracking branch 'p/ticket/10177' into develop-olympusAndreas Fischer2011-05-081-1/+1
| |\ \
| | * | [ticket/10177] Add `-f -` to tar command to build packages with bsdtar.Oleg Pudeyev2011-05-071-1/+1
| | |/
* | | Merge remote-tracking branch 'p/ticket/9693' into developAndreas Fischer2011-05-051-2/+2
|\ \ \
| * | | [ticket/9693] Removed useless $auth globalizations.Oleg Pudeyev2011-04-301-2/+2
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-05-051-4/+258
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'ticket/p/10003' into develop-olympusNils Adermann2011-05-051-4/+258
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.Oleg Pudeyev2011-04-291-1/+1
| | * | [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools.Oleg Pudeyev2011-04-291-2/+2
| | * | [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools.Oleg Pudeyev2011-04-291-4/+12
| | * | [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools.Oleg Pudeyev2011-04-291-6/+137
| | * | [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools.Oleg Pudeyev2011-04-291-1/+109
| | * | [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools.Oleg Pudeyev2011-04-291-2/+4
| | * | [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.Oleg Pudeyev2011-04-291-2/+7
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-031-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'erikfrerejean/ticket/9954' into develop-olympusOleg Pudeyev2011-05-031-1/+1
| |\ \ \
| | * | | [ticket/9954] Remove unneeded never permissionErik Frèrejean2010-12-211-1/+1
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-301-0/+7
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge branch 'erikfrerejean/ticket/9961' into develop-olympusOleg Pudeyev2011-04-301-0/+7
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/9961] Create log entries when users are activated.Erik Frèrejean2011-04-191-0/+7
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-04-261-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'bantu/ticket/10145' into develop-olympusIgor Wiedler2011-04-261-1/+1
| |\ \ \
| | * | | [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.Andreas Fischer2011-04-261-1/+1
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-261-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote branch 'p/ticket/7941' into develop-olympusAndreas Fischer2011-04-261-0/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/7941] Added @return to generate_board_url docstring.Oleg Pudeyev2011-04-171-0/+3
| | |/ /
* | | | Merge branch 'feature/rxu/attachment-management-no-reassignment' into developOleg Pudeyev2011-04-247-1/+327
|\ \ \ \
| * | | | [feature/attachment-management-no-reassignment] Handle privacy and some more.rxu2011-04-245-14/+68
| * | | | [feature/attachment-management-no-reassignment] Further feature adjustments.rxu2011-04-115-34/+75
| * | | | [feature/attachment-management-no-reassignment] Fix some more errorsrxu2011-04-112-1/+3
| * | | | [feature/attachment-management-no-reassignment] Fix minor flaws in the code.rxu2011-04-101-5/+4
| * | | | [feature/attachment-management-no-reassignment] Attachments managementrxu2011-04-104-0/+230
* | | | | Merge remote branch 'p/ticket/10148' into developAndreas Fischer2011-04-241-2/+2
|\ \ \ \ \
| * | | | | [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.Oleg Pudeyev2011-04-241-2/+2
* | | | | | Merge remote branch 'p/ticket/10143' into developAndreas Fischer2011-04-241-0/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/10143] Added tests for storing a previously deleted value in db cache.Oleg Pudeyev2011-04-211-0/+24
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-231-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'ticket/p/10147' into develop-olympusAndreas Fischer2011-04-231-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/10147] Corrected a typo in includes/functions_template.php.Oleg Pudeyev2011-04-231-1/+1
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-221-1/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'ticket/p/10141' into develop-olympusAndreas Fischer2011-04-221-1/+11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |