Blade Barringer
7b15967215
Merge pull request #7263 from crookedneighbor/debug-update-user
...
Debug update user
2016-05-14 22:48:20 -05:00
Blade Barringer
4a2e3d4410
lint: Add missing semicolons in test
2016-05-14 22:45:35 -05:00
Blade Barringer
8ae3dd779e
Merge pull request #7264 from Alys/karma.conf
...
remove userServices.js from karma.conf
2016-05-14 22:43:16 -05:00
Blade Barringer
50d7345832
feat: Add make admin button to debug menu
2016-05-14 22:37:26 -05:00
Blade Barringer
bc58bd97bb
fix: Correct set cron debug function
2016-05-14 22:33:02 -05:00
Blade Barringer
3b8ce8451b
feat: Create debug update user route
2016-05-14 22:30:18 -05:00
Alys
d28860620b
remove userServices.js from karma.conf - it's been moved to website/client/js/services
2016-05-15 13:21:08 +10:00
Blade Barringer
ac87366f20
Merge pull request #7261 from crookedneighbor/fix_drops
...
fix: Alert user that drops were recieved
2016-05-14 21:51:05 -05:00
Blade Barringer
44102f6b46
fix: Alert user that drops were recieved
2016-05-14 18:45:36 -05:00
Alys
887d187691
change "an user" to "a user" in comments and text (no code changes) ( #7257 )
2016-05-15 01:10:08 +02:00
Sabe Jones
6ceea9346f
chore(news): misc announcements
2016-05-14 20:56:22 +00:00
Blade Barringer
8a72c91060
Merge branch 'TheHollidayInn-upstream/api-v3-fixes-2' into api-v3
...
Closes #7245
2016-05-14 12:00:53 -05:00
Keith Holliday
2d5bf9b1bc
Fixed reload tests
2016-05-14 12:00:41 -05:00
Blade Barringer
2487ebac90
chore: Reinstate floating version number for eslint
...
babel-eslint regression fixed
2016-05-14 11:59:00 -05:00
Keith Holliday
72c1729d54
Loaded completed todos when done is clicked
2016-05-14 11:05:31 -05:00
Keith Holliday
0537ff3552
Fixed battle monsters with friends button
2016-05-14 11:05:31 -05:00
Keith Holliday
936ff1f200
Fixed page reload on settings change
2016-05-14 11:05:31 -05:00
Keith Holliday
409dfbb2b0
Fixed adding and removing tags on tasks
2016-05-14 11:05:31 -05:00
Keith Holliday
6222c23810
Updated spell casting to v3
2016-05-14 11:05:31 -05:00
Keith Holliday
439d20c82e
Fixed start party by invites
2016-05-14 11:05:31 -05:00
Blade Barringer
769d9e5148
Merge branch 'Alys-api-v3-apidoc-url' into api-v3
2016-05-14 10:21:04 -05:00
Alys
e4b17d2d04
update apidoc URL in package.json
...
Closes #7222
2016-05-14 10:20:43 -05:00
Blade Barringer
c534f31593
Merge pull request #7226 from Alys/api-v3-pubChalsMinPrize-rename
...
[API v3] rename and reword pubChalsMinPrize to reflect that it's only for the Tavern
2016-05-14 10:19:43 -05:00
Blade Barringer
a697d028b7
fix: Correct client request from habitrpg -> tavern
2016-05-14 09:37:21 -05:00
Blade Barringer
e654b47537
Merge branch 'Alys-api-v3-cron-comments-etc' into api-v3
2016-05-14 09:21:55 -05:00
Blade Barringer
56dccf016e
chore: clarify comments on cron code
2016-05-14 09:20:57 -05:00
Alys
210d01ddae
add a missing variable declaration
2016-05-14 23:01:45 +10:00
Blade Barringer
9969aa667a
fix: Remove requirement on message paramter in transfer-gems
2016-05-14 07:37:47 -05:00
Blade Barringer
25f0819f1e
chore: Remove unusued variable
2016-05-14 06:59:11 -05:00
Blade Barringer
3e57620666
fix: Set gems sent notification as translatable string
2016-05-14 06:54:44 -05:00
Alys
44e9d8b09e
fix tests for /members/transfer-gems
2016-05-14 07:18:00 -04:00
Alys
2e078f4776
allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227
2016-05-14 05:58:40 -04:00
Alys
fd13c7aa60
rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges
2016-05-14 16:40:40 +10:00
Blade Barringer
4dd7c29baf
fix: Add missing type param to equip call
...
closes #7212
2016-05-13 22:49:05 -05:00
Blade Barringer
38f09c7766
Merge pull request #7215 from crookedneighbor/fix_checklist
...
[API v3] Correct checklist on v3 client
2016-05-13 22:38:50 -05:00
Alys
6acaef50e6
minor improvements to cron code for clarity; fix inaccurate comments; add TODOs for rest-in-inn actions
2016-05-14 13:26:26 +10:00
Blade Barringer
e19146d6be
fix: Pin eslint to 2.9
2016-05-13 22:17:19 -05:00
Blade Barringer
0a8b8236c1
fix: Correct checklist on client
...
Closes #7207
2016-05-13 22:05:00 -05:00
Keith Holliday
1fd7df7521
Api v3 fixes continued ( #7205 )
...
* Added timzeone offset back
* Added APIToken back to settings page
* Fixed fetch recent messages for party
* Fixed returning group description
* Fixed check if user is member of challenge
* Fixed party members appearing in header
* Updated get myGroups param to include public groups. Fixed isMemberOf group
* Fixed hourglass purchase
* Fixed challenge addding tasks on first creating
* Updated tests to accomidate new changes
2016-05-13 23:36:25 +02:00
Lucas Torroba (@zesme)
2a8f24697f
chore(typo): Fix typos in ISSUE_TEMPLATE.md
...
Closes #7202
2016-05-13 12:50:09 -05:00
Matteo Pagliazzi
cc20812674
[API v3] Fix calls to user.ops and deleting tags ( #7204 )
...
* v3: fixes calls to user.ops from views and deleting tags
* v3: fix tests that use user._statsComputed
2016-05-13 19:45:16 +02:00
Matteo Pagliazzi
468a312357
v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results ( #7203 )
2016-05-13 19:08:38 +02:00
Matteo Pagliazzi
199732539f
chore(): rename website/src -> website/server and website/public -> website/client ( #7199 )
2016-05-13 15:35:12 +02:00
Matteo Pagliazzi
486b93a3c9
mongoose: use options
2016-05-13 10:42:48 +02:00
Matteo Pagliazzi
9514e9c5a8
v3: fix reminders with no startDate
2016-05-13 10:34:09 +02:00
Matteo Pagliazzi
8183b0d084
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-13 10:31:49 +02:00
Blade Barringer
afc51cbdc4
Merge pull request #7198 from crookedneighbor/capture_stack_trace
...
fix: Only apply captureStackTrace if it exists on the error object
2016-05-12 19:25:44 -05:00
Blade Barringer
de1f2c2788
fix: Only apply captureStackTrace if it exists on the error object
2016-05-12 18:57:49 -05:00
Matteo Pagliazzi
b5a7f8e3a1
test mongoose fix
2016-05-12 23:12:11 +02:00
Matteo Pagliazzi
e47ae45f9f
mongoose: increase keepAlive
2016-05-12 22:43:38 +02:00
