Commit graph

4080 commits

Author SHA1 Message Date
Tyler Renelle
d892e7f8fc Merge pull request #2312 from SyntaxPickax/develop
Minor fix to chat links; rounded critical hit percentages
2014-01-08 16:04:23 -08:00
Brandon McPhail
521653c102 Rounded critical hit percentages in notifications, e.g. 149.999998% becomes 150% 2014-01-08 15:33:36 -08:00
Brandon McPhail
77278bcffc Fixed issue where only the first markdown link in a message would open in a new tab. Now all do. 2014-01-08 15:33:36 -08:00
Tyler Renelle
6a61dd0740 Merge pull request #2311 from colegleason/add-challenge-user
Add challenge to user.challenges on creation. Fixes #2310
2014-01-08 14:50:20 -08:00
Cole Gleason
76ad3bbe78 Add challenge to user.challenges on creation. Fixes #2310 2014-01-08 16:44:08 -06:00
Tyler Renelle
76ed4a956c Merge pull request #2308 from colegleason/leave-party
Copy leave and clickLeave function for party to fix #2304.
2014-01-08 14:36:12 -08:00
Tyler Renelle
24b2094f35 Merge pull request #2300 from HabitRPG/sabe/tweak
More UI demystification
2014-01-08 14:34:09 -08:00
Tyler Renelle
11dbda6f8c Merge pull request #2298 from HabitRPG/sabe/preferences
New user preference: open new tasks in edit mode
2014-01-08 14:29:57 -08:00
Cole Gleason
cdd80f11e8 Copy leave and clickLeave function for party to fix #2304. TODO: Refactor into one function? 2014-01-08 15:09:08 -06:00
Tyler Renelle
039bdabb49 let's upgrade passport-facebook to see if this will mitigate all the
facebook login errors we're seeing
2014-01-07 22:06:58 -07: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
Tyler Renelle
be56b10d91 challenges: swagger param fix on 2014-01-07 21:15:19 -07:00
Tyler Renelle
5501969262 Merge pull request #2255 from colegleason/leave-guild-challenges
When a user leaves a group, remove them from all group challenges
2014-01-07 19:57:39 -08:00
Tyler Renelle
05752c4afc #2217 swagger API docus: params => parameters 2014-01-07 20:23:22 -07:00
Sabe Jones
089ea05cf4 Readability tweak: sentence case for options not on buttons 2014-01-07 20:20:05 -06:00
Sabe Jones
9c545add5e New user preference: open new tasks in edit mode 2014-01-07 20:14:57 -06:00
Brandon McPhail
cf069cbca2 Fixed case where click on trash icon left Checklist string. Test for task.checklist[0] was unnecessary in saveTask(). 2014-01-07 12:30:47 -08:00
Brandon McPhail
07d4fc1184 Fixed UI issues when editing checklists 2014-01-07 11:55:41 -08:00
Matteo Pagliazzi
5024956e6f correctly cache sprite images 2014-01-07 20:23:39 +01:00
Tyler Renelle
bef4f0685e Merge pull request #2291 from HabitRPG/sabe/tweak2
Beef up critical hit notification with its own style and icon
2014-01-07 10:34:07 -08:00
Tyler Renelle
833d597bfe fix #2284 remove unecessary chat-message scrollbars 2014-01-07 11:27:29 -07:00
Sabe Jones
1a92ec1748 Beef up critical hit notification with its own style and icon 2014-01-07 12:03:07 -06:00
Tyler Renelle
586aa7c2a7 Revert "chat: restore to angular-at-directive#07eaccf"
This reverts commit 7c06069e23.
2014-01-07 10:59:20 -07: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
54c8f4bc3a Merge pull request #2288 from HabitRPG/sabe/fix
Client side of Rebirth-related fix: don't remove Wolf Eggs upon unlock
2014-01-07 09:49:40 -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
Tyler Renelle
20e659aa43 Merge pull request #2290 from HabitRPG/sabe/fix2
Fix #2048 (streak bonuses not appearing to add up)
2014-01-07 09:45:07 -08:00
Sabe Jones
be2def91f1 Fix #2048 (streak bonuses not appearing to add up) 2014-01-07 11:14:34 -06: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
bbbc9bfe50 Client side of Rebirth-related fix: don't remove Wolf Eggs upon drops unlock if user has some already 2014-01-07 08:13:03 -06: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
snicker
5becae6170 fixed issue with fixing the other issue so that everything is fixed and nickname autocompletion works again 2014-01-06 23:37:42 -08:00
Cole Gleason
3150b7b31b use correct granularity when checking if a task is overdue 2014-01-07 00:44:27 -06:00
Tyler Renelle
7c06069e23 chat: restore to angular-at-directive#07eaccf 2014-01-06 22:08:49 -07:00
Cole Gleason
b10c29f02f Fixed bug where user wasn't really removed. Changed popup depending on if user was in challenges. Fixed selectedChal typo 2014-01-06 23:06:14 -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
53aa0bba59 #2245 fix tour wording from 1.5% => 50% class stat bonus 2014-01-06 21:26:55 -07:00
Tyler Renelle
3b3b0e6915 #2245 don't show class-tour button unless the class system is enabled 2014-01-06 21:20:27 -07:00
Tyler Renelle
f539108b39 Merge pull request #2275 from colegleason/streak-modal
Don't show Streak achievement modal on Fix Character Values if it was undefined
2014-01-06 19:59:14 -08:00
Tyler Renelle
39fbfe3f2f Merge pull request #2278 from speg/checklist_width_resize
work on #2183 resize checklist items
2014-01-06 19:56:34 -08:00
Tyler Renelle
c0f8aea339 Merge pull request #2279 from HabitRPG/sabe/fix
Fix #2277: make Automatic Allocation checkbox set "task activity" mode
2014-01-06 19:50:42 -08:00
Sabe Jones
459af67fcd Fix #2277: make Automatic Allocation checkbox set "task activity" mode 2014-01-06 21:20:54 -06:00
steve hiemstra
fd56c17518 work on #2183 resize checklist items
such that they resize dynamically; however the text will still not wrap
due to the fact that it is an input.
2014-01-06 21:21:01 -05: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
Tyler Renelle
6601953629 grunt: add spritesmith.png to hashres. @paglias is this all that's
necessary to cache-bust the image so users won't get the jumple on reload?
2014-01-06 17:12:34 -07:00
Cole Gleason
eb9db5b612 Don't show Streak achievement modal on Fix Character Values if it was previously undefined 2014-01-06 16:43:56 -06:00