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
2516 commits 3 branches 0 tags 1.6 GiB
Commit graph

2516 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
1a08c7b084 change derby-ui-boot url to point to our fork, for #741 2013-08-04 09:57:31 -04:00
Tyler Renelle
1096ae041a Merge pull request #1299 from lefnire/sabe_fixes 
Update to 500 error message
 2013-08-01 11:47:17 -07:00
Sabe Jones
1aa5ff2db2 Fix typos and update current-events notice on 500 error 
Brings "Server restarting" message up to date re: Angular rewrite.
 2013-08-01 13:41:39 -05:00
Tyler Renelle
1279b6ecb2 Merge pull request #1297 from SabreCat/master 
Answer cron FAQ in settings text
 2013-08-01 06:36:41 -07:00
Sabe Jones
f3982670fd Answer cron FAQ in settings text 
Update custom day start label to mention it works off user's time zone
 2013-08-01 08:17:50 -05:00
Tyler Renelle
e9163f17da Merge pull request #1296 from SabreCat/develop 
Typo fixes
 2013-07-31 15:36:45 -07:00
SabreCat
a471b629c3 Update app.json 
Add'l English syntax fixes to Tavern description
 2013-07-31 12:09:16 -05:00
SabreCat
c23a6cc8f0 Typo fixes 
Corrected three typos in English app.json
"integrals" instead of "integral" in tour description of rewards
"effected" instead of "affected" in Tavern description
"Habit an open" instead of "Habit is an open" in Remove Ads
 2013-07-31 11:52:17 -05:00
Tyler Renelle
e180eb2b39 fix to delete paths['stats.hp'], hopefully fix #1279 2013-07-24 15:29:24 -04:00
Tyler Renelle
6ca4f4fcf0 Merge pull request #1280 from onduhray/TavernFix 
Fix #1273 for scrollbars showing on every message in chats
 2013-07-24 11:50:03 -07:00
Andre Casey
60c726ee76 Fix #1273 for scrollbars showing on every message in tavern/party/guild chats. 2013-07-24 07:39:04 -07:00
Tyler Renelle
b79b38e502 Merge pull request #1274 from nafoster/develop 
Extended short option box and removed labels on inventory items
 2013-07-22 17:07:16 -07:00
Nicole Foster
c9807fd0c6 Extended short option box and removed labels on inventory items 2013-07-22 20:00:01 -04:00
Tyler Renelle
63866ddfc8 Merge pull request #1224 from onduhray/develop 
Moar Inventory Layout Fixes in CSS & Tavern Chat Abuse Fix
 2013-07-22 14:58:04 -07:00
Tyler Renelle
5017be0984 API: remove all private paths from server ops, they're unecessary and might be causing issues 2013-07-16 18:30:43 -04:00
Tyler Renelle
861c7a1aa1 Revert "add beta redirect to main site until we get a new beta up" 
This reverts commit 2ec5a930a6.
 2013-07-15 23:07:58 -04:00
Tyler Renelle
2ec5a930a6 add beta redirect to main site until we get a new beta up 2013-07-15 21:52:00 -04:00
Tyler Renelle
8e922bb151 API: add facebook auth route 2013-07-12 17:15:11 -04:00
Tyler Renelle
704a056c47 Merge remote-tracking branch 'switz/api-authentication' into develop 
Conflicts:
	src/server/api.coffee
	test/api.mocha.coffee
 2013-07-12 16:36:12 -04:00
Tyler Renelle
7af9553aef remove tour (and sortable, stickyheader, tooltips) from mobile devices #995 2013-07-06 17:18:18 -04:00
Andre Casey
c4140f476f Moar fixes to my own code, for consistency 2013-07-02 02:25:00 -07:00
Andre Casey
0e40b996b7 Merge branch 'develop' of https://github.com/onduhray/habitrpg into develop 
* 'develop' of https://github.com/onduhray/habitrpg:
  Revert "Fix for Tavern Chat and extremely long posts"
 2013-07-02 02:21:40 -07:00
Andre Casey
ae0ee8e03d Fixed my own inconsistency with spacing of eggs and potions. oops. 2013-07-02 02:21:14 -07:00
Andre Casey
c6da393e71 Revert "Fix for Tavern Chat and extremely long posts" 
This reverts commit 03a73bab72.
 2013-07-02 02:06:24 -07:00
Andre Casey
03a73bab72 Fix for Tavern Chat and extremely long posts 
TL;DR
- made tavern chat posts word-wrap, with a max-height to prevent long posts from disrupting scrolling of site

Explanation:

Don't know if anyone noticed that random post by an unnamed person (blank name) with the text of "HELLOOOOO…[repeat a bazillion times].
Well this "broke" chat, meaning there was all of a sudden this side scroll action (which is particularly annoying with multitouch mouse pads). This adjustment prevents such a thing from happening again. Think of "code view" in forums, where text is in it's own little scrolly window.
 2013-07-02 01:56:44 -07:00
Andre Casey
201fb6617b moved item labels slightly closer to artwork, for better readability. 
(thought some people might not agree that it is more readable, thus I am staging it in a separate commit)
 2013-07-02 01:44:53 -07:00
Andre Casey
7db812b116 Inventory Layout Fixes 
- fixed CSS alignment issues with long names breaking flow
- gave eggs and potions more wiggle room
- centered text beneath newly centered artworks
 2013-07-02 01:44:07 -07:00
Andre Casey
6d27b898a2 Adjust CSS to show full egg and potion artwork, and center the artwork above the label 2013-07-02 01:37:35 -07:00
Tyler Renelle
3461d794a1 chat: bad fix for the duplicates messages, but safer than before 2013-06-21 12:33:14 -04:00
Tyler Renelle
1c5d61a617 fix to maxGear achievement 2013-06-18 15:14:01 -04:00
Tyler Renelle
7370331b8c fix max gear achievement for backer gear 2013-06-18 15:11:52 -04:00
Tyler Renelle
0529f26323 shorter day-period preen_cron 2013-06-18 14:52:39 -04:00
Tyler Renelle
302721456d fix up some db indexes 2013-06-15 19:14:49 -04:00
Tyler Renelle
d4d7c32fa8 simpler empty parties preen 2013-06-15 18:20:52 -04:00
Tyler Renelle
b7d5c0808b delete the "migrate" script for now. can dig up this commit later, 
the mongoskin async integration wasn't working for our purposes
 2013-06-15 18:17:08 -04:00
Tyler Renelle
d25c9d24c0 groups-preennig typo 2013-06-15 17:31:31 -04:00
Tyler Renelle
013cc7e5b7 migrations: try adding a coffeescript method, which uses mongoskin to run the migrations. Looks like it's not quite there, collection.toArray() pulls all objects into memory which is too big to run the migrations - might have to stick to mongo scripts 2013-06-15 17:31:23 -04:00
Tyler Renelle
989d5839c4 more accurate "active users": 7417 2013-06-15 13:52:10 -04:00
Tyler Renelle
00e2841b78 history preen cleanup 2013-06-15 13:48:25 -04:00
Tyler Renelle
4f948d401b Move exp progress button to right of numbers, css rollover was 
covering it before
 2013-06-15 13:28:24 -04:00
Tyler Renelle
cc0206e54e preen-cron: some history-preening cleanup & coments 2013-06-15 13:13:48 -04:00
Tyler Renelle
5d05c815bd Merge branch 'preen-history' into develop 
Conflicts:
	migrations/preen_cron.js
 2013-06-15 12:44:42 -04:00
Tyler Renelle
c797ea5999 charts: fix exp & todos charts 2013-06-15 12:41:12 -04:00
Tyler Renelle
d5d8a9ef69 charts: fix exp & todos charts 2013-06-15 12:35:55 -04:00
Tyler Renelle
22d4bb27ac preen-cron: fix up history cron, should be fully functional now 2013-06-15 12:01:03 -04:00
Tyler Renelle
6b307cd52c preen-script - we can't use load() because we don't know mongo shell 
pwd() at server run-time
 2013-06-14 19:19:08 -04:00
Tyler Renelle
42be939b12 preen-script: start implementing history-preening 2013-06-14 19:05:26 -04:00
Tyler Renelle
9361b015f6 preen-script: also remove empty parties 2013-06-14 17:01:50 -04:00
Tyler Renelle
67b2174c3d finish metrics script. current total: unregistered: 180931 registered: 
52101 active: 4182 (@Slappybag)
 2013-06-14 16:56:42 -04:00
Tyler Renelle
6d05651b66 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-06-14 16:17:50 -04:00