hairlessbear
c47c555a21
Added indication of currently equipped preferences to avatar customization page
2015-05-17 16:30:22 -04:00
Matteo Pagliazzi
d872682846
Merge pull request #5063 from gisikw/dated-tasks-correct-impl
...
Use minification-friendly syntax
2015-04-22 18:22:05 +02:00
Kevin Gisi
705f9016c5
Use minification-friendly syntax
2015-04-22 12:04:04 -04:00
Matteo Pagliazzi
37f7db3c4e
feat(emails): add support for weekly recap emails
2015-04-22 16:30:53 +02:00
Matteo Pagliazzi
c699fcde49
chore(i18n): update locales
2015-04-22 16:22:11 +02:00
Alys
7c36e49243
Merge pull request #5022 from gisikw/dated-tasks-correct-impl
...
Dated tasks correct impl
2015-04-22 16:56:03 +10:00
Alys
56592d144d
Merge pull request #5048 from Rbrinkley/patch-1
...
Update front.jade
2015-04-22 15:34:22 +10:00
Alys
28e49f99f5
Merge pull request #5055 from gisikw/contributor-profile-fix
...
Inject RootCtrl into MemberModalCtrl to expose shared methods
2015-04-22 15:34:10 +10:00
Alys
5b1f9d4f5e
Merge pull request #5049 from Rbrinkley/patch-2
...
Increased Carousel Sliding Time on Static.Front
2015-04-22 15:33:49 +10:00
Kevin Gisi
a05714405a
Inject RootCtrl into MemberModalCtrl to expose shared methods
2015-04-21 05:17:15 -04:00
Rbrinkley
340c484547
Increased Carousel Sliding Time on Static.Front
...
Increased carousel sliding time for front page in the "Players use HabitRPG to Manage" section. Increased time from 4 seconds to 10 seconds. Not too slow and not too fast. fixes https://github.com/HabitRPG/habitrpg/issues/5047
2015-04-19 10:52:34 -05:00
Matteo Pagliazzi
ee7ba19ed1
feat(i18n): upload japanese, serbian and chinese (taiwan)
2015-04-19 13:34:20 +02:00
Matteo Pagliazzi
662c8cd529
chore(i18n): update locales
2015-04-19 13:28:21 +02:00
Alys
175ec9bb46
Merge pull request #5007 from stillsnowedin/develop
...
Updated the custom day start information in settings. (#5006 )
2015-04-19 15:02:37 +10:00
Rbrinkley
26c1003f4a
Update front.jade
...
Increased time for carousel sliding from 4 seconds to 10 seconds. 4 seconds too fast for user to full read all the information, 10 seconds is not too slow but not too fast.
2015-04-18 22:29:36 -05:00
Tyler Renelle
cfc8ff96e6
feat(tour): tmp set variant=2 to (counter + finish button) until we can
...
get google experiment working
2015-04-16 20:17:13 -06:00
Blade Barringer
1d95784dde
refactor isMemberOfGroup and tests
2015-04-16 07:58:35 -05:00
hairlessbear
68486f7c42
Fixed display of Pet Hydra in Tavern (Tier 6)
...
In the Tier 6 contributor description, the Pet Hydra wasn't displaying. Changed `div` tag to `span` to fix the issue.
2015-04-16 07:48:15 -05:00
Blade Barringer
4853c0814d
Corrected function
2015-04-16 07:39:55 -05:00
Blade Barringer
999e0188f2
Merge branch 'gisikw-guild-detail-join-leave_plus_blade' into develop
...
Conflicts:
website/public/js/controllers/groupsCtrl.js
2015-04-16 07:33:51 -05:00
Blade Barringer
5ef4b7b395
Add tests for isMemberOf
2015-04-16 07:32:56 -05:00
Blade Barringer
e1a623d3e0
Merge pull request #5031 from gisikw/guild-detail-join-leave
...
Join/Leave buttons on guild detail page. Addresses #4427
2015-04-15 22:46:33 -05:00
Kevin Gisi
160982df33
Simplify group detection logic for guilds
2015-04-15 23:10:12 -04:00
Sabe Jones
cbe25985aa
Merge pull request #5036 from SabreCat/slime
...
Slime pet
2015-04-15 19:04:07 -05:00
Sabe Jones
55324e8fa5
chore(grunt): compile sprites
2015-04-15 18:56:51 -05:00
Sabe Jones
7d1a58ca00
fix(slimes): Tweaks and missing sprite
...
Slimes don't have skeletons anyway, right?
2015-04-15 18:48:57 -05:00
Sabe Jones
f13c6cba00
feat(pets): Slime Quest
2015-04-15 18:08:43 -05:00
Matteo Pagliazzi
e474f0300c
chore(i18n): update locales
2015-04-15 17:13:07 +02:00
Kevin Gisi
d455666650
Join/Leave buttons on guild detail page. Addresses #4427
2015-04-15 06:15:11 -04:00
Blade Barringer
c19ec1387a
chore(grunt): compile sprites
2015-04-14 22:18:37 -05:00
Blade Barringer
c7cc6f0ae8
Merge pull request #5027 from crookedneighbor/send_test_data_to_test_db
...
Send test data to test db
2015-04-14 19:59:02 -05:00
Kathryn Norris
2fc01ee776
Simplified custom day start info in settings. ( #5006 )
2015-04-14 16:47:37 -07:00
Blade Barringer
fc979dfdaa
create new string for quest participants to correct processing error
...
closes #5025 , closes #5029
2015-04-14 17:52:08 -05:00
Kathryn Norris
6a461be0a4
Replaced toggleCustomDayStartInfo function with angular magic. ( #5006 )
2015-04-14 14:49:45 -07:00
Kathryn Norris
8c45ab8dc4
Removed unused strings and altered custom day start text. ( #5006 )
2015-04-14 14:23:20 -07:00
Blade Barringer
83858da25e
Change button to be more specific
2015-04-14 08:11:39 -05:00
Alys
9aaf252628
Merge pull request #5016 from hairlessbear/develop
...
Changed Difficulty link from Trello to Wiki
2015-04-14 22:32:14 +10:00
Alys
6296a2f4df
Merge pull request #4969 from Alys/explain-drops-2015-03-04
...
add text to Market for eggs, etc to explain to new users that the items will also drop
2015-04-14 18:22:47 +10:00
Alys
00abf0d694
update Drop System explanation
2015-04-14 17:57:10 +10:00
Kathryn Norris
5dc1d58f8f
Altered custom day start text. ( #5006 )
2015-04-13 17:13:23 -07:00
Kathryn Norris
ea2ad4e4b5
Changed the text for custom day start info. ( #5006 )
2015-04-13 17:13:22 -07:00
Kathryn Norris
ddb7643ff7
Updated the custom day start information in settings. ( #5006 )
2015-04-13 17:13:22 -07:00
Blade Barringer
b027e2c407
Corrected port and db to use
2015-04-13 17:22:24 -05:00
Alys
a7abbe0e05
changed drops Learn More link and added drop types to Drops Unlocked message
2015-04-14 08:01:32 +10:00
Matteo Pagliazzi
4fe740a403
chore(i18n): update locales
2015-04-13 19:31:53 +02:00
Kevin Gisi
b503a0fd64
Repaired task reordering issue
...
* Created `conditionalOrderBy` filter with a similar signature to `orderBy`,
using a single conditional argument that when false, causes the filter to
return the array unchanged
* Updated task view to use `conditionalOrderBy`
* Added karma specs for `conditionalOrderBy` filter
2015-04-13 08:51:08 -04:00
Kevin Gisi
02838214c7
Reimplement (broken) task ordering
2015-04-13 07:47:56 -04:00
Alys
e7775c1d82
Merge pull request #5021 from Alys/revert-4996-Sort-dated-todos
...
revert PR #4996 (Sort dated todos) because of problems sorting other tasks
2015-04-13 20:24:27 +10:00
Alys
8af1f0538b
revert PR #4996 (Sort dated todos) because of problems sorting other tasks - see comments in #4996
2015-04-13 20:16:24 +10:00
Alys
c8b5d652cd
Merge pull request #5020 from HabitRPG/revert-5000-sort-dated-todos
...
Revert "Put list back into removeTask fn, update removal logic within ch...
2015-04-13 19:42:05 +10:00
