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

5772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer d8515fc8de Added fallback for is message does not contain flags key. Added error 
for if message was already flagged by user
 2014-12-11 12:16:57 -06:00
Blade Barringer 564677340c User can only flag message after accepting community guidelines 2014-12-11 10:29:12 -06:00
Blade Barringer 9bd0304223 Updated message preview on flag abuse modal to use markdown interpretation 2014-12-11 10:23:29 -06:00
Blade Barringer 0cf7bba822 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 2014-12-11 10:21:19 -06: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
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
Matteo Pagliazzi ae6e0255c6 feat(flag-message): add server methods 2014-12-07 14:35:09 +01:00
Blade Barringer e49e8f5765 Added note for paglias 2014-12-07 13:50:47 +01:00
Blade Barringer 5acde1e609 Added todo for paglias 2014-12-07 13:50:47 +01:00
Blade Barringer aafda2dad1 Added text of message to make sure user clicked the right flag 2014-12-07 13:50:47 +01:00
Blade Barringer 8537c96eb6 Converted heading to paragraph 2014-12-07 13:50:47 +01:00
Blade Barringer 7a7c13ff6d Prevent modal from popping up if already reported 2014-12-07 13:50:47 +01:00
Blade Barringer 2f506ce0e0 Give flag text danger class and already reported message if already 
reproted
 2014-12-07 13:50:47 +01:00
Blade Barringer e9cffe6206 Error handling for if message already flagged 2014-12-07 13:50:46 +01:00
Blade Barringer 5a6c9fbf84 Added some logic for adding flags 2014-12-07 13:50:46 +01:00
Blade Barringer 74b94e6764 Removed flag from system notifications 2014-12-07 13:50:46 +01:00
Blade Barringer c44c607ae7 Renamed flagChat to flagChatMessage 2014-12-07 13:50:46 +01:00
Blade Barringer a2cf14324c Added a flags key to message object 2014-12-07 13:50:46 +01:00
Blade Barringer 62d92db332 Added buttons to footer, cleaned up functions 2014-12-07 13:50:46 +01:00
Blade Barringer c90ea166d4 Corrected tooltip name 2014-12-07 13:50:46 +01:00
Blade Barringer 01c0ce1722 Added text-danger span on username 2014-12-07 13:50:46 +01:00
Blade Barringer 6fcf1846b3 Renamed everything from flag to abuseFlag 2014-12-07 13:50:46 +01:00
Blade Barringer 00abb168a1 Added heading and body of flag modal 2014-12-07 13:50:46 +01:00
Blade Barringer 5e1e1b2c13 Flag icon opens blank modal 2014-12-07 13:50:46 +01: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
Blade Barringer 60f3e0032e Adjusted margin for markdown list in tast-text. Closes #2721 2014-12-06 16:41:59 -06:00
Tyler Renelle cb9083d9ba fix(webhooks): don't send webhooks if not valid url (also if not 
enabled), fixes #4357
 2014-12-06 10:25:41 -07:00
Andy Mantell 58359f1e89 Link for Tyler and Vicky's names #4351 2014-12-06 15:42:12 +00:00
Blade Barringer 66f913e833 closes #4353. If time on chat would break onto new line, just puts whole 
time statment on new line
 2014-12-05 23:51:07 -06:00
Blade Barringer 024e606f5c Merge pull request #4348 from crookedneighbor/fix-transparent-challenge-buttons 
Adjust transparent class of challenge buttons.
 2014-12-05 22:17:38 -06:00
Tyler Renelle 7ab5456c2a Merge pull request #4352 from crookedneighbor/show-gem-purchases-with-customer-id 
Converted planId to customerId as test for whether or not gems can be purchased.
 2014-12-05 14:56:41 -07:00
Blade Barringer ae62a04497 Converted planId to customerId on whether or not gems can be purchased. 
Closes #4340
 2014-12-05 15:53:53 -06:00
Blade Barringer ea869a4487 Adjust trasnparent class of challenge buttons. Closes #4346 2014-12-05 15:13:34 -06:00