Commit Graph

11837 Commits

Author SHA1 Message Date
Blade Barringer
90fe516562 Join button was showing even if user was already part of the group 2015-03-04 16:24:37 -06:00
Sabe Jones
21fd8061cf feat(backgrounds): March BGs 2015-03-03 21:42:15 -06:00
Blade Barringer
cbc49829c8 Merge branch 'food_tray_padding' of https://github.com/kangabell/habitrpg into food-tray 2015-02-26 14:08:17 -06:00
Blade Barringer
7432b6fd57 Removed test string 2015-02-26 13:24:04 -06:00
Blade Barringer
d0e1f25c0b Added one time binding 2015-02-26 13:23:30 -06:00
Blade Barringer
fa31023830 Changed ng-show to an ng-if so that table striping would be correct 2015-02-26 13:22:24 -06:00
Blade Barringer
1629ca037b Did the _.isMember stuff the right way 2015-02-25 15:28:14 -06:00
Blade Barringer
a905f481e8 Added join button to top. Closes #3408 2015-02-25 15:07:54 -06:00
Blade Barringer
cb2af51faa Corrected ng-click to join 2015-02-25 14:45:04 -06:00
Blade Barringer
0d7b6b445e Added buttons for joining and leaving group. 2015-02-25 14:34:24 -06:00
Blade Barringer
30e158de48 Add _isMember attribute to groupSchema 2015-02-25 11:51:32 -06:00
Sabe Jones
d4f8acd0ef feat(mystery): February 2015 2015-02-24 20:15:31 -06:00
Blade Barringer
33bd640bdb Fixes #3054 won't show pets as able to be fed if egg has noMount propery 2015-02-24 19:10:45 -06:00
Matteo Pagliazzi
6d637e89a2 new bailey 2015-02-24 19:29:00 +01:00
Matteo Pagliazzi
45f2453a62 typo 2015-02-24 16:51:09 +01:00
Tyler Renelle
02901e52fd perf(auth): small register perf improvement. use $or in $regex query,
intead of two queries, so if first operand true we short-circuit second operand
2015-02-23 23:48:46 -07:00
Tyler Renelle
16c4c420bb chore(server): small updates to better support recent nodejs buildpack 2015-02-23 23:48:46 -07:00
Blade Barringer
e9b72ad40d Merge pull request #4721 from crookedneighbor/fix-challenge-select-ios
Fixes #4719. Guild select for challenges pre-populates with first group
2015-02-23 22:09:17 -06:00
Matteo Pagliazzi
4da8eb1d58 fix(typo) 2015-02-23 21:51:15 +01:00
Matteo Pagliazzi
4151b0733f add ability to unsubscribe from a single event using a dedicated link 2015-02-23 21:25:01 +01:00
Blade Barringer
21ef62481d Removed step attribue from contributor input 2015-02-23 09:41:27 -06:00
Bryce Wojtowicz
44478d3792 Fixes #4645
Fixes Gem Display in modals to say [Gem] You have [n] Gems
Modified code to use a translatable string!
Thanks for the tip :)
2015-02-22 13:35:50 +08:00
Matteo Pagliazzi
6d38086b66 use profile name in emails for fb users 2015-02-20 18:17:54 +01:00
Matteo Pagliazzi
397a293ca8 change text for recapture emails settings 2015-02-20 18:15:47 +01:00
Blade Barringer
98ecd4b457 Fixes #4719. Guild select for challenges pre-populates with first group 2015-02-19 16:53:15 -06:00
Blade Barringer
78e124c576 Updated path to models on Github. Closes #4720 2015-02-19 15:49:26 -06:00
Blade Barringer
a2783400ab Merge pull request #4716 from chimericdream/bulk-add-tasks
Bulk add tasks - auto-focus task box when toggling
2015-02-19 14:31:55 -06:00
Blade Barringer
bdef56f7ae Changed api key input to password so password managers can recognize it 2015-02-19 14:07:28 -06:00
Bill Parrott
98c6526cf7 add auto-focus when single/multiple is toggled 2015-02-19 08:46:45 -06:00
Blade Barringer
c215b90869 Merge pull request #4699 from chimericdream/bulk-add-tasks
Bulk add tasks (first version; seeking review & feedback)
2015-02-18 16:41:31 -06:00
Blade Barringer
3784927ddb Added additional line breaks under date 2015-02-18 14:42:43 -06:00
Blade Barringer
87893ced0d Updated dates on terms and privacy pages 2015-02-18 14:39:06 -06:00
Blade Barringer
e25f9cb183 Changed privacy link to relative link 2015-02-18 14:24:44 -06:00
Blade Barringer
c24d85c21c Updated email and address 2015-02-18 14:23:53 -06:00
Blade Barringer
dd6a8d35db Updated link to privacy policy 2015-02-18 13:52:20 -06:00
Matteo Pagliazzi
38af7ff3c1 emails: add optional reply_to_address variable 2015-02-18 19:31:02 +01:00
Bill Parrott
3599eaefaf Merge branch 'develop' into bulk-add-tasks 2015-02-17 22:32:28 -06:00
Sabe Jones
47f3122c2d chore(news): Pet rocks Bailey
Also fixes incorrectly named golden rocks.
2015-02-17 20:39:04 -06:00
Sabe Jones
0608ac5caa feat(quest): Pet Rocks 2015-02-17 20:02:06 -06:00
Blade Barringer
0d395295eb Merge branch 'archery' into develop 2015-02-17 15:27:19 -06:00
Blade Barringer
78430b1910 Collapsed 3 strings into single string 2015-02-17 15:26:42 -06:00
Bill Parrott
7042c97d5d removing export functionality to move to its own branch 2015-02-17 14:23:55 -06:00
Bill Parrott
4563d22bf0 minor updates from code review 2015-02-17 14:05:09 -06:00
Blade Barringer
44b9ac7215 Fixed path to audio files. Closes #4704 2015-02-17 13:53:32 -06:00
remmz0r
2e98185c5d fixes #4670
removed target="_blank" from archery link
2015-02-18 00:03:37 +08:00
remmy poos
cfabb12b04 fixes #4670
Replaced archery links in index.jade and tavern.jade

Let me know if this isn't all the links

Cheers
- remmz0r
2015-02-17 23:52:48 +08:00
Blade Barringer
a5ce3f58b1 Removed original user text from veteran achievement 2015-02-17 08:42:43 -06:00
Blade Barringer
6c85cd18a9 Adjusted style of bulk tasks 2015-02-17 08:37:26 -06:00
Blade Barringer
48e688d815 Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add 2015-02-17 08:05:36 -06:00
Bill Parrott
2de3a5dd55 first draft of bulk add 2015-02-17 00:25:56 -06:00