sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4006 commits 3 branches 0 tags 1.6 GiB
Commit graph

4006 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
3a5eda1e98 Merge remote-tracking branch 'origin/sabe/attributes' into develop 
Conflicts:
	views/shared/footer.jade
 2014-01-04 16:02:22 -07:00
Dušan Juretić
4777a693ba Test refactoring: user.user -> user 2014-01-04 17:35:45 -03:00
Dušan Juretić
a74e99a78f Minor style changes to inventoryCtrlSpec.js 2014-01-04 17:32:30 -03:00
Dušan Juretić
a4c7775d51 Tests for choosing a pet and buying an egg 2014-01-04 17:28:13 -03:00
Tyler Renelle
68ad68e74d Merge pull request #2253 from djuretic/inventory_tests 
More InventoryCtrl tests
 2014-01-04 10:48:26 -08:00
Tyler Renelle
c6ab84721f fix #2205 hide checklist button from challenges 2014-01-04 10:58:12 -07:00
Dušan Juretić
24815af9c1 Added inventoryCtrl tests for hatching and selling 2014-01-04 00:02:51 -03:00
Dušan Juretić
f854d2d022 Use $window on inventoryCtrl, so it can be mocked on tests 2014-01-04 00:01:29 -03:00
Dušan Juretić
d58568c9d8 Fix AuthCtrl tests with proper asserts 2014-01-03 23:28:43 -03:00
Tyler Renelle
d9779d8e51 challenges: but provide default notes 2014-01-03 14:34:47 -07:00
Tyler Renelle
9a6f0c0339 challenges: don't remove To-Dos that are part of a challenge when 
clearing completed
 2014-01-03 14:18:53 -07:00
Tyler Renelle
c9e083b602 challenges: add "official habitrpg challenge" option 2014-01-03 13:36:13 -07:00
Tyler Renelle
45b543c1ed challenges: don't disable notes field when challenge-task 2014-01-03 13:14:56 -07:00
Tyler Renelle
abd300199a challenges: allow members to override challenge.tasks.notes, and sycning 
challenge won't update those notes.
 2014-01-03 13:10:56 -07:00
Tyler Renelle
5e321b0205 apiv2 swagger fixes to paypal, and send admin emails 2014-01-03 12:50:03 -07:00
Tyler Renelle
6d8e4ed8a2 tests: api.mocha.coffee cleanup WIP 2014-01-03 10:26:46 -07:00
Tyler Renelle
2c1eb955ac fix #1954 . Start updating API tests, beginning with challenges. Use 
test to fix "challenge updates not updating users' tasks"
 2014-01-03 00:01:24 -07:00
Dušan Juretić
ae080fd474 Tests for inventoryCtrl 2014-01-02 22:49:31 -03:00
Tyler Renelle
e6e922d00a add note to custom-day-start property, warning users against using it (@wc8) 2014-01-02 17:16:55 -07:00
Tyler Renelle
2a75849b65 swagger GET /challenges fix 2014-01-02 16:58:48 -07:00
Tyler Renelle
2be97a79d2 apiv2 swagger fixes 2014-01-02 16:42:46 -07:00
Tyler Renelle
4c6ebb6f14 Merge pull request #2237 from colegleason/crit-notif 
Add Critical Hit notification by watching user._tmp.crit
 2014-01-02 12:00:48 -08:00
Cole Gleason
f218a52bf2 Add Critical Hit notification by watching user._tmp.crit 2014-01-02 13:41:50 -06:00
Matteo Pagliazzi
30188045f2 use habitrpg-shared locales, removed old ones 2014-01-02 20:37:05 +01:00
Tyler Renelle
46491273a5 apiv2: fix to /admin/members/{id}:GET 2014-01-02 11:01:35 -07:00
Tyler Renelle
630eab9ce5 apiv2 fix user tags routes 2014-01-01 23:39:28 -07:00
Tyler Renelle
eda45d9240 Merge pull request #2174 from Sinza-/develop 
Replace hard-coded strings with env.t on views/static folder and en/app.json
 2014-01-01 22:33:13 -08:00
Tyler Renelle
9b56899d0f #2217 add note about base-url for api routes 2014-01-01 22:47:38 -07:00
Tyler Renelle
1a9ebb59f2 apiv2: edit group as POST. Can't get PUT working with ngResource for 
some reason, revisit
 2014-01-01 22:40:27 -07:00
Tyler Renelle
580279eeda #2217 apiv2 update documentation 2014-01-01 22:26:59 -07:00
Tyler Renelle
e927c897cb Merge branch 'api-docs' into develop 2014-01-01 21:17:20 -07:00
Tyler Renelle
7f3b6a4470 Merge pull request #2209 from benblank/pet-alignment 
Fix (apparent) misalignment of paws on pets/mounts grids
 2014-01-01 20:14:44 -08:00
Tyler Renelle
c5ed6917fe Merge pull request #2210 from benblank/popover-shadows 
Prevent popover shadows from being clipped/overlapped
 2014-01-01 20:13:05 -08:00
Tyler Renelle
548d4f5b78 #2217 swagger-ui: allow authentication for interacting with routes 2014-01-01 21:09:01 -07:00
Tyler Renelle
0d584bef3a #2217 swagger, params => parameters. Skip swagger set headers, we have our own 2014-01-01 20:51:34 -07:00
Tyler Renelle
a2b30dcb1a #2217 merge apiv2 route definitions with swagger decorations 2014-01-01 20:21:46 -07:00
Tyler Renelle
11d3b7473a #2217 use BASE_URL for swagger config 2014-01-01 16:53:42 -07:00
Tyler Renelle
98361ea94f #2217 add note about API-docs being a WIP 2014-01-01 16:37:03 -07:00
Tyler Renelle
f676dba159 #2217 more progress documenting API 2014-01-01 16:23:06 -07:00
Tyler Renelle
0edcfac46b #2217 start adding APIv2 generated documentation via swagger-node-express 2014-01-01 15:33:37 -07:00
Sabe Jones
a9e57a8adf Merge branch 'develop' into sabe/attributes 2014-01-01 12:42:53 -06:00
djuretic
2f4112e2f1 Merge pull request #2112 from djuretic/e2e 
End-to-end testing
 2014-01-01 09:10:16 -08:00
Dušan Juretić
803a45b47f Test server port changed to 3001 2014-01-01 14:01:51 -03:00
Dušan Juretić
431622ce14 E2e tests: launch Selenium and node server and kill them after finishing the tests, using a test database 2014-01-01 14:01:51 -03:00
Dušan Juretić
69c4977511 Fix again e2e test 2014-01-01 14:01:51 -03:00
Dušan Juretić
c572a195aa Take screenshot of failed e2e tests 2014-01-01 14:01:51 -03:00
Dušan Juretić
3c5f9d7f8b Mute Selenium on Travis 2014-01-01 14:01:51 -03:00
Dušan Juretić
87e7b2ead6 Fix build by giving more time to Protractor 2014-01-01 14:01:51 -03:00
Dušan Juretić
a6443bceb8 Fix build 2014-01-01 14:01:51 -03:00
Dušan Juretić
91b0f3fb96 E2e testing: added tests for failed login and register new user 2014-01-01 14:01:51 -03:00