Commit graph

  • a579698865 Merge pull request #1846 from HabitRPG/sabe_tweak_2 Tyler Renelle 2013-11-17 10:22:39 -0800
  • f738fae0c8 Merge pull request #1845 from HabitRPG/sabe_tweak Tyler Renelle 2013-11-17 10:18:59 -0800
  • b701e2b24a Go with the borderless option Sabe Jones 2013-11-17 10:21:43 -0600
  • 450e154948 On further thought, "Equipment" is better than "Gear." Also fixed a typo. Sabe Jones 2013-11-17 10:01:27 -0600
  • 4fbc31d1e6 Change "HP" to "Health" and clarify Potion type Sabe Jones 2013-11-17 09:55:04 -0600
  • 6cc41c47c7 Work on standardizing terminology Sabe Jones 2013-11-17 09:36:38 -0600
  • 75ce46d4af moment version consistent with habitrpg-shared Matteo Pagliazzi 2013-11-17 16:12:25 +0100
  • cb64ab5a7d Make it easier for people to find "how to contribute" wiki page Sabe Jones 2013-11-17 08:09:23 -0600
  • 44a82c71e2 Remove bland/harsh border styling on eggs and avatar options. Falls back to a button look that's much nicer. Sabe Jones 2013-11-17 07:40:19 -0600
  • f448f4b71b bower.json auto update Matteo Pagliazzi 2013-11-17 13:32:44 +0100
  • b83eb0ee28 moment is exported as an helper by habitrpg-shared Matteo Pagliazzi 2013-11-17 13:28:57 +0100
  • 4547417d62 build, export moment & lodash as helpers (to be used in $rootScope) Matteo Pagliazzi 2013-11-17 13:27:50 +0100
  • 3a2edb6539 remove relative date & upgrade & export moment Matteo Pagliazzi 2013-11-17 13:24:36 +0100
  • 34d5eda736 [#1832] remove relative-date, use moment instead Matteo Pagliazzi 2013-11-17 13:21:21 +0100
  • 20c976d1dc Merge pull request #1843 from snicker/develop Tyler Renelle 2013-11-16 10:25:59 -0800
  • 55998085e3 fixed the issue with case insensitive highlighting highlighting short usernames how this works: * rather than throw an expensive regular expression at each chat message, we start by checking to see if the users name exists. * then, by simple string manipulation we verify that the preceeding character before the alleged username is whitespace, the start of a line, or an '@' character. * FINALLY, we verify the following character is a non-word character using a regular expression. * then we cache the highlight status on the local message object, because for some reason, this function is called **every time a character is typed in the chatbox.** this seems like a hugh performance problem to me, need to see if there is a way to disable that or something Nick Gordon 2013-11-16 09:24:01 -0800
  • 0f1420e909 A few JP translations Nicole Foster 2013-11-16 11:16:04 -0500
  • 20f9e6b911 upgrade angular, fix #1786 Matteo Pagliazzi 2013-11-16 15:18:58 +0100
  • 24f0e58396 Merge pull request #41 from djuretic/master djuretic 2013-11-16 04:29:58 -0800
  • 80afa45b2b revert to using egg.name Dušan Juretić 2013-11-16 09:26:15 -0300
  • fb1cc7b127 auth.auth: ensure v Tyler Renelle 2013-11-16 02:22:56 -0800
  • 4fa4519b34 [#1829] sort challenge-box by creation date Tyler Renelle 2013-11-15 21:32:25 -0800
  • b9d3b3a1a7 admin: refresh contrib list when saving a member Tyler Renelle 2013-11-15 20:06:18 -0800
  • b762ecba81 admin: add list of contributors. Add contributor.contributions, textarea for links of contributions for tracking. move all admin stuff to dedicated controller & routes Tyler Renelle 2013-11-15 19:25:16 -0800
  • 460afb7763 [#1829] sort by timestamp, show group & creator in challenge header Tyler Renelle 2013-11-15 18:57:16 -0800
  • 9d18e9efd0 Merge pull request #1830 from nafoster/develop Tyler Renelle 2013-11-15 18:47:58 -0800
  • 2879b050a0 use egg.text instead of egg.name, fix unit tests Dušan Juretić 2013-11-15 23:18:08 -0300
  • 53db31d4fb [#1828] don't let users create party if they already belong to one Tyler Renelle 2013-11-15 18:16:48 -0800
  • 2b286ba889 [#1821] [#1723] fix pet counters (incl for member modals) Tyler Renelle 2013-11-15 17:50:41 -0800
  • 34ea6038f1 add single test for notificationServices Dušan Juretić 2013-11-15 22:39:04 -0300
  • 2f5025e322 add tests for groupServices Dušan Juretić 2013-11-15 22:15:11 -0300
  • 05334550b0 [#1837] separate groups filter from "create new challenge"-available groups Tyler Renelle 2013-11-15 17:36:36 -0800
  • c9ddc0e023 Merge pull request #1831 from snicker/develop Tyler Renelle 2013-11-15 17:25:46 -0800
  • 0b8bd7b76c Full quality Hebrew language locale translation dannybm 2013-11-16 02:29:14 +0200
  • 5116a99dce moved UI stuff into the settings area, moved authWithSession to the Auth controller Nick Gordon 2013-11-15 16:25:09 -0800
  • e2e7ba15b2 ack, trailing comma Nick Gordon 2013-11-15 08:56:54 -0800
  • c69bc0de58 derp. moment is already a dependency Nick Gordon 2013-11-15 08:55:06 -0800
  • 00d6a5077a Lots of Japanese translations Nicole Foster 2013-11-15 09:22:46 -0500
  • b958103447 Merge branch 'develop' of https://github.com/snicker/habitrpg into develop Nick Gordon 2013-11-15 06:20:37 -0800
  • 7bf1bf2af0 data export commit, supports exporting task history via csv *adds the following new dependencies: moment, express-csv *recommend replacing functionality of 'relative-date' with features from 'moment' *supports retrieval of CSV history via the API and in browser **/api/v1/export/history (requires typical API authorization) **/export/history.csv (requires session authorization) *adds new routes for data export Nick Gordon 2013-11-15 06:18:16 -0800
  • 1e6dec0bbe pets: popover placement fixes Tyler Renelle 2013-11-14 22:07:08 -0800
  • 9b1c8884a4 [#1735] fix repeated timezone setting for UK users Tyler Renelle 2013-11-14 21:29:34 -0800
  • ecd7a32974 Merge pull request #40 from therufs/fix-rarity Tyler Renelle 2013-11-14 20:37:02 -0800
  • 3461d67995 challenges: include challenges that user created, or belongs to, even if not in group anymore Tyler Renelle 2013-11-14 20:30:25 -0800
  • 550ca394a9 groups: remove _v for now, it's causing issues (cast to Number failed for Object) and I don't know why Tyler Renelle 2013-11-14 20:29:48 -0800
  • 97d592401b Merge pull request #1825 from HabitRPG/sabe_tweak_fix Tyler Renelle 2013-11-14 20:00:00 -0800
  • 5ae2f06006 Shields don't come free ya know! Sabe Jones 2013-11-14 20:42:09 -0600
  • 55faf443ce send error to refresh page if they haven't since update Tyler Renelle 2013-11-14 16:18:40 -0800
  • 94459e429c Merge pull request #1824 from HabitRPG/sabe_tweak Tyler Renelle 2013-11-14 18:01:02 -0800
  • c9aeb65d55 Rebalance potion ratios (version 2) Ruthan 2013-11-14 20:52:24 -0500
  • ee1768b7e2 One does not simply *pull request* into Heroism. Sabe Jones 2013-11-14 19:42:03 -0600
  • ccd39036b6 Fix drop ratios Ruthan 2013-11-14 20:22:39 -0500
  • 4ca516b7bc Merge pull request #1817 from nafoster/develop Tyler Renelle 2013-11-14 14:07:47 -0800
  • 30b19b5e7d pets: add adjectives (@SabreCat) Tyler Renelle 2013-11-14 14:05:44 -0800
  • 224cbe2277 pets: better fix than 64ac920 , and unsets beastmaster if wrongly set Tyler Renelle 2013-11-14 13:49:59 -0800
  • af8ca6d5b0 Many JP translations Nicole Foster 2013-11-14 16:34:36 -0500
  • 64ac920ca7 pets: fix to beastmaster with new pet system Tyler Renelle 2013-11-14 13:25:00 -0800
  • 92a7344a58 mounts: back to habirpg-shared#master Tyler Renelle 2013-11-14 13:05:31 -0800
  • 4c3f04cc49 Merge branch 'mounts' into develop Tyler Renelle 2013-11-14 13:04:44 -0800
  • d245c87f29 mounts: temporarily remove mounts code from views. merging to master so we can run schema migration and start with item translations. This commit will be reverted when mounts is fully merged Tyler Renelle 2013-11-14 12:59:00 -0800
  • 9863ca0ce5 Merge branch 'mounts' Tyler Renelle 2013-11-14 12:41:47 -0800
  • bf8c0dd9dc mounts: remove food temporarily. merging to master so we can run schema migration and start with item translations. This commit will be reverted when mounts is fully merged Tyler Renelle 2013-11-14 12:40:08 -0800
  • a52eaee62f mounts: simpler, cleaner breakdown of potion rarity Tyler Renelle 2013-11-14 12:34:11 -0800
  • 1631406a5e greek code set to "el" Matteo Pagliazzi 2013-11-14 21:21:49 +0100
  • ba548ed67b mounts: more item DRY-ing and cleanup Tyler Renelle 2013-11-14 12:12:49 -0800
  • 41d8bc04cd Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop Matteo Pagliazzi 2013-11-14 20:50:36 +0100
  • 7df04633e2 correct languageName for Ukrainian Matteo Pagliazzi 2013-11-14 20:50:17 +0100
  • d124968273 mounts: add egg.mountText so "cub" text doesn't show up for mounts Tyler Renelle 2013-11-13 16:45:08 -0800
  • 201b04f759 i18n: greek bug Tyler Renelle 2013-11-14 11:17:47 -0800
  • edc4a8cdc2 Merge pull request #1814 from phil230/upper_save Tyler Renelle 2013-11-14 10:51:30 -0800
  • ffe8ae899b Merge pull request #1816 from phil230/greek_tr Tyler Renelle 2013-11-14 10:46:16 -0800
  • 68c9748619 armour -> armor Matteo Pagliazzi 2013-11-14 19:23:35 +0100
  • fafa17c80d Removed clientSideStrings Filippos 2013-11-14 17:25:15 +0200
  • 412c9efd60 Added Greek Language Filippos 2013-11-14 17:01:13 +0200
  • c256295d6f fix tests, @lefnire not the best solution but it works Matteo Pagliazzi 2013-11-14 14:48:36 +0100
  • b60eadf468 readme typo Matteo Pagliazzi 2013-11-14 14:42:52 +0100
  • 0c40d44de7 remove clientSideStrings part, stringNotFound added to locales/en/app.json, should be added to other languages, readme updated, $rootscope.translations removed Matteo Pagliazzi 2013-11-14 14:41:42 +0100
  • c75bfaa4d9 remove $rootScope.translations, it should not be necessary, update readme Matteo Pagliazzi 2013-11-14 14:16:46 +0100
  • cbc1185f00 Added 'icon-ok' as an upper save button Filippos 2013-11-14 15:01:58 +0200
  • ddb73f806a translations: prep old app.json files for new setup Tyler Renelle 2013-11-14 01:27:11 -0800
  • d44d6168bf JP: translated head, skin, and profile heading and half translated show helm Nicole Foster 2013-11-13 19:32:55 -0500
  • 8b33019b75 [#1813] add bg.original.json, since old bg file not compatible with new json. will need to revisit Tyler Renelle 2013-11-14 00:35:00 -0800
  • 5914848308 [#1813] restore lost PT translations (@DanielTheBard can you double check this?) Tyler Renelle 2013-11-14 00:25:36 -0800
  • 10e9c205e6 Merge branch 'translations' into develop Tyler Renelle 2013-11-13 23:37:29 -0800
  • 6512e17454 translations: temporarily using locales_new so we can work with existing PRs (@paglias). I want to merge to develop sooner-than-later to avoid near-future conflicts. Pushing to beta Tyler Renelle 2013-11-13 23:36:18 -0800
  • 95c886eee8 Merge pull request #1811 from Fandekasp/update_contrib_link Tyler Renelle 2013-11-13 23:26:19 -0800
  • 5038885baf [#923] also migrate group.websites => group.description (@Fandekasp the user stuff is solid, thanks!) Tyler Renelle 2013-11-13 23:24:59 -0800
  • aad8f80c9d Merge pull request #1795 from Fandekasp/remove_website Tyler Renelle 2013-11-13 23:09:27 -0800
  • 9083645dc3 migration script: websites → blurb Adrien Lemaire 2013-11-14 17:57:07 +1100
  • 153d1957a8 clean code from websites Adrien Lemaire 2013-11-14 15:20:33 +1100
  • 340590774c replace github contributing links → wikia link Adrien Lemaire 2013-11-14 15:09:20 +1100
  • 1150de9d9d Merge pull request #1780 from Fandekasp/fix_armour Tyler Renelle 2013-11-13 16:19:04 -0800
  • c90248f817 update new armour → armor after rebase Adrien Lemaire 2013-11-14 11:13:09 +1100
  • 1fab48f1db Issue #1149: armour → armor Adrien Lemaire 2013-11-10 16:32:36 +1100
  • 6a6ca49351 Merge pull request #1782 from Fandekasp/fix_fr Tyler Renelle 2013-11-13 16:02:35 -0800
  • 9a8b0f91f2 review and fix fr typos Adrien Lemaire 2013-11-10 16:51:02 +1100
  • ef9d423a49 Merge pull request #1799 from nafoster/ja_trans Tyler Renelle 2013-11-13 15:47:17 -0800
  • 7291e3c97c Update app.json Daniel the Bard 2013-11-10 21:30:42 -0500
  • 0a0a8bc1a0 Portuguese Translation Fixes Daniel the Bard 2013-11-10 19:46:10 -0500
  • 2aa9c0ed56 Update app.json Daniel the Bard 2013-11-10 17:34:44 -0500