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

2382 Commits

Author SHA1 Message Date
Blade Barringer db1f24e7b4 Added note about how many flags a message has 2014-12-11 13:12:50 -06:00
Blade Barringer c8c64a1b81 Allow admin to see messages that have been flagged more than twice, but 
make them semi-transparent
 2014-12-11 13:09:00 -06:00
Blade Barringer 1fb73b35ab Always show message if admin 2014-12-11 13:05:48 -06:00
Blade Barringer 4718641d3e Hide message if flag count is 2 or higher 2014-12-11 13:01:50 -06:00
Blade Barringer d24f6ad1ac Converted sent transparency to ng-class instead of style 2014-12-11 12:45:25 -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
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 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
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 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 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 2f506ce0e0 Give flag text danger class and already reported message if already 
reproted
 2014-12-07 13:50:47 +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 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
Andy Mantell 58359f1e89 Link for Tyler and Vicky's names #4351 2014-12-06 15:42:12 +00: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
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
Matteo Pagliazzi 0450e2b924 Revert "Revert "Tranlsate mystic items"" 2014-12-05 16:07:27 +01:00
Matteo Pagliazzi 1d1de38956 Revert "Tranlsate mystic items" 2014-12-05 16:03:41 +01:00
Matteo Pagliazzi a1075a5193 Merge pull request #4329 from crookedneighbor/tranlsate-mystic-items 
Tranlsate mystic items
 2014-12-05 16:02:34 +01:00
Sabe Jones 7dd16a06e6 Revert "fix(style): Make pet key a SPAN" 
This reverts commit 63ea851fdb.
 2014-12-04 20:26:50 -06:00
Sabe Jones 63ea851fdb fix(style): Make pet key a SPAN 2014-12-04 20:13:26 -06:00
Blade Barringer 5986643f1e Corrected strings so they only use one variable 2014-12-04 20:03:31 -06:00
Blade Barringer 532f5d1c53 Converted strings to be able to use links 2014-12-04 19:49:36 -06:00
Blade Barringer 21ca49345d Moved time travelers and hourglass strings to shared 2014-12-04 19:49:36 -06:00
Sabe Jones f2c6c07ff8 fix(Gems): Clarify badge count 2014-12-04 19:04:47 -06:00
Blade Barringer efcf9099f4 Adjusted count for remaining gem count 2014-12-04 18:47:28 -06:00
Sabe Jones b017623621 fix(subscriptions): Fix to Gems badge 2014-12-03 21:39:26 -06:00
Sabe Jones 62e526f8dc feat(subscriptions): Show count of purchasable Gems 2014-12-03 20:55:22 -06:00
Tyler Renelle bd5f8d79ea fix(bailey): mystery 3014 promo 2014-12-03 19:24:42 -07:00
Tyler Renelle d2e230db1f fix(plans): various bug fixes 2014-12-03 18:34:26 -07:00