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

1562 Commits

Author SHA1 Message Date
Matteo Pagliazzi 0c40d44de7 remove clientSideStrings part, stringNotFound added to locales/en/app.json, should be added to other languages, readme updated, $rootscope.translations removed 2013-11-14 14:41:42 +01:00
Tyler Renelle ddb73f806a translations: prep old app.json files for new setup 2013-11-14 01:27:11 -08:00
Tyler Renelle 10e9c205e6 Merge branch 'translations' into develop 
Conflicts:
	locales/bg/app.json
	locales/nl/app.json
 2013-11-13 23:37:29 -08:00
Tyler Renelle 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
 2013-11-13 23:36:18 -08:00
Tyler Renelle aad8f80c9d Merge pull request #1795 from Fandekasp/remove_website 
remove broken website field from profile
 2013-11-13 23:09:27 -08:00
Adrien Lemaire 153d1957a8 clean code from websites 
Need review !
 2013-11-14 15:20:35 +11:00
Matteo Pagliazzi d85084c165 translations: add italian sample for testings & fix 2013-11-13 23:21:09 +01:00
Matteo Pagliazzi 47a1605460 merge missing strings from english at server start up 2013-11-13 23:13:00 +01:00
Matteo Pagliazzi 1b0bed0428 translations: add check 2013-11-13 22:04:31 +01:00
Matteo Pagliazzi 83d9368c2e translations: move some computations to server start-up, remove console.log, add translations to $rootScope, update readme, update user.preference.language if not set 2013-11-13 22:01:02 +01:00
Matteo Pagliazzi 22267805ee add support for getting strings under clientSideStrings and update sample 2013-11-12 22:23:47 +01:00
Matteo Pagliazzi be2010b0a2 add sample app.json for new translations, send client side strings to the browser, send languages to the browser with a language name and code 2013-11-12 22:01:27 +01:00
Matteo Pagliazzi 5ddf54466c can change language from setting 2013-11-12 16:13:35 +01:00
Matteo Pagliazzi 154a652726 middleware.locals back to a middleware, use user specified language if avalaible, list of avalaible languages avalaible in window.env 2013-11-12 15:57:46 +01:00
Matteo Pagliazzi 6e33b88c85 remove middleware.splash 2013-11-12 15:10:16 +01:00
Matteo Pagliazzi 7eaed0348f git merge Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into translations 2013-11-12 14:54:17 +01:00
Matteo Pagliazzi 1d9148eebb move middleware.locals only where it is needed and transform it into a common function, simplify translations and adds automatic language detection 2013-11-12 14:49:01 +01:00
Matteo Pagliazzi cb36881edd minimal translations 2013-11-11 22:22:25 +01:00
Matteo Pagliazzi de7ae2203f remove old files 2013-11-11 21:21:19 +01:00
Matteo Pagliazzi a1f9bf60fb try 2013-11-11 21:20:12 +01:00
Tyler Renelle 72f64fa85c [#1751] /challenges/:cid/:mid task filtering by "in this challenge" at 
application level, not Mongo. $elemMatch doesn't support returning
multiple items, see http://goo.gl/MxmWdQ & http://goo.gl/Iku44w
 2013-11-10 23:41:42 -08:00
Tyler Renelle ddd45d76d4 contrib: fix to upping lvl 0 contrib 2013-11-09 13:24:03 -08:00
Tyler Renelle 66041442da Merge pull request #1770 from snicker/develop 
updated README to show initial seeding tasks, and fixed a small typo
 2013-11-09 13:19:31 -08:00
Matteo Pagliazzi de1f056af8 typo 2013-11-09 19:32:47 +01:00
Matteo Pagliazzi e198bac475 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-09 19:31:50 +01:00
Matteo Pagliazzi aff43acc84 fix #1769 2013-11-09 19:31:28 +01:00
Nick Gordon d802c502b0 updated README to show initial seeding tasks, and fixed a small typo 2013-11-09 08:48:38 -08:00
Tyler Renelle 242bcda96a contrib: remove gems from admin section, update automatically when they 
increase a level
 2013-11-08 19:28:07 -08:00
Tyler Renelle f35df8a47f [#1726] remove updateTasks() batch api route. That's not how we're using 
batch (we'll create a proper batch route & document later), and we
shouldn't support this route
 2013-11-08 14:01:29 -08:00
Matteo Pagliazzi 3a332c4c45 port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting 2013-11-08 22:33:48 +01:00
Matteo Pagliazzi 03905ef90b solve conflicts 3 2013-11-08 17:09:06 +01:00
Matteo Pagliazzi e1b86c64a6 solve conflicts 2 2013-11-08 17:08:23 +01:00
Matteo Pagliazzi 02651d52a4 solve conflict 2013-11-08 17:05:03 +01:00
Matteo Pagliazzi a78297f129 update chat if necessary after new message posted or deleted 2013-11-08 17:03:10 +01:00
Tyler Renelle 4454cc502b contrib: only show contrib alert if they've gained, not lost 2013-11-07 14:22:56 -08:00
Tyler Renelle 7c94b4b6d3 contrib: add contributor achievement modal 2013-11-07 13:42:29 -08:00
Tyler Renelle 962cf9a3be contrib: add name-tag colors based on contributor level 2013-11-07 12:23:12 -08:00
Tyler Renelle f61c35975a contrib: award profile Dragon-Hydra if admin sets level >= 6 2013-11-06 17:47:00 -08:00
Tyler Renelle d679fa1e62 contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor 2013-11-06 15:59:56 -08:00
Matteo Pagliazzi 3b18c322bc return whole group.chat after chat message is sent 2013-11-06 21:27:24 +01:00
Matteo Pagliazzi 5ebab59780 return 204 on group.update 2013-11-06 21:19:23 +01:00
Matteo Pagliazzi a4951e151c use $resource class methods to avoid sending whole model to server & reduce some responses 2013-11-06 20:31:39 +01:00
Matteo Pagliazzi 0e48cb483a put route for group.update 2013-11-06 20:30:29 +01:00
Matteo Pagliazzi abbf09eaaa remove console.log 2013-11-06 20:18:59 +01:00
Tyler Renelle 3dde30076c [#1726] fix PUT /api/v1/user/tasks/:tid . Something was really strange 
when fully overriding an embedded mongoose doc, still don't know what
the issue was...
 2013-11-05 17:43:43 -08:00
Tyler Renelle 1d5296880b Merge pull request #1750 from HabitRPG/paglias/build-manifest 
Paglias/build manifest
 2013-11-05 10:29:12 -08:00
Matteo Pagliazzi fbf57bde66 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-05 19:24:36 +01:00
Matteo Pagliazzi 5b9002820f replace express.bodyParser with express.json & express.urlencoded since it is deprecated in connect 3.0 2013-11-05 19:24:11 +01:00
Tyler Renelle ee35d16f4d temporary log-suppressing so i can diagnose live a bit better 2013-11-05 09:34:09 -08:00
Tyler Renelle cde3bb4c69 user._v & group._v fixes 2013-11-04 13:43:24 -08:00