Commit graph

8626 commits

Author SHA1 Message Date
Alys
5198050cd2 Merge pull request #4863 from rdhammond/InstantPartySource
Instant party source
2015-03-20 06:46:38 +10:00
Tyler Renelle
cca2d81bc3 feat(tour): ESC to perma-close #4886 @lemoness @alys 2015-03-19 14:41:04 -06:00
Tyler Renelle
152853a877 feat(tour): update habits step wording @lemoness 2015-03-19 14:28:05 -06:00
Matteo Pagliazzi
4c3e7f897e chore(i18n): update locales 2015-03-19 20:21:04 +01:00
Tyler Renelle
84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06:00
Alice Harris
c880c525b4 add missing closing li and ul tag, remove excess b tags to make life easier for translators 2015-03-20 00:27:54 +10:00
Alys
c2436686f7 Merge pull request #4881 from betaveros/task-bindonce-id-fix
Change task's bo-id to id with angular's {{::}}. Fixes #4430
2015-03-19 16:11:50 +10:00
Brian Chen
9bab79790c Change task's bo-id to id with angular's {{::}}. Fixes #4430 2015-03-19 10:16:53 +08:00
Matteo Pagliazzi
92a6af72cf fix(emails): send emails to new fb users 2015-03-18 20:11:16 +01:00
Matteo Pagliazzi
f243617ccf chore(i18n): update locales 2015-03-18 20:01:29 +01:00
Matteo Pagliazzi
0be58eb403 fix(i18n): remove empty strings as they break transifex 2015-03-18 19:57:00 +01:00
Matteo Pagliazzi
75d1a766e5 chore(i18n): update locales 2015-03-18 19:37:26 +01:00
Matteo Pagliazzi
9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Matteo Pagliazzi
0722a17897 start working on kick from group email & message 2015-03-18 17:31:07 +01:00
Matteo Pagliazzi
6d163ecb5d chore(i18n): update locales 2015-03-18 12:13:36 +01:00
Alice Harris
4868a6facb replace non-ascii punctuation with ascii versions (... and ' and -) 2015-03-18 19:30:00 +10:00
Alice Harris
833ba9ec4a change Gully3 to Gully as requested by Gully in the Tavern and as confirmed by Lemoness 2015-03-18 19:13:39 +10:00
Sabe Jones
910fd56693 Merge pull request #4877 from SabreCat/bunny
Bunny pet quest
2015-03-17 22:05:13 -05:00
Sabe Jones
607286afa5 fix(quest): Typo 2015-03-17 21:59:08 -05:00
Sabe Jones
c8db070b12 fix(quests): Reference string correctly 2015-03-17 21:51:28 -05:00
Sabe Jones
4c5f4377ff fix(quests): Alternate unlock strings 2015-03-17 21:48:22 -05:00
Sabe Jones
efdf591eae fix(quest): Different string format 2015-03-17 21:38:22 -05:00
Sabe Jones
7422fe3865 fix(quest): Correct unlock string 2015-03-17 21:33:13 -05:00
Sabe Jones
b118d45bb3 fix(string): Missing comma 2015-03-17 21:28:50 -05:00
Sabe Jones
4cb6783544 feat(quest): Bunny quest 2015-03-17 21:24:46 -05:00
Alice Harris
fcc0b67426 updated survey badge message (Leslie made a trello card to close the survey on the 19th) 2015-03-17 14:03:25 +10:00
Alice Harris
c47606c5b2 remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment 2015-03-17 07:49:37 +10:00
Matteo Pagliazzi
b0b6864f1c chore(i18n): update locales 2015-03-16 19:56:35 +01:00
Tyler Renelle
9d5889c428 fix(interactive-tour): remove old unused strings 2015-03-16 12:38:22 -06:00
Matteo Pagliazzi
0d42a71517 chore(i18n): update locales 2015-03-16 15:33:42 +01:00
Alys
8e4ef76e23 Merge pull request #4855 from Alys/icon-fix-2015-03-15
replace ☰ with glyphicon-align-justify for visibility on Android browsers
2015-03-16 19:53:34 +10:00
Alice Harris
44259925e4 re-add the dequip option for removing backgrounds with proper bug fix (ref 9199c6c7e2); make whitespace consistent 2015-03-16 19:27:44 +10:00
R. Daniel Hammond
a46c5c0225 We shouldn't need the "refresh to see changes" now. 2015-03-15 20:52:50 -04:00
R. Daniel Hammond
5ac73aca9e Adding a couple of watch statements should make the party order auto-update on changes. 2015-03-15 20:49:13 -04:00
Alys
ca796e294f Merge pull request #4860 from georgemillo/patch-1
`%w""` syntax is native Ruby, not Rails
2015-03-16 06:19:06 +10:00
George Millo
293f41d087 %w"" syntax is native Ruby, not Rails 2015-03-15 14:48:36 +01:00
Matteo Pagliazzi
475ee0160b chore(i18n): update locales 2015-03-15 13:39:23 +01:00
Tyler Renelle
2cf98daec4 feat(auth): temporarily back to nodemailer #4789 (cc @paglias) 2015-03-14 18:30:46 -06:00
Alice Harris
9199c6c7e2 remove unequip background feature temporarily - fixes https://github.com/HabitRPG/habitrpg/issues/4857#issuecomment-80722868 2015-03-15 07:44:36 +10:00
Sabe Jones
3ae1ad92a1 Merge pull request #4856 from SabreCat/pi-day
Pi day
2015-03-14 11:20:29 -05:00
Sabe Jones
6aedfa7209 chore(grunt): compile sprites 2015-03-14 11:18:36 -05:00
Sabe Jones
1120d334c3 feat(pie): Add pie 2015-03-14 11:11:20 -05:00
Alice Harris
3fcb74bc80 replace ☰ with glyphicon-align-justify for visibility on Android browsers 2015-03-15 00:57:30 +10:00
Alice Harris
21a7e6193f add whitespace between delete and opt-out 2015-03-14 23:27:26 +10:00
Alice Harris
f82469eba7 remove trailing whitespace 2015-03-14 22:40:26 +10:00
Alys
94f9cff279 Merge pull request #4850 from stillsnowedin/develop
Added confirmation before deleting messages and moved buttons to top of ...
2015-03-14 22:32:46 +10:00
Alys
59f64830b1 Merge pull request #4799 from TheHollidayInn/add-dequip-button
Added dequip ability per ticket: 3730
2015-03-14 21:36:57 +10:00
Matteo Pagliazzi
5752f75c46 always allow reset password emails 2015-03-13 18:42:23 +01:00
Matteo Pagliazzi
dba7d3b522 chore(i18n): update locales 2015-03-13 18:40:11 +01:00
Tyler Renelle
f993a5868f fix(robots): fix robots.txt per
http://stackoverflow.com/a/7609187/362790 #4746
2015-03-13 09:01:04 -06:00