Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,629 Commits 64 Branches 1,256 Tags
68bb5993c9f61e6c7f68cbb4bbdd7095f93da92f
Commit Graph

3629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Renelle 68bb5993c9 Merge pull request #1925 from bobbyroberts99/patch-1 
Update Contributing.md
 2013-11-27 08:26:18 -08:00
Matteo Pagliazzi 44401a9162 add emoji.js file to tests, fix travis build 2013-11-27 16:28:09 +01:00
Matteo Pagliazzi bdf32325f6 remove emoji css from manifest and move into index.styl 2013-11-27 16:19:56 +01:00
Matteo Pagliazzi d3eed2282c fix custom day start, @lefnire we may have to restore old values or make a bailey announcement about this, also client-side the validation prevents deleting the old value, it only allows to use the increase/decrease button or selecting the old value and replacing it 2013-11-27 16:08:34 +01:00
Matteo Pagliazzi a196cc0586 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-27 15:59:02 +01:00
Nick Gordon 4dbd2fd2f6 pointed to new repository with minifiable code for emoji parsing 2013-11-27 06:19:45 -08:00
Nick Gordon 13a7292377 emoji works, huzzah. addresses #681, #1840, and some discussion in #1908 2013-11-26 21:49:53 -08:00
Bob Steffes 29f0597178 Update Contributing.md 
Correct link to userID on wikia and make a few grammatical & punctuation changes.
 2013-11-26 20:03:52 -08:00
Adrien Lemaire 4af9d97c33 Update CONTRIBUTING.md 
add links to "Contributing to HabitRPG" and "Tips"
 2013-11-27 11:54:00 +11:00
Tyler Renelle aca122d6de fix up CONTRIBUTING.md, update "submit bugs" links with this change 2013-11-26 17:09:13 -07:00
Tyler Renelle 878c9756d1 add CONTRIBUTING.md, which will automatically add a "read this before 
submitting a ticket" kinda thing to issues.
 2013-11-26 16:58:01 -07:00
Nick Gordon 86f62ac2b2 fix for #1920, again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles 2013-11-26 14:56:24 -08:00
Tyler Renelle 2b128f71f4 [#1532] add better validation on preferences.dayStart, and a migration to 
cleanup corrupt ones
 2013-11-26 15:18:20 -07:00
Nick Gordon a4fb0b42ad well, this wasn't the fix i was thinking of for #1893, but it works and I don't know why I didn't do it in the first place 2013-11-26 12:06:48 -08:00
Nick Gordon 15f3907f00 fix for #1920 2013-11-26 11:51:21 -08:00
Matteo Pagliazzi 860a084c69 fix for multiple guilds creation 2013-11-26 20:16:10 +01:00
Nick Gordon 878bfc7f46 removing sensitive user data from export 2013-11-26 06:48:18 -08:00
Matteo Pagliazzi d1240473dd use bindonce for days of the week, thanks @snicker! 2013-11-25 17:38:07 +01:00
Matteo Pagliazzi c4e8de2ee0 fix language switching 2013-11-25 17:34:41 +01:00
Matteo Pagliazzi a47a32dbd6 translate days of the week, @snicker here I would like to use bo-text but does not work 2013-11-25 17:30:35 +01:00
Nick Gordon 4ab26ee821 Merge branch 's7export' into develop 2013-11-25 08:12:53 -08:00
Nick Gordon c0a02eeef8 support for xml and json export of all user data 2013-11-25 08:06:27 -08:00
Matteo Pagliazzi 2e8fc8d248 use script tag not eval to execute moment language code 2013-11-25 17:04:07 +01:00
Matteo Pagliazzi 17c97308f3 stable, pets row 100% width 2013-11-25 16:50:51 +01:00
Matteo Pagliazzi b4d910c9cb typo 2013-11-24 21:47:07 +01:00
Matteo Pagliazzi d1698460e0 add momentjs translations, @lefnire this is a little cumbersome, the language is set server-side & momentjs languages are js functions so we can either load another javascript file in the browser or we can load the file content in window.env and execute it with eval which is what is used now. If you do not like this then feel free to revert the commit. It is useful for example for chat messages date and I will also add it to the repeat schedule so that we it is localized too 2013-11-24 21:45:24 +01:00
Nick Gordon f4323ddc24 markdown links in chat will now open in a blank window. 
* added `target` attribute for the markdown directive to specify. default behavior is `_self`.
 2013-11-24 10:32:51 -08:00
Matteo Pagliazzi 6736da36d4 use jade class syntax 2013-11-24 17:49:25 +01:00
Matteo Pagliazzi fa2fb8e3fb open named links in new window, @snicker this will not work for links auto detected by marked, we should override this piece of code https://github.com/chjj/marked/blob/master/lib/marked.js#L578 but i am not sure it is possible to do without overriding the whole function 2013-11-24 17:49:12 +01:00
Nick Gordon 0e7c7e439f images shown with markdown now link to themselves in an external browser window 2013-11-23 19:33:41 -08:00
Nick Gordon aa91d21189 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-23 17:39:19 -08:00
Nick Gordon 38225896f4 fix for https://github.com/HabitRPG/habitrpg/issues/1860 change tags to scroll horizontally rather than stack floating left 2013-11-23 17:37:20 -08:00
Tyler Renelle e9467dc466 Merge pull request #1896 from Fandekasp/party_members_order 
Party members order
 2013-11-23 16:52:31 -08:00
Nick Gordon b793d2b753 fix for https://github.com/HabitRPG/habitrpg/issues/1900 2013-11-23 16:45:14 -08:00
Nick Gordon 2604d8e21e fix for https://github.com/HabitRPG/habitrpg/issues/1903 2013-11-23 16:20:34 -08:00
Adrien Lemaire a1d9026052 Merge pull request #1901 from Fandekasp/header_colors 
add npc color, update leader background
 2013-11-23 15:50:20 -08:00
Adrien Lemaire 47cf0eb07d add npc color, update leader background 2013-11-24 10:49:33 +11:00
Tyler Renelle 33c2c1db2d Merge pull request #1888 from HabitRPG/sabe_tweak 
Fix matters of colons
 2013-11-23 14:45:45 -08:00
Tyler Renelle c5a42cbf5a Merge pull request #1899 from Fandekasp/header_colors 
change avatars lvl colors
 2013-11-23 13:12:36 -08:00
Nick Gordon 4453ac9fb8 removed comments from testing. 2013-11-23 11:14:16 -08:00
Nick Gordon 52145a479e testing completed, committing test results in comments 2013-11-23 10:55:56 -08:00
Nick Gordon 40de2f3bf0 manual testing of bindonce commencing -____- 2013-11-23 09:26:39 -08:00
Matteo Pagliazzi 1dfd3b8b05 remove code moved in previous commit 2013-11-23 17:45:03 +01:00
Matteo Pagliazzi df5a436338 use countPets also for stats, fix #1898 2013-11-23 17:42:47 +01:00
Sabe Jones baf89c7023 Merge branch 'develop' into sabe_tweak 2013-11-23 09:48:15 -06:00
Sabe Jones 0d6f3dd5e6 Make number format consistent between current exp and exp TNL (fix #1827) 2013-11-23 09:46:28 -06:00
Adrien Lemaire d4b25fdc5f change avatars lvl colors 2013-11-24 01:04:27 +11:00
Sabe Jones 983df5c97c Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list. 2013-11-23 06:54:00 -06:00
Adrien Lemaire b36a288f04 add sort by date joined option 2013-11-23 22:06:22 +11:00
Adrien Lemaire cef1e07b18 add migration script → default 'random' 2013-11-23 22:03:13 +11:00