fc3e1c6c9b
Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons.
2015-03-08 15:35:37 -05:00
1b53aeaee8
increase timeout when usubscribing from email
2015-03-08 16:25:19 +01:00
1f8ccf1f65
Merge pull request #4818 from lejeunerenard/fix-tests
...
Fixed MongoDB service and added Karma tests to Travis-CI
2015-03-07 16:50:50 -06:00
5ab2cb0908
Use PhantomJS and run karma in Travis-CI
2015-03-07 16:37:35 -06:00
b507a0fe3a
Add mongodb as a service for Travis-CI builds
2015-03-07 16:26:13 -06:00
6f8133d760
Corrected indentation of purchase test
2015-03-07 16:23:56 -06:00
35f98993c4
Skipping groups test in api for now, revisit later
2015-03-07 16:09:56 -06:00
6ab024619b
Merge pull request #4817 from lejeunerenard/fix-tests
...
WIP
2015-03-07 16:01:22 -06:00
4bc4e836e4
Make karma tests pass.
...
This pends a lot of tests that are failing due to translations not being loaded in the environment, as well as some issues with the page reload in groupServicesSpec.
We removed the module declarations for habitrpg in each spec since that
has been moved to specHelper.
2015-03-07 15:48:23 -06:00
044930b7d3
add +2 Missed Days to debug menu in footer, adjust addMissedDay function and all calls to it
2015-03-07 18:39:43 +10:00
a7f6b29225
Merge pull request #4812 from HabitRPG/blade-rebalancing
...
Merge Rebalancing branch from habitrpg-shared and preserve commit history
2015-03-07 05:54:43 +10:00
c23730fdbf
Merge branch 'develop' of github.com:HabitRPG/habitrpg into rebalancing
2015-03-06 07:47:10 -06:00
64493375ad
Fix broken group and member service specs
...
Both were trying to declare an angular mock module that did not exist.
The group service spec urls were also asserting a trailing `?` that
doesn't seem to be party of the actual request.
2015-03-05 12:43:07 -06:00
e7f65f219a
WIP - Fix karma config file order to successfully boostrap app
...
There were a few issues here:
1. Relying on globs meant that modules were loaded out of order. So
'habitrpgc' was undefined when we were trying to add services etc to it.
The short term solution is to list them in the same way we list them in manifest
json. The long term would be switching everything to browserify so as to
avoid ordering/listing nightmare by having a single bundle.
2. We were missing exeternal deps (like 'hello') so the tests were
breaking before they even started. Some of them still are
3. We were including services that don't seem to exist anymore (e.g. `habitrpgstatic`). We still are in certain places
2015-03-05 12:12:32 -06:00
cfaedb3ebd
Added bootstrap styles to button.
2015-03-05 12:11:42 -06:00
11f61c2732
Add functionality to dequip all Battle Gear or Cosutme.
2015-03-05 09:40:37 -06:00
cdc8ff6000
Changed quest egg behavior closes #4792
2015-03-04 23:46:27 -06:00
f44c3b84ab
Revert "Changed requirement to only need to complete one quest instead of two to"
...
This reverts commit f8bdaf4c99
2015-03-04 23:43:27 -06:00
f8bdaf4c99
Changed requirement to only need to complete one quest instead of two to
...
buy eggs
2015-03-04 23:39:29 -06:00
f28bc31a2c
Added dequip ability per ticket: 3730
2015-03-04 21:43:17 -06:00
5b546d5ff1
Moved karma dependency
2015-03-04 20:55:09 -06:00
dccf95a3c2
Fix nconf path in api test
2015-03-04 20:55:09 -06:00
c66966139b
Fixed typo in comment
2015-03-04 20:55:09 -06:00
4de6ce0331
Wrote todo about what is wrong with the registerNewUser function
2015-03-04 20:55:08 -06:00
735aa59851
Updated request call to use correct form
2015-03-04 20:55:08 -06:00
e6e212d436
Added todo for area where test is failing to behave properly
2015-03-04 20:55:08 -06:00
c26aceb17a
Used a numTasks variable and added comments
2015-03-04 20:55:08 -06:00
66ac773ce9
Added comment about expect
2015-03-04 20:55:08 -06:00
7200f3a1d2
Wrote a todo for test
2015-03-04 20:55:08 -06:00
e8be1524fc
Removed the create a new user function call from groups, as it was now using the correct user to look up the leader
2015-03-04 20:52:05 -06:00
ab27dd405c
Changed challenges completed count to calculate from total number of user tasks minus 2 (the two completed)
2015-03-04 20:52:05 -06:00
0716177d41
Corrected tests for archiving todos to reflect the correct number of default todos when creating account.
2015-03-04 20:52:05 -06:00
bee77ab34c
Revereted one time binding
2015-03-04 17:30:05 -06:00
90fe516562
Join button was showing even if user was already part of the group
2015-03-04 16:24:37 -06:00
f5f55c95c5
Merge pull request #4793 from SabreCat/backgrounds
...
March Backgrounds
2015-03-03 21:54:20 -06:00
27446da338
chore(grunt): compile sprites
2015-03-03 21:49:07 -06:00
21fd8061cf
feat(backgrounds): March BGs
2015-03-03 21:42:15 -06:00
f3bd5330a9
Updating to more awesome translation.
2015-03-02 21:52:50 -05:00
5f739fb078
Updating example translation
...
No harm done doing this before pushing it officially through transifex, right?
2015-03-02 21:15:44 -05:00
d9b10a4373
making strings translatable
...
not translating the body keys though...
2015-03-02 21:13:18 -05:00
ec15f239c6
removing extraneous lines
...
Not sure about translations yet...
2015-03-02 21:00:50 -05:00
b484dd3208
Allow for client notifications to user settings
...
Added functionality on successful user changes (see userNotifications
object in userServices.js)
On this commit, it will tell the user "Party order updated" when the
sorting settings change.
2015-03-02 09:00:37 -05:00
85b547196e
chore(i18n): update locales
2015-02-28 18:23:17 +01:00
35fea2101a
Merge pull request #4743 from Alys/develop
...
migration script to force active users to be resting in the inn
2015-02-28 14:44:10 +10:00
cbc49829c8
Merge branch 'food_tray_padding' of https://github.com/kangabell/habitrpg into food-tray
2015-02-26 14:08:17 -06:00
194aac1656
use more specific class for selector
2015-02-26 15:02:58 -05:00
7432b6fd57
Removed test string
2015-02-26 13:24:04 -06:00
d0e1f25c0b
Added one time binding
2015-02-26 13:23:30 -06:00
fa31023830
Changed ng-show to an ng-if so that table striping would be correct
2015-02-26 13:22:24 -06:00
13c7804f64
Merge pull request #4757 from crookedneighbor/guild-button
...
Guild button
2015-02-25 17:28:39 -06:00
kholliday