sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9353 commits 3 branches 0 tags 1.6 GiB
Commit graph

9353 commits

This branch
This branch
All branches
Author SHA1 Message Date
TheHollidayInn
e3f5c22fe8 Added start party option, locales, and plus button 2015-06-01 21:07:53 -05:00
TheHollidayInn
5513061d80 Added invite to friends in header, added setting to hide the invite friends, and localized the invite friends string 2015-06-01 21:07:09 -05:00
Blade Barringer
39cb9bfb99 downcase beffymaroo 2015-05-26 22:42:17 -05:00
Blade Barringer
9793df87d1 Merge branch 'reyrodrigez-develop' into develop 2015-05-26 22:26:48 -05:00
Blade Barringer
0e2f0596f6 Remove explicit divs 2015-05-26 22:26:24 -05:00
Blade Barringer
85993d25cf Merge branch 'hairlessbear-move_flower_to_accessories' into develop 2015-05-26 22:20:21 -05:00
Blade Barringer
615c3f18a5 Adjust gruntfile regex and recompile 2015-05-26 22:19:45 -05:00
Laszlo Heves
eb3f7829cf Update date 2015-05-27 02:22:35 +02:00
Laszlo Heves
e0eab880a4 Define semantic classes with shorthand syntax 2015-05-27 02:21:48 +02:00
Laszlo Heves
72c1e9e137 Using shorthand id definitions 2015-05-27 02:07:13 +02:00
Laszlo Heves
020f7f1f5d Adding semantic ids to community guidelines 2015-05-27 01:39:40 +02:00
Laszlo Heves
17842d2103 Adding Beffymaroo to moderators 2015-05-27 01:25:40 +02:00
Blade Barringer
fce9d39f19 Added in one-time-bindings 2015-05-26 09:02:25 -05:00
GihHubSphinx
a788d51aa5 Made gift dialog translatable 
Addressing a bit beyond _#10 in the opening post of
https://github.com/HabitRPG/habitrpg/issues/4522

Screenshot of before-after-proof: http://oi57.tinypic.com/11c9ldi.jpg
 2015-05-26 17:18:18 +05:00
hairlessbear
958068c2b0 Rebased to resolve merge conflicts 2015-05-26 00:19:35 -04:00
Sabe Jones
844c1ed178 Merge pull request #5288 from SabreCat/develop 
May Mystery Items
 2015-05-25 19:21:07 -07:00
Sabe Jones
ed25cffaf7 chore(grunt): compile sprites 2015-05-25 21:10:37 -05:00
Sabe Jones
3098cacf03 feat(subscriber): May Mystery Items 2015-05-25 21:03:13 -05:00
Blade Barringer
5d93f364c1 Merge branch 'blade-hairlessbear_markdown_help_table' into develop 2015-05-24 22:47:02 -05:00
Blade Barringer
9b2798ee71 Refine markdown help 2015-05-24 22:45:09 -05:00
Blade Barringer
690321baca Merge pull request #5270 from GitHubSphinx/Sphinx-i18n-db2 
Made text on static/contact translatable
 2015-05-24 22:17:10 -05:00
Blade Barringer
a298393e04 Merge pull request #5275 from GitHubSphinx/Sphinx-entry1 
Swap faq and overview in the top menu
 2015-05-24 22:15:24 -05:00
Blade Barringer
466221f848 Correct test syntax 2015-05-24 22:13:51 -05:00
Blade Barringer
30ef563534 Merge branch 'negue-anonymizedUser' into develop 2015-05-24 22:04:18 -05:00
Blade Barringer
0afd56e8ad Refine anonymous user test 2015-05-24 22:03:40 -05:00
Blade Barringer
abbfdaeda5 Adjust NotGonnaGitUs's PR 
* move challenge test to separate file
* adjust wording of popover text
* prevent refunding gems for tavern challenges
* adjust ui of challenge creation page
* fix bug in cancel function
* adjust wording of delete confirmation message
 2015-05-24 21:22:40 -05:00
GihHubSphinx
fac855898f Swap faq and overview in the top menu 
Addressing request by lemoness
https://github.com/HabitRPG/habitrpg/issues/5261
 2015-05-25 02:25:51 +05:00
Blade Barringer
120872ffd2 Merge in develop 2015-05-24 15:46:57 -05:00
Blade Barringer
165dd3a4a6 Fixes for minor visual inconsistencies with popovers and toolbars 
Closes #5274, closes #5272, closes #5271
 2015-05-24 15:34:12 -05:00
Blade Barringer
681668f131 Tweak @hairlessbear's pr 
* Simplify chat button stylings
* Add formatting help to send gift modal
* Clean up formatting of table
* Add example for unordered lists
* Remove ! from `env.t` that do not have html characters
* Use https instead of http in link
* Format markdown blurb
* Use ng-if instead of ng-show
* Collapse show help link into single element
 2015-05-24 09:20:12 -05:00
Matteo Pagliazzi
047ce0141f chore(i18n): update locales 2015-05-24 11:27:17 +02:00
GihHubSphinx
dc51c6e478 Made text on static/contact translatable 
Addressing _#12 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522

Before/after screenshot: http://i.snag.gy/b00FV.jpg

"Report a Bug" string is used from generic.json as already translated
before
 2015-05-24 13:31:29 +05:00
hairlessbear
4bc3ea0cdb Removed commented out code 2015-05-23 22:59:17 -04:00
hairlessbear
337a727390 Added hidable markdown help menu and adding to private messages 2015-05-23 22:51:40 -04:00
Alys
68c4547c0a change $push to $addToSet for monthly mystery items so that we can't get duplicates being added. Ref: https://gist.github.com/lefnire/a0a93c52211f44a2c087 and http://stackoverflow.com/questions/27248556/mongodb-difference-between-push-addtoset 2015-05-23 20:03:36 +10:00
Blade Barringer
a07f8572b0 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-05-22 23:35:19 -05:00
Blade Barringer
ed56f51611 Merge branch 'hairlessbear-avatar_indicate_equipped' into develop 2015-05-22 23:35:01 -05:00
Blade Barringer
1f0dbef3c7 Merge pull request #5234 from hairlessbear/ethereal_surge_split_fix 
Fixed Ethereal Surge notification split
 2015-05-22 23:23:34 -05:00
Blade Barringer
9ec14c1ac6 Merge pull request #5251 from GitHubSphinx/Sphinx-i18n-db1 
Made two lines translatable
 2015-05-22 23:20:13 -05:00
Blade Barringer
1e757cc087 Adjust disabled button look 2015-05-22 23:12:09 -05:00
GihHubSphinx
fe2e0618b8 Make Invite-friends-to-group dialog translatable 
UI strings of the dialog of invitation to the group made translatable
 2015-05-23 02:44:32 +05:00
Jaiden Mispy
eab2dbfa86 Disable chat textarea and buttons while sending 2015-05-22 12:14:10 -07:00
negue
4e8918818a fix(pushNotifications): user null check 
#5252
 2015-05-21 23:24:10 +02:00
GihHubSphinx
2440b312a2 Made two lines translatable 
Addressing #10 and #11 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522

* "Send gift" (in the form that pops up when you click on username
label)
* "Invite Friends" button (in "Members" section in guilds and party)
 2015-05-21 17:12:16 +05:00
Alys
ee4df15b71 Merge pull request #5247 from hairlessbear/tavern_guidline_button_fix 
Fixed sync button display before community guildlines are accepted
 2015-05-21 20:57:00 +10:00
Sabe Jones
f436852535 Merge pull request #5249 from HabitRPG/may-pet 
Sheep Quest
 2015-05-20 21:00:21 -07:00
SabreCat
13faf8d0c7 feat(pets): Sheep Quest 2015-05-20 20:45:18 -07:00
SabreCat
2b72050827 fix(accessories): Buyback for ears 
Fixes #5236.
 2015-05-20 13:10:05 -07:00
hairlessbear
4ee8a6867d Fixed sync button before community guildlines are accepted 2015-05-20 10:20:32 -04:00
Blade Barringer
2900c53b84 Fix and unpend dailies test 2015-05-19 20:22:43 -05:00