2a91cee0ff
Merge branch 'round-boss' into develop
2014-01-25 13:22:49 -06:00
1412570484
revert(party): Round boss health up instead of to nearest integer
...
This reverts commit 626da5681fFixes #2563 .
2014-01-25 13:22:24 -06:00
11b37c6047
Merge pull request #2553 from djuretic/mark_collected_items
...
Mark collected items in collection quests
2014-01-24 17:36:22 -08:00
1dc68112d1
fix(paypal): fixes #2492 , remove environment check for now, only have
...
production-mode option. revisit
2014-01-24 17:29:10 -08:00
70001b1feb
Mark collected items in collection quests
2014-01-24 22:28:19 -03:00
ecbe780e70
fix(find_uniq_user): fix
2014-01-24 17:04:01 -08:00
13131087ff
fix(translations): add env.t to rootScope
2014-01-24 23:19:17 +01:00
2eb7ea5e91
Merge pull request #2550 from HabitRPG/paglias/translations-refactoring
...
Refactor translations
2014-01-24 13:53:46 -08:00
5336134c7d
refactor(translations)
2014-01-24 22:49:36 +01:00
0c935f9c9a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2014-01-24 15:29:17 -06:00
626da5681f
fix(party): Round boss health up instead of to nearest integer
...
If the boss has something like 0.2 HP it shows as 0 which is confusing
to the user. Let's round up instead.
Fixes #2504 .
2014-01-24 15:27:30 -06:00
d107db7013
refactor(translations)
2014-01-24 21:27:06 +01:00
8e99186e9c
refactor(translations): achievements
2014-01-24 20:07:02 +01:00
95f1dc6e60
improve(translation): allow for data interpolation
2014-01-24 18:08:54 +01:00
a9095f3464
fix(translations): remove translations for privacy & terms
2014-01-24 17:38:21 +01:00
756e7be751
Merge branch 'fix-spaces' of git://github.com/Sinza-/habitrpg into
...
Sinza--fix-spaces
2014-01-24 17:12:00 +01:00
ed71522131
Fix version conflict
2014-01-24 07:28:30 -02:00
fe99bca10f
Fix spacing errors #2536
2014-01-23 21:58:38 -02:00
38b4cea732
fix(tests): include select2 in test manifest
2014-01-23 10:12:17 -08:00
13a7cc9d55
improve(translations): merge pr and lots of fixes
2014-01-23 17:02:16 +01:00
50953ddf81
Merge pull request #2525 from Sinza-/develop
...
Replace a line for env.t
2014-01-23 06:01:06 -08:00
6f3229c679
Update tavern.jade
2014-01-23 10:16:32 +01:00
669789df67
Update index.jade
2014-01-23 09:45:34 +01:00
50f992b63c
Update hall.jade
2014-01-23 09:43:17 +01:00
ab84219835
Update group.jade
2014-01-23 09:40:31 +01:00
ed180692e3
Update create-group.jade
2014-01-23 09:36:32 +01:00
6fb88ee1b5
Update chat-message.jade
2014-01-23 09:35:18 +01:00
34fe364fea
Update chat-box.jade
2014-01-23 09:33:41 +01:00
2282e36bac
Update challenges.jade
2014-01-23 09:31:33 +01:00
9fa4521739
feat(challenges): add angular-ui-select2 for simpler find/select
...
challenge winner.
2014-01-22 23:22:21 -08:00
ae0d758d8f
feat(challenges): add button for csv export
2014-01-22 23:22:21 -08:00
5201343867
Merge pull request #2528 from HabitRPG/sabe/tweak
...
docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
2014-01-22 22:49:39 -08:00
16a602f94c
feat(challenges): add csv export for challenge progress. WIP, will refine this over time - but we need it something like this for the STWC come 1/31.
2014-01-22 22:47:41 -08:00
d3f4a561fd
docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
...
Requires commit 667a426
2014-01-22 20:45:04 -06:00
d782fc6b6a
fix(stats): Better layout for attribute point allocation
2014-01-22 20:34:03 -06:00
4d834c5c2b
Replace a line for env.t
2014-01-22 22:37:09 -02:00
077e23519c
Update avatar.jade
2014-01-23 00:24:15 +01:00
c4a230d73c
Update avatar.jade
2014-01-23 00:19:42 +01:00
0fb8ec9a8b
Update tavern.jade
...
line 68 and following after confirmation
2014-01-23 00:04:17 +01:00
13503986fb
Update index.jade
...
line 39
2014-01-22 23:43:58 +01:00
9f56426472
Update hall.jade
...
line 47!
2014-01-22 23:34:06 +01:00
098247233f
Update group.jade
...
line 133 problem
2014-01-22 23:21:19 +01:00
39eb590299
Update create-group.jade
2014-01-22 22:51:57 +01:00
7540f6acc9
Update challenges.jade
2014-01-22 22:16:54 +01:00
11a558cd20
Update challenge-box.jade
2014-01-22 21:42:48 +01:00
c51c9ad03b
improve(translation): merge @Sinza- pr
2014-01-22 19:51:30 +01:00
ef97abf1bf
Fix diverging older version
2014-01-22 16:16:19 -02:00
bb13f37525
Fix identation
2014-01-22 16:07:04 -02:00
6ada7f300f
Replace hard-coded strings for env.t on views/shared/modals folder
2014-01-22 16:04:28 -02:00
5a03409e33
Revert "improve(translations): translated shared/modals/achievements"
...
This reverts commit 090c28a35b
2014-01-22 17:38:19 +01:00
Cole Gleason