Commit Graph

12560 Commits

Author SHA1 Message Date
Blade Barringer
f3ae42e49a refactor(common): Update beastmaster functions to use newer each syntax 2015-12-29 08:03:19 -06:00
Matteo Pagliazzi
71a910ccfb temporary fix for eslint 2015-12-29 14:45:29 +01:00
Blade Barringer
773bb23b88 chore(dependency): Remove unneeded lodash submodules 2015-12-29 07:45:13 -06:00
Blade Barringer
b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
Matteo Pagliazzi
565d5f08dc Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups 2015-12-29 14:43:40 +01:00
Matteo Pagliazzi
547e8a04f5 cleanup group model 2015-12-29 14:43:29 +01:00
Matteo Pagliazzi
ad58a77b75 Merge pull request #6393 from TheHollidayInn/api-v3-chat-post
Added chat post route and initial tests
2015-12-29 13:57:47 +01:00
Blade Barringer
33714b4947 chore(i18n): update locales 2015-12-28 21:40:51 -06:00
Georgi Gardev
ea54ec607a Add confirmation popover for Release pets/mounts
Add tests for releasing pets and mounts

Refactor tests to use expect syntax from sinon-chai

tests(karma): Refine settings controller tests

refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
2015-12-28 21:37:38 -06:00
Georgi Gardev
f6f82cafc4 Add confirmation popover for Rebirth
Add confirmation popover for Fortify/Reroll

Add tests for reroll and rebirth
2015-12-28 21:37:23 -06:00
Keith Holliday
2750446e7b Updated POST like route to persist data between updates 2015-12-28 18:45:34 -06:00
Keith Holliday
cb388eea40 Ensured that only one like or flag is updated during query 2015-12-28 14:08:10 -06:00
Paul Rich
c9fdff38f9 Fix for issue #4648, parts 3 and 4 2015-12-28 14:24:48 -05:00
Matteo Pagliazzi
9748ffb0a6 add updateGroup route 2015-12-28 19:45:34 +01:00
Blade Barringer
d53ac4c66f tests: Add ability to use ES2015 in karma tests 2015-12-28 08:24:23 -06:00
Keith Holliday
b3feb997d3 Change group save to Group update, added flags route and tests, and made eslint edits 2015-12-28 08:09:17 -06:00
Paul Rich
56a00efb19 Fix for Issue #3517 Display Current Page Name
Revision for Fix for issue #3517

lint: Remove extraneous white space in app.js file

fix: Correct attribute from pageTitle to title in $state interface
2015-12-28 07:53:51 -06:00
Matteo Pagliazzi
ceb20742dc fix an import 2015-12-28 12:21:15 +01:00
Matteo Pagliazzi
488685ceff typo 2015-12-28 12:15:28 +01:00
Matteo Pagliazzi
ba0fb884dd port create challenge 2015-12-28 12:14:56 +01:00
Matteo Pagliazzi
01e2bb56df port getChallenges 2015-12-28 11:18:58 +01:00
Matteo Pagliazzi
20092f3ddb port challenge model 2015-12-28 10:46:34 +01:00
Matteo Pagliazzi
831c8c4165 Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups 2015-12-27 17:26:01 +01:00
Matteo Pagliazzi
6ae2c5fa89 wip on groups controller 2015-12-27 17:24:55 +01:00
Alys
7ef4fab289 change scroll drop text for The Golden Knight, Part 1 quest - it drops Gold Knight (Scroll) not Tarnished Gold (Scroll) 2015-12-28 01:06:08 +10:00
Blade Barringer
b5b44072fb Merge pull request #6394 from KristianTashkov/fix-vagrant-e2e-tests
Fix e2e test in vagrant environment
2015-12-27 08:13:41 -06:00
Keith Holliday
54109f0e62 Removed redundant code and changed like route to return only altered message 2015-12-27 00:27:06 -06:00
Blade Barringer
e46436f77b chore(i18n): update locales 2015-12-26 22:28:55 -06:00
Blade Barringer
b6ab74ceda refactor(common): Update variable name 2015-12-26 20:10:56 -06:00
Blade Barringer
80ed048d5c tests: Update updateStats test 2015-12-26 19:52:25 -06:00
Blade Barringer
1b118d86b2 refactor: Extract constants into constants file 2015-12-26 19:41:20 -06:00
Blade Barringer
ba31cda85d Merge branch 'develop' into TheHollidayInn-leveling-ensure-user-gets-100-points 2015-12-26 19:14:40 -06:00
Blade Barringer
363ef5e091 fix: Remove stray {{ characters 2015-12-26 19:05:12 -06:00
Blade Barringer
d0e6dbe103 fix: Remove only call from tests 2015-12-26 19:04:14 -06:00
Blade Barringer
5127068ca7 chore: Compile css 2015-12-26 19:02:28 -06:00
Blade Barringer
7df3b333f6 feat: Refine clear local storage function 2015-12-26 19:00:45 -06:00
Blade Barringer
ef25956ba3 feat(views): Create generic message alert modal 2015-12-26 19:00:44 -06:00
Blade Barringer
d36755b64a tests: Remove unnecessary describe closure in auth ctrl spec 2015-12-26 19:00:44 -06:00
darkmeep
1c261056fe clear local storage page added
changed submit bug to clear browser data

feat(views): Style clear local storage button
2015-12-26 19:00:42 -06:00
Blade Barringer
e5c9924141 lint: Ignore rule for one-var in tests 2015-12-26 08:13:45 -06:00
Blade Barringer
c5bf06cd24 tests(common): Add test for preening todos 2015-12-26 08:11:02 -06:00
Keith Holliday
dff464489a Added chat like route and tests 2015-12-24 18:52:14 -06:00
Sabe Jones
7a41d36834 fix(mystery): add event timeframe 2015-12-23 20:33:45 -05:00
Sabe Jones
799e68614d Revert "fix(test): pend brittle subscription checks"
This reverts commit 61c5e2e3e9.
2015-12-23 20:32:39 -05:00
Sabe Jones
26a1bcee6b Merge pull request #6395 from HabitRPG/sabrecat/subscriber-201512
Subscriber items 2015-12
2015-12-23 14:17:33 -06:00
Sabe Jones
61c5e2e3e9 fix(test): pend brittle subscription checks 2015-12-23 15:07:21 -05:00
Sabe Jones
7d0efdeeda chore(news): Android announcement
Also adds a higher-quality version of the Winter Town background.
2015-12-23 14:43:16 -05:00
Sabe Jones
468198b9e2 feat(mystery): subscriber items 2015-12
Also enables the Snowball in the Seasonal Shop.
2015-12-22 16:16:30 -05:00
Kristian Tashkov
1607b05a77 Add dependencies in vagrant dev environment for e2e tests 2015-12-22 21:53:36 +02:00
Keith Holliday
77414ca49a Added chat post route and initial tests 2015-12-22 08:48:47 -06:00