Commit Graph
273 Commits
Author SHA1 Message Date
Owain van Brakel 2655654c9f project: merge upstream 2019-10-30 04:22:38 +01:00
Owain van Brakel 945391073b Merge remote-tracking branch 'runelite/master' 2019-10-23 18:21:03 +02:00
Lotto 541af9084c feed: use RuneLiteClient's Twitter list 2019-10-20 15:16:26 +02:00
Owain van Brakel 72ae9ddabd Merge remote-tracking branch 'runelite/master' into 2009-merge 2019-10-03 17:35:19 +02:00
Adam cade74c18c feed controller: add etag 2019-10-02 15:59:53 -04:00
Adam 1e58a77683 item controller: add etag to bulk prices 2019-10-02 15:59:53 -04:00
Owain van Brakel 748801d562 Merge remote-tracking branch 'runelite/master' into 2308-merge 2019-08-23 02:31:44 +02:00
Adam c8ffa3994d loot tracker: batch loot submissions 2019-08-19 12:15:00 -04:00
Adam bd0badf7fc authfilter: cache sessions 2019-08-19 11:56:57 -04:00
Owain van Brakel bd621269a6 gradle: Update deps, format files (#1316)
* gradle: Update dependencies

Also made the version numbers global to make updating easier, also this
way we can't have mismatches where different projects use diffrent
versions of a dep

* cache: Fix TitleDumper test

* gradle: Format build files

* httpserviceplus: Remove unneeded deps
2019-08-13 21:02:45 -04:00
Owain van Brakel 83717e76ed Merge remote-tracking branch 'runelite/master' into 1308-merge 2019-08-13 03:40:32 +02:00
Adam d77134893a osbuddy client: set UA to RuneLite 2019-08-12 17:05:40 -04:00
Adam 86f0c5ebd2 osbuddy client: update exchange summary location 2019-08-12 17:05:33 -04:00
Owain van Brakel 08f84b5181 Merge remote-tracking branch 'runelite/master' into 0908-merge
Conflicts:
	runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/AllRequirementsCollection.java
2019-08-09 19:06:39 +02:00
Adam c6e24b832d http-service: remove inferred destroy method on mongo client bean
It is important that the client isn't closed when using the jndi
provided client as it is a singleton and is reused.
2019-08-09 10:43:55 -04:00
Owain van Brakel 3a92e3b008 http-services(-pro): Add back http-service and move custom http-service 2019-08-09 05:22:26 +02:00
Adam 277a3ccd35 http-service: use jndi provided mongo 2019-08-08 19:29:51 -04:00
Adam edfd52af23 config service: validate config values 2019-08-08 17:31:12 -04:00
Adam 4286c680f2 config service: add test for parseJsonString 2019-08-08 17:31:12 -04:00
Adam 730ad1c3c6 config service: return status based on whether set/unset were successful 2019-08-08 17:31:11 -04:00
Owain van Brakel 17b35205fd project: Fix deprecations and supress unchecked warnings 2019-07-25 20:34:09 +02:00
Owain van Brakel af4c2ad6ae gradle: Update all deps 2019-07-25 01:37:17 +02:00
Jordan Atwood 41968c725f Remove unused Slf4j annotations and imports 2019-07-11 00:33:00 -07:00
Zeruth e111b3aeae Revert "bringup to current runelite-master"
This reverts commit 74da8a883f.
2019-07-02 18:39:36 -04:00
Zeruth 74da8a883f bringup to current runelite-master 2019-07-01 18:10:13 -04:00
sdburns1998 8d77971c83 Merge remote-tracking branch 'runelite/master' into ihategitandihatethisihatemergingupstream 2019-06-29 01:08:56 +02:00
Kyleeld c2f405cf8f Revert "Upstreamyboy" 2019-06-28 23:58:38 +01:00
sdburns1998 63664fbac7 chat commands: add ba high gamble command 2019-06-29 00:28:22 +02:00
Tyler Bochard bebb8d8264 Update AnimationEndpoint.java
Test
2019-06-27 21:39:46 -04:00
Robert Alexander 8ee3e483f4 chat commands: add duel arena chat command 2019-06-27 21:38:55 -04:00
zeruth 219a25f3c3 Small DB fix 2019-06-27 18:01:32 -04:00
Jacob McElroy 8757d25bd3 chat commands: add ba high gamble command 2019-06-27 17:27:09 -04:00
zeruth 8543e13908 Adds animation endpoint 2019-06-27 17:14:30 -04:00
James Munson 8c045dcb0f unused import
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-25 22:01:49 -07:00
James Munson 847eb30d1f Removed useless mongo db
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-25 21:19:21 -07:00
James Munson 87fdcee6f7 Update
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-25 01:34:28 -07:00
James Munson f15068f448 Checkstyle?
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 16:53:36 -07:00
James Munson 34cb26d29b Added house host to api
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 14:24:34 -07:00
James Munson 9c9ce65ed8 Added cache control filter for later use
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 12:01:16 -07:00
James Munson 64874e9e98 Fix travis
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 11:39:36 -07:00
James Munson 9ee4320482 Added !layout
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 05:30:26 -07:00
James Munson cd77f9b513 Update
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 04:58:08 -07:00
James Munson 1754508b26 Update
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 04:45:03 -07:00
James Munson b0c884eda1 Update http-service
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 04:39:33 -07:00
zeruth eafb024f16 Revert to old layout for refactor 2019-06-07 23:54:32 -04:00
zeruth 882be3cb71 Merges Injector
Welcome to the new world boys.
2019-06-06 20:47:41 -04:00
Owain van Brakel 96cf696cee Merge remote-tracking branch 'runelite/master' 2019-06-05 19:51:04 +02:00
William Collishaw f1c8f380d9 Replace redundant StringBuilder append String.subString with append CharSequence 2019-06-01 13:46:56 -06:00
Ganom f79543acfe Merge branch 'master' of https://github.com/runelite/runelite
# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/HitpointsDisplayStyle.java
#	runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java
#	runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java
2019-05-30 13:26:28 -04:00
Adam 4f82be9691 xtea service: fix bulk query returning duplicates
Some rows have backfilled times that are duplicates, causing the join to
join multiple rows. Assume ids only increment and fetch the row with the
highest id instead, and join on id.
2019-05-25 18:02:56 -04:00