Commit graph

8492 commits

Author SHA1 Message Date
ojintoad
3fc15149b7 Adds language to Address PMs, explicitly forbid spamming, list sexism in the public spaces inappropriate behaviors, define duplicate accounts as severe infractions. 2015-02-09 00:05:58 -05:00
ojintoad
a6106dc6ca removed space 2015-02-08 23:33:15 -05:00
ojintoad
d3054a3c7b Adding blade to moderators list and graphic 2015-02-08 23:26:27 -05:00
ojintoad
3fda4dc2d2 Adding mod info 'on Github' descriptor 2015-02-08 23:24:30 -05:00
Blade Barringer
e5e9f054d1 Compiled coffeescript 2015-02-08 20:32:14 -06:00
Blade Barringer
0ebb9c874b Worked on gruntfile 2015-02-08 20:19:54 -06:00
Sabe Jones
4b96ee83b6 chore(news): 2/8 Bailey 2015-02-08 15:21:43 -06:00
Matteo Pagliazzi
8b88b34475 correctly redirect after authentication 2015-02-08 21:45:30 +01:00
Matteo Pagliazzi
58cec5259a enable quest invitation email 2015-02-08 20:33:03 +01:00
Matteo Pagliazzi
7d139b4adc add quest invitation email (disabled for now) and fixes 2015-02-07 22:20:16 +01:00
Matteo Pagliazzi
cb4da8b91e add strings 2015-02-07 22:00:02 +01:00
Matteo Pagliazzi
4f66d30441 implement quest started email 2015-02-07 21:36:38 +01:00
Matteo Pagliazzi
9aca6c26c6 chore(i18n): update locales 2015-02-07 19:22:00 +01:00
Alice Harris
468f414710 Merge pull request #4644 from Alys/develop
database script to identify and remove duplicate tasks for one user - use with caution!
2015-02-07 14:04:58 +10:00
Alice Harris
734227c472 improve spacing 2015-02-07 14:00:21 +10:00
Alice Harris
ef8b783f2b add script that helps a database admin find and remove tasks with duplicated IDs for a single user 2015-02-07 13:51:22 +10:00
Blade Barringer
157a635a0c Restored Grunt tasks 2015-02-06 21:13:26 -06:00
Blade Barringer
71a2382b67 Added grunt tasks back in 2015-02-06 20:58:38 -06:00
Blade Barringer
1dfdffd51f Removed converted grunt tasks 2015-02-06 16:05:55 -06:00
Blade Barringer
6cf1ce7f67 Wrote copy task 2015-02-06 16:05:06 -06:00
Blade Barringer
1846dacd5f Used event-stream for stylus task 2015-02-06 15:13:18 -06:00
Matteo Pagliazzi
419b6bf611 Merge pull request #460 from negue/fullTranslation
add a locale var to all translations
2015-02-06 18:47:17 +01:00
Blade Barringer
4339fd7982 Simplified stylus task 2015-02-06 10:50:18 -06:00
Blade Barringer
12ae9957ad Corrected paths on gulp tasks 2015-02-05 20:39:45 -06:00
Tyler Renelle
2d44783d80 fix(tour): don't restart tour on userUpdated, fixes #4632 2015-02-05 15:46:20 -07:00
Blade Barringer
67f478bb0e Adjusted paths to files 2015-02-05 16:37:22 -06:00
Blade Barringer
4572900a59 Wrote first version of hashing task 2015-02-05 13:34:14 -06:00
Blade Barringer
05bbd8dd31 Added gulp-hash to package json 2015-02-05 11:58:19 -06:00
Blade Barringer
1fd7048ac0 Fixed semicolon -> comma 2015-02-05 11:58:08 -06:00
Blade Barringer
0fdd2faaa2 cleaned up processes a bit 2015-02-05 11:43:07 -06:00
Blade Barringer
851a79ede6 Separated out tasks from build 2015-02-05 11:39:11 -06:00
Blade Barringer
cd4225bdb7 refactored paths for build 2015-02-05 11:32:57 -06:00
Blade Barringer
9adcc37dc4 Changed to dot notation 2015-02-05 11:22:42 -06:00
Blade Barringer
dca2f13dda Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	bower.json
	public/manifest.json
	src/controllers/auth.js
2015-02-05 11:20:40 -06:00
Blade Barringer
3897266ba6 Removed trailing comma from .jshintrc 2015-02-05 11:15:01 -06:00
Blade Barringer
3f064ee1bf Merge pull request #4566 from Verabird/fixDateFormat
Fix date format for charts (#4558)
2015-02-04 21:59:00 -06:00
Tyler Renelle
63320d3fe7 refactor(tour): small cleanup 2015-02-04 19:40:06 -07:00
Tyler Renelle
3916346308 fix(tour): misc tour fixes. uses backdrop, next/prev (important we've
found in user test vids), etc
2015-02-04 18:55:29 -07:00
Verabird
d7b0bd5b72 Add access to .User in MemberModalCtrl 2015-02-04 20:15:18 -05:00
Blade Barringer
28b9ad11cb Added paths for common scripts 2015-02-04 13:22:41 -06:00
Verabird
fecba8f9f5 Shorten dateFormat string in graphs 2015-02-04 13:38:24 -05:00
Verabird
3cb182fb53 Add dateFormat choice to charts and other hardcoded MM/DD/YYYY 2015-02-04 13:38:24 -05:00
Blade Barringer
5d9cda3b76 Corrected some paths to serve files directly from comon 2015-02-04 12:25:14 -06:00
Blade Barringer
aba56bd174 Moved hair files to correct location 2015-02-04 10:33:25 -06:00
Blade Barringer
5cf46f9f4a Corrected path for coverage 2015-02-04 10:26:54 -06:00
Blade Barringer
286e894e2f Removed package json from common 2015-02-04 10:21:23 -06:00
Blade Barringer
a617bac139 Moved config.json.example to website folder 2015-02-04 10:18:42 -06:00
Blade Barringer
250249dc57 Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-04 10:16:30 -06:00
Blade Barringer
a6d3857a1d Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	common/public/habitrpg-shared.js
2015-02-04 10:15:23 -06:00
Blade Barringer
5d0defc685 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/public/habitrpg-shared.js
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
	dist/spritesmith5.css
	dist/spritesmith5.png
2015-02-04 10:14:11 -06:00