Matteo Pagliazzi 79c8449e1e Merge branch 'api-v3' into sabrecat/v3-payments

2016-04-30 19:28:45 +02:00

..

api

Merge branch 'api-v3' into sabrecat/v3-payments

2016-04-30 19:28:45 +02:00

api-legacy

Merge branch 'develop' into api-v3

2016-04-09 09:12:53 -05:00

common

Api v3 Migration (WIP) (#7131)

2016-04-30 18:34:16 +02:00

common_old

Merge branch 'develop' into api-v3

2016-03-30 23:40:00 +02:00

content

Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues."

2016-03-17 08:09:18 -05:00

e2e

lint: Add missing semicolon to test helper

2016-03-13 22:06:09 -05:00

helpers

Added tests for cron (#7081)

2016-04-24 00:54:50 +02:00

migrations

Add rudimentary test for migration script

2015-06-05 13:12:38 -05:00

server_side

Merge branch 'develop' into api-v3

2016-03-28 16:02:04 -05:00

spec

feat: Switch out js-emoji for habtiica-markdown

2016-04-26 08:19:47 -05:00

.eslintrc

chore: merge in develop

2016-04-15 10:11:54 -05:00

mocha.opts

Merge branch 'develop' into api-v3

2016-03-04 12:16:22 -06:00