aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #1826 from imkingdavid/ticket/11975Nathan Guse2013-11-0410-16/+14
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | [ticket/11975] Remove copy/paste fail, fix testsDavid King2013-11-021-1/+0
| * | | | | | [ticket/11975] Change shortened ACP/MCP label to Administer/ModerateDavid King2013-11-025-8/+8
| * | | | | | [ticket/11975] Make link text shorter on smaller resolutionsDavid King2013-11-025-5/+7
| * | | | | | [ticket/11975] Add ACP link next to MCP link in headerDavid King2013-11-029-15/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Merge remote-tracking branch 'prototech/ticket/11899' into developDhruv2013-11-041-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/11899] Give indication of activity after voting in poll.Cesar G2013-10-171-1/+1
* | | | | | | Merge remote-tracking branch 'prototech/ticket/11928' into developDhruv2013-11-048-25/+67
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11928] Javascript requires camel case.Cesar G2013-11-031-14/+14
| * | | | | | | [ticket/11928] Rename loadingAlert to loading_indicator.Cesar G2013-10-301-14/+14
| * | | | | | | [ticket/11928] Make sure the indicator is on top of other elements.Cesar G2013-10-292-0/+2
| * | | | | | | [ticket/11928] Replace AJAX loading popup with animation.Cesar G2013-10-298-15/+55
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11973' into developDhruv2013-11-041-2/+3
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11973] Remove logic from tokens language arrayJoas Schilling2013-10-261-2/+3
* | | | | | | | Merge remote-tracking branch 'Noxwizard/ticket/11990' into developAndreas Fischer2013-11-031-8/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11990] Remove result_mssqlnative usage in acp_database.phpPatrick Webster2013-11-031-8/+9
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11977' into developJoas Schilling2013-11-035-151/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [ticket/11977] Remove data and change code in acp_modulesVjacheslav Trushkin2013-11-033-17/+8
| * | | | | | | [ticket/11977] Use CSS instead of JS to disable up/down iconsVjacheslav Trushkin2013-11-024-134/+20
* | | | | | | | Merge pull request #1821 from imkingdavid/ticket/11972Nils Adermann2013-11-023-2/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11972] Fix the sincesDavid King2013-11-021-4/+4
| * | | | | | | | [ticket/11972] Add the sincesDavid King2013-11-021-0/+5
| * | | | | | | | [ticket/11972] Add posting_editor_message_after template eventDavid King2013-11-023-0/+10
| * | | | | | | | [ticket/11972] Add posting_editor_message_before template eventDavid King2013-11-023-0/+10
| * | | | | | | | [ticket/11972] Add posting_editor_subject_before template eventDavid King2013-11-023-2/+11
| * | | | | | | | [ticket/11972] Add posting_editor_subject_after template eventDavid King2013-11-023-2/+11
|/ / / / / / / /
* | | | | | | | Merge pull request #1848 from prototech/ticket/11746Nathan Guse2013-11-021-8/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11746] The IN_PHPBB check is not necessary.Cesar G2013-11-021-8/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #1840 from cyberalien/ticket/11030Nathan Guse2013-11-021-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [ticket/11030] Fix cursor for checkboxesVjacheslav Trushkin2013-10-301-1/+1
| * | | | | | | [ticket/11030] Fixing cursor appearing in file upload browse button.erangamapa2013-10-301-2/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #1790 from prototech/ticket/11280Nathan Guse2013-11-021-1/+0
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11280] Prevent duplicate entry in forums_track table.Cesar G2013-10-161-1/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-027-35/+211
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11746] Delete the notification after user is approved & fix language.Cesar G2013-10-263-3/+3
| * | | | | | | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-247-35/+211
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #1847 from nickvergessen/ticket/11995Nathan Guse2013-11-022-63/+32
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11995] Remove exceptions and split reverse into different testsJoas Schilling2013-11-021-75/+24
| * | | | | | | [ticket/11995] Fix Revert of config.removeJoas Schilling2013-11-021-0/+4
| * | | | | | | [ticket/11995] Add unit test for reverting config.removeJoas Schilling2013-11-021-0/+16
|/ / / / / / /
* | | | | | | Merge remote-tracking branch 'brunoais/ticket/11663' into developJoas Schilling2013-11-021-1/+11
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11663] Add the doc block about the parameters.brunoais2013-08-171-0/+8
| * | | | | | | [ticket/11663] Add the doc block about the return value.brunoais2013-08-141-0/+2
| * | | | | | | [ticket/11663] Make generate_text_for_storage return the errors.brunoais2013-08-091-1/+1
* | | | | | | | Merge pull request #1810 from nickvergessen/ticket/11031Nils Adermann2013-11-024-11/+172
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11031] Convert user notification options with default settingsJoas Schilling2013-11-021-1/+4
| * | | | | | | | [ticket/11031] Correctly add groups to teampageJoas Schilling2013-11-023-2/+78
| * | | | | | | | [ticket/11031] Fix group legend positionJoas Schilling2013-10-281-1/+1
| * | | | | | | | [ticket/11031] Convert timezones to new 3.1 timezoneJoas Schilling2013-10-282-2/+9
| * | | | | | | | [ticket/11031] Fix missing variable lang_file from code conversionJoas Schilling2013-10-251-1/+2