Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2014-02-13 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | / / / / / / / | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12188' into develop... | Nils Adermann | 2014-02-13 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | [ticket/12188] Add php 5.6 to travis enviroments | Joas Schilling | 2014-02-13 | 1 | -0/+1 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge remote-tracking branch 'vinny/ticket/12134' into develop | Cesar G | 2014-02-12 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ticket/12134] Add ucp_pm_viewmessage_print_head_append event to subsilver2 | Marcus Vinicius | 2014-01-26 | 2 | -1/+2 | |
* | | | | | | | | | | | Merge remote-tracking branch 'vinny/ticket/12132' into develop | Cesar G | 2014-02-12 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | [ticket/12132] Add the event to events.md doc | Marcus Vinicius | 2014-01-26 | 1 | -0/+1 | |
| * | | | | | | | | | | | [ticket/12132] Add viewtopic_print_head_append event to subsilver2 | Marcus Vinicius | 2014-01-26 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/12180' into develop | Joas Schilling | 2014-02-12 | 5 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | [ticket/12180] Add "Each file MUST end with exactly one newline character" rule | Andreas Fischer | 2014-02-10 | 5 | -4/+4 | |
* | | | | | | | | | | | | Merge pull request #2026 from nickvergessen/ticket/12184 | Andreas Fischer | 2014-02-11 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | [ticket/12184] Fix undefined variable tpl_fields in profile field manager | Joas Schilling | 2014-02-11 | 1 | -0/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #2010 from nickvergessen/ticket/12169 | Nils Adermann | 2014-02-11 | 34 | -63/+207 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | [ticket/12169] Split mode==headline into it's own function | Joas Schilling | 2014-02-10 | 2 | -24/+31 | |
| * | | | | | | | | | | | [ticket/12169] Add new option to display profile fields on memberlist | Joas Schilling | 2014-02-10 | 15 | -7/+72 | |
| * | | | | | | | | | | | [ticket/12169] Allow displaying profile fields on memberlist | Joas Schilling | 2014-02-10 | 6 | -15/+72 | |
| * | | | | | | | | | | | [ticket/12169] Convert user_from to profile field location | Joas Schilling | 2014-02-10 | 24 | -49/+64 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge remote-tracking branch 'Marc/ticket/12170' into develop | Joas Schilling | 2014-02-10 | 4 | -5/+48 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'exreaction/ticket/12170' into ticket/12170 | Marc Alexander | 2014-02-07 | 1 | -4/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | [ticket/12170] Test for 12170 | Nathan Guse | 2014-02-07 | 1 | -4/+34 | |
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | [ticket/12170] Assign schema keys in migration helper with data_depth 1 | Marc Alexander | 2014-02-07 | 3 | -1/+14 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #1988 from nickvergessen/ticket/12115 | Nils Adermann | 2014-02-10 | 61 | -321/+404 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | [ticket/12115] Remove space from line ending | Joas Schilling | 2014-02-06 | 1 | -1/+1 | |
| * | | | | | | | | | | [ticket/12115] Add migration file to remove old user columns | Joas Schilling | 2014-02-06 | 1 | -0/+51 | |
| * | | | | | | | | | | [ticket/12115] Use base class to reduce duplicate code | Joas Schilling | 2014-02-06 | 3 | -252/+209 | |
| * | | | | | | | | | | [ticket/12115] Add a new migration for profilefield_interests | Joas Schilling | 2014-02-06 | 1 | -0/+146 | |
| * | | | | | | | | | | [ticket/12115] Also port user interests to profile fields | Joas Schilling | 2014-02-06 | 50 | -270/+18 | |
| * | | | | | | | | | | [ticket/12115] Remove old language strings | Joas Schilling | 2014-02-06 | 1 | -2/+0 | |
| * | | | | | | | | | | [ticket/12115] Add methods to interface | Joas Schilling | 2014-02-06 | 1 | -2/+10 | |
| * | | | | | | | | | | [ticket/12115] Translate profile field name before displaying it in errors | Joas Schilling | 2014-02-06 | 7 | -14/+31 | |
| * | | | | | | | | | | [ticket/12115] Remove occupation field from html files | Joas Schilling | 2014-02-06 | 5 | -17/+0 | |
| * | | | | | | | | | | [ticket/12115] Add language entries for the profile fields | Joas Schilling | 2014-02-06 | 2 | -1/+26 | |
| * | | | | | | | | | | [ticket/12115] Convert user occupation to a profile field | Joas Schilling | 2014-02-06 | 17 | -26/+176 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #2022 from nickvergessen/ticket/12175 | Andreas Fischer | 2014-02-10 | 1 | -7/+15 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ticket/12175] Do not use admin account for file size limit test | Joas Schilling | 2014-02-09 | 1 | -2/+9 | |
| * | | | | | | | | | | [ticket/12175] Fix test for uploading a valid file | Joas Schilling | 2014-02-09 | 1 | -3/+5 | |
| * | | | | | | | | | | [ticket/12175] Fix upload test for empty file | Joas Schilling | 2014-02-09 | 1 | -2/+1 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #2017 from nickvergessen/ticket/12141 | Andreas Fischer | 2014-02-08 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | [ticket/12141] Disable opcache on travis for php 5.5.8 aswell | Joas Schilling | 2014-02-08 | 1 | -2/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'prep-release-3.1.0-a3' into develop | Joas Schilling | 2014-02-05 | 8 | -33/+172 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development | Joas Schilling | 2014-02-05 | 3 | -3/+3 | |
| * | | | | | | | | [prep-release-3.1.0-a3] Commit changelog for 3.1.0-a3 | Joas Schilling | 2014-02-05 | 1 | -0/+106 | |
| * | | | | | | | | [prep-release-3.1.0-a3] Prepare Changelog | Joas Schilling | 2014-02-05 | 1 | -23/+26 | |
| * | | | | | | | | [prep-release-3.1.0-a3] Add migration for 3.1.0-a3 | Joas Schilling | 2014-02-05 | 1 | -0/+30 | |
| * | | | | | | | | [prep-release-3.1.0-a3] Update version to 3.1.0-a3 | Joas Schilling | 2014-02-05 | 6 | -10/+10 | |
* | | | | | | | | | Merge pull request #1995 from EXreaction/ticket/11880 | Nils Adermann | 2014-02-05 | 9 | -26/+344 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | [ticket/11880] migration helper file | Nathan Guse | 2014-02-05 | 1 | -0/+82 | |
| * | | | | | | | | [ticket/11880] Move get_schema_steps function to a migrator helper class | Nathan Guse | 2014-02-05 | 7 | -72/+27 | |
| * | | | | | | | | [ticket/11880] Break up schema changes in the migrator | Nathan Guse | 2014-02-03 | 4 | -21/+302 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #2004 from prototech/ticket/12163 | Andreas Fischer | 2014-02-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ |