Commit graph

4096 commits

Author SHA1 Message Date
Matteo Pagliazzi
6ca81f5b31 fix some translations in jade views @Sinza- 2014-01-14 18:32:40 +01:00
Tyler Renelle
23d4cba3d3 start moving some directives to habitrpg-shared so mobile can use them,
starting with markdown directive
2014-01-13 22:15:32 -07:00
Tyler Renelle
daeb846ffb profile.jade use some jade magic to compactify the code 2014-01-13 22:15:32 -07:00
Dušan Juretić
74495bb690 Fix tag creation test 2014-01-13 23:20:33 -03:00
Dušan Juretić
f7f9bb1131 Fix memberServices test 2014-01-13 23:09:11 -03: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
4884d342b6 Merge pull request #2350 from bobbyroberts99/patch-1
Fix link to wiki LFG board
2014-01-10 09:24:27 -08:00
Bob Steffes
fcf1788357 Update Tavern.jade
I changed the name of wiki forum so it didn't display as "LFG Board board" which broke the link.
2014-01-10 08:48:14 -08:00
Tyler Renelle
36d32d6b16 update forum & lfg links 2014-01-09 20:48:36 -07:00
snicker
8f3e47079c fixes #2316, challenge icon getting wackified 2014-01-09 16:26:07 -08:00
Tyler Renelle
af0b1d0550 CDS: set min/max on preferences.dayStart 2014-01-09 11:22:25 -07:00
Tyler Renelle
9cd947627c correct missing gems 2014-01-08 18:35:45 -07:00
Tyler Renelle
b927583902 Merge pull request #2313 from HabitRPG/sabe/tweak
Fix tier labels no longer providing info on click
2014-01-08 17:35:34 -08:00
Sabe Jones
111651da1e Fix tier labels no longer providing info on click 2014-01-08 18:49:53 -06:00
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