Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,780 Commits 64 Branches 1,256 Tags
b6ae2302e8d50f75d102bda0e9a4f76ccd7d3ed2
Commit Graph

5780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer b6ae2302e8 User can only flag message after accepting community guidelines 2014-12-12 11:05:19 +01:00
Blade Barringer 739106f13e Updated message preview on flag abuse modal to use markdown interpretation 2014-12-12 11:05:19 +01:00
Matteo Pagliazzi e84880d3e8 feat(flag-message): add server methods 2014-12-12 11:05:19 +01:00
Blade Barringer 6749109423 Added note for paglias 2014-12-12 11:05:19 +01:00
Blade Barringer 1a59815cc8 Added todo for paglias 2014-12-12 11:05:18 +01:00
Blade Barringer bbf94aac64 Added text of message to make sure user clicked the right flag 2014-12-12 11:05:18 +01:00
Blade Barringer dd68e6a29d Converted heading to paragraph 2014-12-12 11:05:18 +01:00
Blade Barringer 057a8b1a06 Prevent modal from popping up if already reported 2014-12-12 11:05:18 +01:00
Blade Barringer 6d656d3713 Give flag text danger class and already reported message if already 
reproted
 2014-12-12 11:05:18 +01:00
Blade Barringer a22c3c5968 Error handling for if message already flagged 2014-12-12 11:05:18 +01:00
Blade Barringer 3c62e0b862 Added some logic for adding flags 2014-12-12 11:05:17 +01:00
Blade Barringer 50e8236008 Removed flag from system notifications 2014-12-12 11:05:17 +01:00
Blade Barringer d5d83d67e9 Renamed flagChat to flagChatMessage 2014-12-12 11:05:17 +01:00
Blade Barringer e2c0a41f88 Added a flags key to message object 2014-12-12 11:05:17 +01:00
Blade Barringer 9fd4588b74 Added buttons to footer, cleaned up functions 2014-12-12 11:05:16 +01:00
Blade Barringer 658046024e Corrected tooltip name 2014-12-12 11:05:16 +01:00
Blade Barringer f50f40b77d Added text-danger span on username 2014-12-12 11:05:16 +01:00
Blade Barringer ee9214396b Renamed everything from flag to abuseFlag 2014-12-12 11:05:16 +01:00
Blade Barringer b3a56b6ded Added heading and body of flag modal 2014-12-12 11:05:15 +01:00
Blade Barringer 1e3a07b8b5 Flag icon opens blank modal 2014-12-12 11:05:15 +01:00
Tyler Renelle ae762837e2 refactor(challenges): cleanup challenge-creation. can use async.auto to 
keep variables around, no need to set parent closure vars
 2014-12-11 21:35:41 -07:00
Tyler Renelle 3027ccff83 fix(plans): fix fields which are NaN 2014-12-11 21:06:38 -07:00
Tyler Renelle 14a38033f9 Merge branch 'negue-iap_verification' into develop 2014-12-11 14:51:31 -07:00
Matteo Pagliazzi 29382d18f7 fix(reset-password): use array for variables 2014-12-11 17:05:31 +01:00
Matteo Pagliazzi 1761752240 use email server for reset-password 2014-12-11 16:51:39 +01:00
Blade Barringer e79126bf59 Merge pull request #4372 from thehindenburg/optoutspace 
added space in Jade to the arrow and opt out text in the inbox
 2014-12-10 15:51:38 -06:00
Tyler Renelle f9cc2adda5 fix(iap): iap verification fixes 2014-12-10 14:25:00 -07:00
Negue bb37c163cf fix spacing 2014-12-10 14:21:03 -07:00
Negue d92832bfb2 Hopefully a working IOS Verification 2014-12-10 14:21:03 -07:00
Negue ecf20f423c IAP Verification for Android 2014-12-10 14:21:03 -07:00
Negue b59a70f128 more dummy controller, just for iap data 2014-12-10 14:21:02 -07:00
Negue cc4812712a dummy iap verify routes 2014-12-10 14:21:02 -07:00
Negue 2ea12d5c71 Add in-app-purchase Package 2014-12-10 14:21:02 -07:00
thehindenburg 799934c31b added space in Jade to the arrow and opt out text in the inbox 2014-12-10 12:31:09 -08:00
Blade Barringer 7fb1e69927 Changed inbox text to use an env.t var 2014-12-10 10:47:05 -06:00
Blade Barringer 4af70a2a0f Made invite button for guild invitations part of an input-group 2014-12-10 09:47:58 -06:00
Sabe Jones fdf25611fb Merge pull request #4370 from SabreCat/penguin 
Penguin quest
 2014-12-09 21:22:45 -06:00
Sabe Jones dc034e4ab5 fix(quest): Add penguin to shop 2014-12-09 20:48:08 -06:00
Sabe Jones 2d9d8fe209 chore(Bailey): Announce Penguin 2014-12-09 20:20:17 -06:00
Matteo Pagliazzi ce73a75133 feat(email): add new image for subscription email 2014-12-09 17:34:28 +01:00
Blade Barringer 1511002a08 Fixed styling of invitation to guild page 2014-12-08 17:03:11 -06:00
Blade Barringer 5230883015 Adjusted styling of select box used for ordering party 2014-12-08 16:57:37 -06:00
Blade Barringer 2a3bd8a9cb No longer displays an extra popover that says true. Closes #4362 2014-12-08 12:44:37 -06:00
Blade Barringer 5ac7f479d3 Added some spacing between icons and text on challenge/guild buttons 2014-12-07 21:03:09 -06:00
Blade Barringer 05c01ebd3c Made glyphicons white on for challenge/guild join/leave buttons 2014-12-07 21:01:40 -06:00
Blade Barringer 72fbe6a8a7 Removed yellow background from join public guild page 2014-12-07 20:58:42 -06:00
Blade Barringer bd21c93b36 Fixed weirdness on create guild page. Elements were overflowing out of 
their boxes
 2014-12-07 20:52:49 -06:00
Blade Barringer 46cb38660e Fixed padding on challenges filter box 2014-12-07 20:20:42 -06:00
Blade Barringer d0cf285468 Merge pull request #4358 from andymantell/feature/linking-timetravellers-names 
Link for Tyler and Vicky's names
 2014-12-06 16:48:09 -06:00
Blade Barringer 8ba6bcddde Merge pull request #4354 from crookedneighbor/markdown-lists-in-tasks 
Adjusted margin for markdown list in task-text.
 2014-12-06 16:42:31 -06:00