Commit Graph

8509 Commits

Author SHA1 Message Date
Blade Barringer 66ac773ce9 Added comment about expect 2015-03-04 20:55:08 -06:00
Blade Barringer 7200f3a1d2 Wrote a todo for test 2015-03-04 20:55:08 -06:00
Blade Barringer 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
Blade Barringer 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
Blade Barringer 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
Blade Barringer 90fe516562 Join button was showing even if user was already part of the group 2015-03-04 16:24:37 -06:00
Sabe Jones f5f55c95c5 Merge pull request #4793 from SabreCat/backgrounds
March Backgrounds
2015-03-03 21:54:20 -06:00
Sabe Jones 27446da338 chore(grunt): compile sprites 2015-03-03 21:49:07 -06:00
Sabe Jones 21fd8061cf feat(backgrounds): March BGs 2015-03-03 21:42:15 -06:00
Matteo Pagliazzi 85b547196e chore(i18n): update locales 2015-02-28 18:23:17 +01:00
Alys 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
Blade Barringer cbc49829c8 Merge branch 'food_tray_padding' of https://github.com/kangabell/habitrpg into food-tray 2015-02-26 14:08:17 -06:00
K. Belardinelli 194aac1656 use more specific class for selector 2015-02-26 15:02:58 -05:00
Blade Barringer 7432b6fd57 Removed test string 2015-02-26 13:24:04 -06:00
Blade Barringer d0e1f25c0b Added one time binding 2015-02-26 13:23:30 -06:00
Blade Barringer fa31023830 Changed ng-show to an ng-if so that table striping would be correct 2015-02-26 13:22:24 -06:00
Blade Barringer 13c7804f64 Merge pull request #4757 from crookedneighbor/guild-button
Guild button
2015-02-25 17:28:39 -06:00
Blade Barringer 1629ca037b Did the _.isMember stuff the right way 2015-02-25 15:28:14 -06:00
Blade Barringer a905f481e8 Added join button to top. Closes #3408 2015-02-25 15:07:54 -06:00
Blade Barringer cb2af51faa Corrected ng-click to join 2015-02-25 14:45:04 -06:00
Blade Barringer 0d7b6b445e Added buttons for joining and leaving group. 2015-02-25 14:34:24 -06:00
Blade Barringer 30e158de48 Add _isMember attribute to groupSchema 2015-02-25 11:51:32 -06:00
Sabe Jones b4b56e87f0 Merge pull request #4751 from SabreCat/mystery
Mystery Feb 2015
2015-02-24 21:01:52 -06:00
Sabe Jones 3d3438e074 chore(grunt): Compile sprites 2015-02-24 20:45:50 -06:00
Sabe Jones 7d943d9007 fix(mystery): Last missing sprite 2015-02-24 20:40:32 -06:00
Sabe Jones f5f21718ae fix(mystery): Missing sprites 2015-02-24 20:33:02 -06:00
Sabe Jones 55066480fb feat(mystery): Migration 2015-02-24 20:19:20 -06:00
Sabe Jones d4f8acd0ef feat(mystery): February 2015 2015-02-24 20:15:31 -06:00
Blade Barringer 33bd640bdb Fixes #3054 won't show pets as able to be fed if egg has noMount propery 2015-02-24 19:10:45 -06:00
Blade Barringer 016e359690 Fixes #4749 2015-02-24 16:58:48 -06:00
Blade Barringer 6eeff5a0af Changed matt back to brown hair version 2015-02-24 13:37:14 -06:00
Matteo Pagliazzi 6d637e89a2 new bailey 2015-02-24 19:29:00 +01:00
Matteo Pagliazzi 45f2453a62 typo 2015-02-24 16:51:09 +01:00
Alice Harris 84018a7739 create script that forces all recent users to be resting in the inn - useful when we have massive server problems 2015-02-24 20:59:51 +10:00
Tyler Renelle 02901e52fd perf(auth): small register perf improvement. use $or in $regex query,
intead of two queries, so if first operand true we short-circuit second operand
2015-02-23 23:48:46 -07:00
Tyler Renelle 16c4c420bb chore(server): small updates to better support recent nodejs buildpack 2015-02-23 23:48:46 -07:00
Blade Barringer e9b72ad40d Merge pull request #4721 from crookedneighbor/fix-challenge-select-ios
Fixes #4719. Guild select for challenges pre-populates with first group
2015-02-23 22:09:17 -06:00
Matteo Pagliazzi 14d6a59e96 chore(i18n): update locales 2015-02-23 21:53:50 +01:00
Matteo Pagliazzi 4da8eb1d58 fix(typo) 2015-02-23 21:51:15 +01:00
Matteo Pagliazzi 4151b0733f add ability to unsubscribe from a single event using a dedicated link 2015-02-23 21:25:01 +01:00
Blade Barringer b010a53bed Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-02-23 11:11:38 -06:00
Blade Barringer 067f32a4ae Corrected paths in karma conf 2015-02-23 11:11:19 -06:00
Tyler Renelle a819f68fdf minor migration update 2015-02-23 09:50:28 -07:00
Blade Barringer 21ef62481d Removed step attribue from contributor input 2015-02-23 09:41:27 -06:00
Blade Barringer a2eda6c91a Merge pull request #4733 from remmz0r/gemDisplay
Gem Display Text in Modals (new) - Fixes #4645
2015-02-22 13:17:47 -05:00
Blade Barringer 5aa4015249 Refactored pet display name changes 2015-02-22 12:12:38 -05:00
Blade Barringer f355672b3b Merge pull request #4703 from scribblypanda/issue2825
added pet colour to feed/evolve notif
2015-02-22 12:12:23 -05:00
Bryce Wojtowicz 0931d52d56 Edit: fixed tabs instead of spaces issue 2015-02-22 13:39:19 +08:00
Bryce Wojtowicz 44478d3792 Fixes #4645
Fixes Gem Display in modals to say [Gem] You have [n] Gems
Modified code to use a translatable string!
Thanks for the tip :)
2015-02-22 13:35:50 +08:00
K. Belardinelli 20483284ad [fixes #4647] reduce padding at bottom of food-tray container to avoid awkward scrollbar breakpoint 2015-02-21 12:26:53 -05:00