ae8542eaf1
Removed extraneous console logs left while testing
2014-12-29 15:50:44 -06:00
efba545147
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2014-12-29 15:44:06 -06:00
b3025c36b1
Fixed checklist not advancing to next input. Closes #4430
2014-12-29 15:43:20 -06:00
756fa83418
fix(date): typo
2014-12-29 22:26:12 +01:00
cb13b5ac26
fix(date): add YYYY/MM/DD format
2014-12-29 22:16:58 +01:00
3105b61cb5
Merge branch 'Verabird-dateformat' into develop
2014-12-29 21:24:44 +01:00
4a37bec652
fix(pr): indentation and simplify
2014-12-29 21:21:54 +01:00
4e1b298a42
Corrected spelling error in comment
2014-12-29 14:16:25 -06:00
752161b284
Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat
2014-12-29 21:09:04 +01:00
a082e88b5d
Filter Array only once and one time binding - closes #4429
2014-12-27 23:26:30 +01:00
695c463b40
Added confirmation dialog before deleting message
2014-12-26 21:04:22 -06:00
8852ad61b2
Add dateFormat preference field to user model and make settingsCtrl change the field when form is changed
2014-12-26 15:52:42 -05:00
7297429888
Make it possible to choose between MM/dd and dd/MM date format
2014-12-26 15:52:42 -05:00
0e28f04c90
feat(event): Implement Seasonal Shop
2014-12-25 14:33:11 -06:00
9406b3cf70
Removed unnecessary console.log
2014-12-18 22:36:52 -06:00
7f10049b37
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
...
Conflicts:
views/options/social/chat-message.jade
2014-12-18 21:55:50 -06:00
45d30ffef5
fix(footerCtrl.js): disable addThis hover
...
Activate addThis dropdown on click/tap not on hover.
2014-12-12 17:41:45 +00:00
38cd0e8de1
Added method for letting an admin unhide a flagged message
2014-12-11 17:29:01 -06:00
ae6e0255c6
feat(flag-message): add server methods
2014-12-07 14:35:09 +01:00
5acde1e609
Added todo for paglias
2014-12-07 13:50:47 +01:00
7a7c13ff6d
Prevent modal from popping up if already reported
2014-12-07 13:50:47 +01:00
e9cffe6206
Error handling for if message already flagged
2014-12-07 13:50:46 +01:00
5a6c9fbf84
Added some logic for adding flags
2014-12-07 13:50:46 +01:00
c44c607ae7
Renamed flagChat to flagChatMessage
2014-12-07 13:50:46 +01:00
62d92db332
Added buttons to footer, cleaned up functions
2014-12-07 13:50:46 +01:00
6fcf1846b3
Renamed everything from flag to abuseFlag
2014-12-07 13:50:46 +01:00
5e1e1b2c13
Flag icon opens blank modal
2014-12-07 13:50:46 +01:00
d2e230db1f
fix(plans): various bug fixes
2014-12-03 18:34:26 -07:00
0a53a5717e
refactor(payments): move payments into it's own service, out of rootCtrl
2014-12-03 14:17:08 -07:00
0fffd66588
feat(plans): time travelers tab, 1 trinket to buy 1 set
2014-12-03 14:17:08 -07:00
7f2b6b5cfb
feat(plans): allow block subscriptions from paypal/stripe
2014-12-03 14:17:07 -07:00
5b01fff700
feat(gifts): allow gifting subscriptions
2014-12-03 14:17:07 -07:00
e8dbd5ca1a
feat(gifts): allow gifting gems from paypal/stripe
2014-12-03 14:17:07 -07:00
7e9b92fcad
feat(gifts): allow gifting from balance
2014-12-03 14:17:07 -07:00
66b4dae0d9
feat(news): move old news to /static/old-news, better use of content space
2014-12-03 13:49:24 -07:00
8794adde69
Updated function to go to correct options pane. Closes # 4319
2014-12-03 08:01:23 -06:00
50b1cba0a6
refactor(tasks) improve UI consistency
...
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
d45f40ca1f
refactor(tags): simplify with ui-keyup, see #4141
2014-10-29 14:28:09 -06:00
c3a62096ad
Merge pull request #4141 from gjoyner/tags
...
Tags (filters) saves when pressing Enter instead of deleting
2014-10-29 14:27:21 -06:00
8423de287e
Merge pull request #4142 from gjoyner/tasks
...
Popovers now disappear when clicking Save & Close
2014-10-29 14:22:21 -06:00
d11dd852c5
Merge pull request #4144 from gjoyner/front
...
Front page's Forgot Password will report an invalid email address instead of simply errorring. Does NOT include updated locals/en/front.json
2014-10-29 14:19:38 -06:00
7d817f1298
change Heroic to Guardian for non-staff moderators
2014-10-28 11:33:50 +10:00
b15e239601
Merge branch 'Alys-communityGuidelines' into develop
2014-10-27 16:20:30 -06:00
5e89d07e07
add tabs to Habits (All, Yellow-Red, Green-Blue) and to rewards (All, Equipment & Skills)
2014-10-21 15:39:46 +10:00
817e7b8686
replace original challenge fix with negue's suggestion
2014-10-17 19:37:35 +10:00
5e87b42af3
Front page's Forgot Password will report an invalid email address instead of simply errorring. Does NOT include updated locals/en/front.json
2014-10-13 23:47:34 -07:00
4ab19ac225
Popovers now disappear when clicking Save and Close
2014-10-13 14:10:59 -07:00
feb55324ba
Tags (filters) saves when pressing Enter instead of deleting the current tag
2014-10-13 01:57:59 -07:00
56e2ec1bc4
Merge pull request #4140 from gjoyner/checklists
...
Adding checklist item drag and drop feature
2014-10-12 18:27:06 -06:00
cd4626ec06
fix(moment): use new syntax, remove deprecation warning
2014-10-12 20:40:58 +02:00
Blade Barringer