Matteo Pagliazzi
cc348b2f11
refactor(bs3): sync with develop & misc
2014-01-31 20:04:40 +01:00
Matteo Pagliazzi
0764aa8c17
refactor(bs3): convert icons to new format
2014-01-31 19:47:48 +01:00
Tyler Renelle
0a0c6c73a5
chore(bailey): fix bailey notifs to say Jan 31 for cut off dates @lemoness
2014-01-30 21:34:06 -07:00
Tyler Renelle
aff885c05c
feat(habitBirthday): add habitrpg birthday event. includes cakes for all
...
pets, absurd party robes, npc swap, badge, etc. @lemoness
2014-01-30 19:20:07 -07:00
Matteo Pagliazzi
c7c6181bbc
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-01-30 22:26:28 +01:00
Matteo Pagliazzi
76db2d49c2
18n(merge): merge @Sinza- pr, @lefnire now it is ready
2014-01-30 22:25:42 +01:00
Marcelo Sizer
44d9ea2a15
i18n(interpolation): Add string interpolation
2014-01-30 18:25:25 -02:00
Tyler Renelle
3660f1a85c
feat(premium): backport server code for premium subs (it's just ccard
...
handling & uer model stuff)
2014-01-30 10:51:32 -07:00
Matteo Pagliazzi
e9fb7d0343
Merge pull request #2627 from Sinza-/subscriber
...
i18n(subscriber): replace subscriber hard-coded strings for env.t
2014-01-30 09:37:42 -08:00
Matteo Pagliazzi
c93bc46908
refactor(bs3): use templates for modals
2014-01-29 22:18:13 +01:00
Matteo Pagliazzi
4c9da6883f
refactor(bs3): static pages
...
works everything exeception made for the login modal, it opens but since this directive has had a lot of changes in angular-ui-bootstrap it will require more work (like all modals), @lefnire
2014-01-29 18:26:58 +01:00
Cole Gleason
2b17b041ca
Merge pull request #2533 from Sinza-/buy-quest
...
Add information to quests on the Market before you buy them
2014-01-28 18:49:29 -08:00
Marcelo Sizer
cd4cb0a552
i18n(subscriber): replace subscriber hard-coded strings for env.t
2014-01-28 22:30:05 -02:00
Tyler Renelle
ffe415e6f3
chore(bailey): add announcement re: STWC processing time
2014-01-28 12:44:19 -08:00
Tyler Renelle
a4524cdb9a
chore(bailey): add bailey for group plans + perfect day achiev. Keep
...
basic-plan announcement up for a bit longer
2014-01-28 12:27:30 -08:00
Matteo Pagliazzi
abdbaa6fe3
Merge pull request #2583 from Sinza-/split-main-json
...
Split main.json
2014-01-28 10:25:31 -08:00
Matteo Pagliazzi
f15d825dc5
Merge pull request #2600 from Sinza-/envt-drops
...
Replace hard-coded strings for env.t on drops.jade file
2014-01-28 10:24:13 -08:00
Tyler Renelle
2e18f0eb82
feat(premium): backport client-side premium code to public repo, it's
...
client-side anyway (@colegleason @paglias)
2014-01-27 16:34:22 -08:00
Marcelo Sizer
aa6ee57ca7
Replace hard-coded strings for env.t on drops.jade file
2014-01-27 15:45:46 -02:00
Tyler Renelle
286a69fd46
chore(bailey): udpated bailey for premium
2014-01-26 13:59:41 -08:00
Marcelo Sizer
8f4016d669
Split main.json
2014-01-26 17:30:41 -02:00
Sabe Jones
bc1adeb127
fix(mounts): Move avatar upward when mounted regardless of pet
...
Step 1 toward fixing some of our mount sprite positioning issues. If the avatar always moves up when mounted, we gain substantial freedom to reposition the mount, especially on the vertical axis.
2014-01-26 11:02:59 -06:00
Matteo Pagliazzi
4274090205
fix(translations): fix #2564 and similar ones
2014-01-26 14:48:38 +01:00
Tyler Renelle
1dc68112d1
fix(paypal): fixes #2492 , remove environment check for now, only have
...
production-mode option. revisit
2014-01-24 17:29:10 -08:00
Matteo Pagliazzi
5336134c7d
refactor(translations)
2014-01-24 22:49:36 +01:00
Matteo Pagliazzi
d107db7013
refactor(translations)
2014-01-24 21:27:06 +01:00
Matteo Pagliazzi
8e99186e9c
refactor(translations): achievements
2014-01-24 20:07:02 +01:00
Marcelo Sizer
635451dc8c
Close quest modal after quest purchase
2014-01-23 16:11:40 -02:00
Marcelo Sizer
b2d5e2a090
Add popover quest description to quests in the Market and add buyQuest modal to show text and rewards before purchasing the quest
2014-01-23 15:53:42 -02:00
Matteo Pagliazzi
13a7cc9d55
improve(translations): merge pr and lots of fixes
2014-01-23 17:02:16 +01:00
Sabe Jones
d3f4a561fd
docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
...
Requires commit 667a426
2014-01-22 20:45:04 -06:00
Luveluen
077e23519c
Update avatar.jade
2014-01-23 00:24:15 +01:00
Luveluen
c4a230d73c
Update avatar.jade
2014-01-23 00:19:42 +01:00
Matteo Pagliazzi
c51c9ad03b
improve(translation): merge @Sinza- pr
2014-01-22 19:51:30 +01:00
Marcelo Sizer
ef97abf1bf
Fix diverging older version
2014-01-22 16:16:19 -02:00
Marcelo Sizer
bb13f37525
Fix identation
2014-01-22 16:07:04 -02:00
Marcelo Sizer
6ada7f300f
Replace hard-coded strings for env.t on views/shared/modals folder
2014-01-22 16:04:28 -02:00
Matteo Pagliazzi
5a03409e33
Revert "improve(translations): translated shared/modals/achievements"
...
This reverts commit 090c28a35b
2014-01-22 17:38:19 +01:00
Matteo Pagliazzi
eec6ead971
Revert "improve(translations): translate death modal"
...
This reverts commit 50333026b6
2014-01-22 17:34:54 +01:00
Matteo Pagliazzi
50333026b6
improve(translations): translate death modal
2014-01-22 17:18:35 +01:00
Matteo Pagliazzi
090c28a35b
improve(translations): translated shared/modals/achievements
2014-01-22 17:08:12 +01:00
Tyler Renelle
e48c7277f8
fix(quests): list multiple rewards in dialog
2014-01-21 14:12:09 -08:00
Paul Sainsbury
66582b2d05
Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ
2014-01-19 22:24:54 +02:00
Tyler Renelle
90176444e9
feat(bailey) notif about STWC updates + scroll-purchase deadlines (@colegleason)
2014-01-16 12:47:55 -07:00
Tyler Renelle
518f200a8f
fix( #2375 ) merge in @SabreCat's stats.jade changes "More elegant
...
show/hide setup for attribute bonuses"
2014-01-15 22:15:26 -07:00
Tyler Renelle
86220f3e0e
Merge pull request #2319 from HabitRPG/sabe/preferences
...
Finish up @wc8 suggested user preferences: tags and Advanced Options
2014-01-15 21:04:05 -08:00
Tyler Renelle
003e214080
#2384 add alert on paypal taking a long time to clear
2014-01-15 19:45:07 -07:00
Tyler Renelle
b52ea3f495
Merge pull request #2403 from HabitRPG/sabe/fix
...
Misc UI fixes
2014-01-15 16:24:03 -08:00
Tyler Renelle
e66fdd80ef
feat(perfect-day achievement)
2014-01-15 16:24:23 -07:00
Matteo Pagliazzi
2e12ffefc6
revert previous change
2014-01-15 16:56:40 +01:00
Matteo Pagliazzi
178086ef30
fix some translation strings
2014-01-15 16:54:37 +01:00
Sabe Jones
5521dd0bb1
UI fixes: Firefox display and checkbox issues, task attributes appearing with auto-allocate off
2014-01-14 21:07:46 -06:00
Tyler Renelle
128d68f544
show warning that completed to-dos are cleared after 3 days
2014-01-14 17:29:05 -07:00
Matteo Pagliazzi
6b5366b246
Merge pull request #2364 from Sinza-/develop
...
Replace hard-coded strings for env.t on views/shared/profiles folder.
2014-01-14 11:21:31 -08:00
Marcelo Sizer
6cc7d73683
Replace old stats.jade file
2014-01-14 17:06:16 -02:00
Marcelo Sizer
1b1c646e24
Replace old code
2014-01-14 16:22:14 -02:00
Marcelo Sizer
e7307681d3
Replace old code
2014-01-14 16:19:37 -02:00
Marcelo Sizer
20277e623e
Add @paglias suggested fixes
2014-01-14 16:16:40 -02:00
Marcelo Sizer
f40b8c6e64
Fix indentation
2014-01-14 16:01:53 -02:00
Marcelo Sizer
556118c1f0
Add @paglias suggested fixes
2014-01-14 15:57:55 -02:00
Matteo Pagliazzi
4e2005732c
translate some views
2014-01-14 18:50:06 +01:00
Matteo Pagliazzi
6ca81f5b31
fix some translations in jade views @Sinza-
2014-01-14 18:32:40 +01:00
Marcelo Sizer
8a8d3f17ca
Fix typo
2014-01-11 16:16:02 -02:00
Marcelo Sizer
8188f173bc
Replace hard-coded strings for env.t on views/shared/profiles folder.
2014-01-11 16:11:45 -02:00
Tyler Renelle
5583f5fb23
Merge pull request #2363 from Sinza-/develop
...
Fix challenge completed not displaying text when someone wins a challenge.
2014-01-11 10:11:33 -08:00
Marcelo Sizer
1ec534a650
Fix typo
2014-01-11 14:36:18 -02:00
Marcelo Sizer
d978eb8702
Fix challenge completed not displaying text when someone wins a challenge.
2014-01-11 14:33:48 -02:00
Tyler Renelle
36d32d6b16
update forum & lfg links
2014-01-09 20:48:36 -07:00
Sabe Jones
27e9dfa0d5
Finish up @wc8 suggested user preferences: tags and Advanced Options start collapsed
2014-01-08 22:19:38 -06:00
Tyler Renelle
24b2094f35
Merge pull request #2300 from HabitRPG/sabe/tweak
...
More UI demystification
2014-01-08 14:34:09 -08:00
Sabe Jones
0a959b5f92
More UI demystification
2014-01-07 22:56:18 -06:00
Tyler Renelle
f742d3202a
Merge pull request #2296 from SyntaxPickax/develop
...
Fixed UI issues when editing checklists
2014-01-07 20:22:52 -08:00
Brandon McPhail
07d4fc1184
Fixed UI issues when editing checklists
2014-01-07 11:55:41 -08:00
Tyler Renelle
bc451c20bf
Merge remote-tracking branch 'colegleason/task-due' into develop
...
Conflicts:
views/shared/tasks/task.jade
2014-01-07 10:53:27 -07:00
Tyler Renelle
bf594dadd1
Merge pull request #2287 from HabitRPG/sabe/tweak
...
Add 1px margin to task badges so they don't run into each other/icons
2014-01-07 09:50:17 -08:00
Tyler Renelle
154abcefbb
#2010 Add party stats back in. Depends on habirpg-shared#939ce14 to wrap members
2014-01-07 10:46:51 -07:00
snicker
ec236f36d8
Emoji (and markdown =0) support in tags. May want to reduce this to *just* emoji at some point via another directive. Fixes #2164
2014-01-07 07:37:54 -08:00
Sabe Jones
d6e6daa3dc
Add 1px margin to task badges so they don't run into each other and icons
2014-01-07 07:20:43 -06:00
Cole Gleason
3150b7b31b
use correct granularity when checking if a task is overdue
2014-01-07 00:44:27 -06:00
Tyler Renelle
295815d1a3
typo fix
2014-01-06 21:54:01 -07:00
Tyler Renelle
44280c4a0e
Merge pull request #2272 from Sinza-/envt/tasks
...
Replace hard-coded strings for env.t on folder views/shared/tasks/
2014-01-06 20:44:33 -08:00
Tyler Renelle
ac1bcd4791
winter: disable gold in restore-values during the WWE event
2014-01-06 18:44:53 -07:00
Tyler Renelle
b3dd1e0a68
bailey: WWE pt 4 (class gear)
2014-01-06 17:44:17 -07:00
Marcelo Sizer
73e9730fe7
Fix replacing typo
2014-01-06 17:47:16 -02:00
Marcelo Sizer
255acd79d2
Replace hard-coded strings for env.t on views/shared/tasks/ folder
2014-01-06 17:36:33 -02:00
Tyler Renelle
e23b42f300
#2186 hide task attrs unless allocationMode == 'taskbased'
2014-01-05 15:16:55 -07:00
Tyler Renelle
a6f096d730
#2186 hide task attributes if auto-allocate not enabled
2014-01-05 15:08:10 -07:00
Tyler Renelle
8c319b6079
Merge pull request #2186 from HabitRPG/sabe/tweak3
...
Advanced Options default to being shown
2014-01-05 14:06:42 -08:00
Sabe Jones
7904b8e4db
Clear up some confusion caused by AngularJS number filter
2014-01-05 09:32:20 -06:00
Matteo Pagliazzi
7cfca80e2f
remove unnecessary text tags
2014-01-05 13:23:45 +01:00
Matteo Pagliazzi
ce64affa92
fix gems styling
2014-01-05 12:59:00 +01:00
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
Tyler Renelle
c6ab84721f
fix #2205 hide checklist button from challenges
2014-01-04 10:58:12 -07:00
Tyler Renelle
45b543c1ed
challenges: don't disable notes field when challenge-task
2014-01-03 13:14:56 -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
Sabe Jones
a9e57a8adf
Merge branch 'develop' into sabe/attributes
2014-01-01 12:42:53 -06:00
Tyler Renelle
dfe6d9ff88
tasks: dbl-click saves a task when previously in edit-mode. @sabrecat
...
@wc8 it used to be it just closes the edit dialog, but I find myself
wanting to dblclick to save each time. Let me know if you think this is
a bad idea
2013-12-31 18:11:20 -07:00
Tyler Renelle
962d509405
checklists #2198 don't collapse when in edit mode (that what you mean @sabrecat?)
2013-12-31 14:05:39 -07:00
Tyler Renelle
09eddd3eb2
checklists #2198 click badge to collapse checklist @sabrecat
2013-12-31 14:03:16 -07:00
Tyler Renelle
77c6777506
checklists: collapse individually
2013-12-31 13:50:14 -07:00
