6304dd2e15
feat(auth): move to hello.js for social auth, paves the way for multiple
...
connectors. Prettier buttons via zocial
2014-11-06 14:45:06 -07:00
8651f0da25
fix(facebook): move from passport-facebook to Facebook JS SDK. Better
...
security on FB login by validating accessToken. Create user from FB
profile if none exists, allows 3rd-party apps to. Fixes #4221
2014-11-05 18:23:10 -07:00
b79118c976
fix decapitated mount head
2014-11-02 18:54:33 +10:00
0963f0fc0a
Merge pull request #4114 from Alys/lynnyliz-develop
...
changes made by lynnyliz to reorganise the mounts page (with fixes for merge conflicts, etc)
2014-11-01 10:25:38 +10: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
5d67995458
Merge pull request #4177 from holyspecter/challenge-action-bacground-bug
...
Minor bug: In challenges area, Join button has a yellow background
2014-10-27 13:58:26 -06:00
b5fe46155b
Merge pull request #4188 from tylerdmace/develop
...
removed broken img tag and added quotes to malformed a tags
2014-10-27 13:57:49 -06:00
5a4aee90ed
removed broken img tag and added quotes to malformed a tags
2014-10-26 06:14:31 -06:00
76de909683
Minor bug: In challenges area, Join button has a yellow background
2014-10-22 01:45:37 +03: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
739e7d3d76
Merge pull request #4157 from crookedneighbor/add-setting-for-due-view
...
Added setting for making the due tab default on dailies
2014-10-20 05:34:40 +10:00
b1fc435c9a
feat(emails): add new images
2014-10-19 17:02:25 +02:00
d8ff2b6181
Merge pull request #4155 from crookedneighbor/fix-bootstrap-width-errors
...
Changed margin .row under .container-fluid to match padding
2014-10-19 18:44:39 +10:00
31d0c970fe
Merge pull request #4159 from crookedneighbor/update-landing-page-img
...
Set tags to default tags
2014-10-17 17:17:12 +02:00
40585bf977
Set tags to default tags
2014-10-17 09:46:11 -05:00
817e7b8686
replace original challenge fix with negue's suggestion
2014-10-17 19:37:35 +10:00
ed15d0b1c7
Added setting for making the due tab default on dailies
2014-10-16 21:04:23 -05:00
ee0e8efa9d
Changed margin .row under .container-fluid to match padding
...
Since the default is padding: 0 15px, changing it to 0 5px
also requires a change to the row right after it
2014-10-16 16:13:33 -05:00
9b67c4a78e
Removed extra layer mistakenly left on
2014-10-16 15:08:52 -05:00
c8efc166ba
Corrected mobile view stats
2014-10-16 15:07:57 -05:00
e584d7caf9
Updated look of landing page image
2014-10-16 14:57:48 -05: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
9afbe42dbf
Fixing indentions in taskCtrl.js
2014-10-12 03:15:28 -07:00
36bf09d984
Adding checklist item drag and drop feature
2014-10-12 01:48:51 -07:00
13b12b830c
allow a task to stay visible while being edited, regardless of other parameters
2014-10-10 22:14:43 +10:00
9669fbcbf9
make All the default tab for Dailies (instead of Due)
2014-10-09 21:20:19 +10:00
43d2d1355e
renamed Daily tabs to save space, removed To-Dos from new code because compled/all tabs were blank, decoupled To-Do code from Dailes code to allow future changes (e.g., "Dated" tab for To-Dos)
2014-10-09 20:04:03 +10:00
c4a2e720fd
Add ability to hide completed dailies.
...
While I was at it, I also did a bit of refactoring in general around the hiding
of completed todos/dailies.
2014-10-09 14:49:04 +10:00
96b41448cd
Merge pull request #4112 from betaveros/unallocated-notification
...
Notification for Unallocated Attribute Points (fixes #4109 )
2014-10-08 19:53:50 +02:00
37971ffceb
upgrade code to support moment 2.8.x
2014-10-07 21:30:01 +02:00
e5700a35e2
make whitespace consistent (tabs changed to spaces) - yes this IS pedantic, sorry :)
2014-10-06 11:53:24 +10:00
7e0022817f
remove unused menu.mounts style (probably best anyway to keep using menu.pets in both pets and mounts pages for consistency of appearance)
2014-10-06 11:52:15 +10:00
e53dd0da20
add padding-top: -30px --> vertical-align: top fix from a previous PR
2014-10-06 11:44:53 +10:00
ecd61ee602
Merge branch 'develop' of https://github.com/lynnyliz/habitrpg into lynnyliz-develop
...
Conflicts:
views/options/inventory/stable.jade
2014-10-06 11:36:32 +10:00
5809e52fe9
Make attribute referencing in notification logic more robust
2014-10-04 20:56:13 +08:00
9ecbe9d48f
Add unallocated attribute points notification
...
* Uses i18n "haveUnallocated" string, to come in another commit
2014-10-04 19:57:30 +08:00
74be4b211b
DRY-refactor notification display conditions
...
* Condense the different notification icons into one span with a
dynamically selected ng-class.
* Move logic for determining which notification icon to show and whether
there are no notifications into AuthCtrl.
* Refactor out the two similar sequences of logic conditions into a
helper function.
2014-10-04 17:56:56 +08:00
64b19ed090
Merge pull request #4101 from betaveros/betaveros/meter-text-nowrap
...
Make .meter-text nowrap to prevent truncation
2014-10-03 17:12:36 +02:00
e666d2f837
fix(spookDust): user serverside method for spookdust as it's path-protected
2014-10-03 00:33:39 -06:00
0841cafd1f
feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP
2014-10-02 23:18:13 -06:00
e759dbe951
Merge pull request #4045 from Verabird/guildreject
...
fixing guild reject error (issue #2886 )-correcting syntax
2014-10-02 17:22:36 -06:00
Tyler Renelle