aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-14Merge remote-tracking branch 'refs/remotes/origin/master'jose
Conflicts: src/org/traccar/protocol/MeiligaoProtocolDecoder.java test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java
2016-12-14Fix Meiligao Protocol to work with tk228jose
2016-12-13Fix Meiligao Protocol to work with tk228jose
2016-12-13Add key support for Nominatim (fix #2620)Anton Tananaev
2016-12-10Merge pull request #2668 from Abyss777/template_linksAnton Tananaev
Added links to server in mail templates
2016-12-10- Use URL builderAbyss777
- Use Curly braces in templates
2016-12-10Update web interface referencev3.9Anton Tananaev
2016-12-10Update extjs version in scriptsAnton Tananaev
2016-12-10Fix integration test scriptAnton Tananaev
2016-12-10Return JSON response by defaultAnton Tananaev
2016-12-10Fix FindBugs reported warningAnton Tananaev
2016-12-10Update version to 3.9Anton Tananaev
2016-12-10Merge pull request #2650 from duke2906/masterAnton Tananaev
Add configurable default values for group & category on on-the-fly created devices
2016-12-09Moved declaration to section where it is usedPhilipp Prangenberg
2016-12-09Added links to server in mail templatesAbyss777
2016-12-09Fix AT2000 response (fix #2662)Anton Tananaev
2016-12-09Workaround for Granit coordinates (fix #2664)Anton Tananaev
2016-12-09Fix endianness for AT2000 (fix #2662)Anton Tananaev
2016-12-08Moving from GroupName to GroupID in default settingsPhilipp Prangenberg
2016-12-08Add Suntech unit test caseAnton Tananaev
2016-12-07Merge pull request #2655 from Abyss777/email_templatesAnton Tananaev
Templates for mail notifications
2016-12-07- Extract MailMessage classAbyss777
- Move getting "unknown.vm" to catch
2016-12-07Implement mail templatesAbyss777
2016-12-07Implement Xexun commands (fix #2639)Anton Tananaev
2016-12-07Merge pull request #2653 from Abyss777/mail_protocolsAnton Tananaev
Add support for "mail.smtp.ssl.protocols" parameter
2016-12-06Add support for "mail.smtp.ssl.protocols" parameterAbyss777
2016-12-06Merge remote-tracking branch 'upstream/master'Philipp Prangenberg
2016-12-06Updating HashMap groupsByName in group-access methodsPhilipp Prangenberg
2016-12-06Style changesPhilipp Prangenberg
2016-12-06Request smaller photo chunkAnton Tananaev
2016-12-05Removed unnecessary Set declarationPhilipp Prangenberg
2016-12-05Removed unnecessary SetPhilipp Prangenberg
2016-12-05BeautificationPhilipp Prangenberg
2016-12-05Added functionality to get group by name.Philipp Prangenberg
Implemented configurable default group and default category when registering unknown devices
2016-12-05Merge remote-tracking branch 'upstream/master'Philipp Prangenberg
2016-12-05Merge pull request #2638 from Abyss777/improve_notificationsAnton Tananaev
Use model instead of attributes to store Notification options
2016-12-05- Ignore attributes in notificationsAbyss777
- Remove extra spaces
2016-12-05Add Granit unit test caseAnton Tananaev
2016-12-05Fix check style issuesAnton Tananaev
2016-12-05Implement OIGO MG protocolAnton Tananaev
2016-12-04Use model instead of attributes to store Notification optionsAbyss777
2016-12-04Decode GoSafe speed correctlyAnton Tananaev
2016-12-03Merge pull request #2636 from sunhoww/update_swaggerAnton Tananaev
Update API specs with /positions
2016-12-03Add GoSafe unit test caseAnton Tananaev
2016-12-03Ignore changes to submoduleAnton Tananaev
2016-12-03Fix incorrect entriesSun Howwrongbum
- for /commandtypes and /users
2016-12-03Add descriptions, update response for /positionsSun Howwrongbum
- 'header' removed from response.
2016-12-03Update api specs with param id for /positionsSun Howwrongbum
2016-12-02Add GPS103 power cut alarmAnton Tananaev
2016-12-02Decode H02 cell infoAnton Tananaev