 Thrashmandicoot
|
64ea4e42e7
|
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
|
2015-10-30 03:43:35 -07:00 |
|
|
Blade Barringer
|
68fabbf56f
|
Update names
|
2015-10-29 08:07:06 -05:00 |
|
|
Blade Barringer
|
4b44c935e8
|
Merge branch 'develop' into Bunjl-develop
|
2015-10-29 07:58:31 -05:00 |
|
|
Blade Barringer
|
bce37f7220
|
Adjusted Press Kit naming.
|
2015-10-29 07:55:17 -05:00 |
|
|
Matteo Pagliazzi
|
01373882c6
|
make error notification persistent, change text and make it translatable
|
2015-10-28 19:42:26 +01:00 |
|
|
jpk24rent
|
5269df2932
|
namefix
|
2015-10-28 09:47:04 +02:00 |
|
|
jpk24rent
|
078c37bdda
|
presskit
press kit update
|
2015-10-27 15:34:52 +02:00 |
|
|
Sabe Jones
|
bcc522f08d
|
feat(sharing): Add Tumblr button
|
2015-10-22 13:52:26 -04:00 |
|
|
Sabe Jones
|
d32f6f23cc
|
feat(sharing): Improved front page FB share
|
2015-10-21 15:59:17 -04:00 |
|
|
Blade Barringer
|
9ad1dbd8ce
|
Adjust mystic hourglass string to take in interpolation
|
2015-10-19 08:10:37 -05:00 |
|
|
Blade Barringer
|
d9de32f2dc
|
Add todo to investigate magic numbers
|
2015-10-19 08:04:47 -05:00 |
|
|
Blade Barringer
|
1a2510e4da
|
Adjsut string to take in interpolation
|
2015-10-19 08:03:27 -05:00 |
|
|
Blade Barringer
|
931d688637
|
Use Content service
|
2015-10-19 08:03:14 -05:00 |
|
|
Blade Barringer
|
f03be07595
|
Add extra line breaks
|
2015-10-19 08:02:35 -05:00 |
|
|
Thrashmandicoot
|
04550a3346
|
Add btn-sell to increase width of market button to container
|
2015-10-07 19:18:54 -07:00 |
|
|
Blade Barringer
|
955c163544
|
Merge branch 'develop' into refactor-content
|
2015-09-23 07:52:36 -05:00 |
|
|
Sabe Jones
|
6a6b67b9c1
|
Merge pull request #5909 from HabitRPG/sabrecat/social-buttons
Front page Tweet button
|
2015-09-22 17:38:47 -05:00 |
|
|
Blade Barringer
|
8881dbc034
|
Remove uneeded blank spaces
|
2015-09-16 20:01:42 -05:00 |
|
|
Sabe Jones
|
eb0dd636c1
|
feat(hourglass): Confirm before buy
|
2015-09-16 17:40:25 -04:00 |
|
|
Sabe Jones
|
fb50f27fa7
|
fix(hourglass): Use method on $scope
|
2015-09-16 16:46:12 -04:00 |
|
|
Sabe Jones
|
98cd8364c6
|
feat(hourglass): Individual filter functions
|
2015-09-16 16:35:04 -04:00 |
|
|
Blade Barringer
|
78fe1073d4
|
Add user sync to sendAction
|
2015-09-15 16:39:08 -05:00 |
|
|
Blade Barringer
|
0fe6054b76
|
Add missing client code
|
2015-09-15 10:53:56 -05:00 |
|
|
Blade Barringer
|
b32e521c56
|
Pull in client side changes for quest routes
|
2015-09-15 09:35:17 -05:00 |
|
|
Blade Barringer
|
5553d74334
|
Create method to calculate whether or not user has attained all mystery equipment
|
2015-09-13 16:26:29 -05:00 |
|
|
Blade Barringer
|
b6f02d388f
|
Correct method to correctly add an hourglass in debug menu
|
2015-09-13 16:25:57 -05:00 |
|
|
Blade Barringer
|
cd4ec5bd12
|
Adjust formatting in footer controller
|
2015-09-13 02:19:34 -05:00 |
|
|
Blade Barringer
|
14fabfbe40
|
Remove excess white space
|
2015-09-12 22:34:58 -05:00 |
|
|
Sabe Jones
|
9d5f9328da
|
WIP(social): Twitter widget script
|
2015-09-10 17:44:52 -04:00 |
|
|
melarish
|
05cf144630
|
Pulled and merged
|
2015-09-09 23:23:45 +01:00 |
|
|
Sabe Jones
|
f8ce7c2292
|
fix(analytics): Track modals correctly
Fixes #5879.
|
2015-09-07 22:23:42 -04:00 |
|
|
Sabe Jones
|
f044f83772
|
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
|
2015-09-07 21:55:28 -04:00 |
|
|
Blade Barringer
|
bb06e95c4e
|
Add emoji class to list of classes that should not use pixelated rendering
|
2015-09-07 15:29:24 -05:00 |
|
|
Sabe Jones
|
d6f416b6d3
|
feat(analytics): Track party buttons
|
2015-09-07 12:02:01 -04:00 |
|
|
Blade Barringer
|
6a1d4adcda
|
Merge branch 'develop' into HabitRPG-sabrecat/faq
|
2015-09-06 17:10:45 -05:00 |
|
|
Blade Barringer
|
4177202cee
|
Merge pull request #5855 from HabitRPG/sabrecat/party-page
Party Page Revamp
|
2015-09-06 13:28:14 -05:00 |
|
|
Blade Barringer
|
f1224bc6be
|
Use select instead of an input for cds
|
2015-09-06 09:36:29 -05:00 |
|
|
Blade Barringer
|
085a785e4d
|
Convert input to select box
|
2015-09-06 09:22:40 -05:00 |
|
|
Blade Barringer
|
9ce6144fa4
|
Adjustments to custom day start
|
2015-09-05 15:32:49 -05:00 |
|
|
Blade Barringer
|
d45602c340
|
Adjust spacing
|
2015-09-05 09:45:08 -05:00 |
|
|
Blade Barringer
|
9bcaea6fa2
|
Merge branch 'develop' into carolstone-chron-run-early-issue-4488
|
2015-09-05 09:32:24 -05:00 |
|
|
Blade Barringer
|
6fc8e0b5a5
|
Merge branch 'develop' into sabrecat/party-page
|
2015-09-05 09:20:06 -05:00 |
|
|
Blade Barringer
|
f65ca3cf48
|
Fix bug where non-party members could not send invitations
|
2015-09-05 08:02:00 -05:00 |
|
|
Alys
|
e0b57fa2c5
|
remove Show Classes Tour button from Settings page, and associated code
|
2015-09-05 17:29:27 +10:00 |
|
|
Blade Barringer
|
807e6eb7cf
|
Merge branch 'develop' into sabrecat/party-page
|
2015-09-04 19:00:48 -05:00 |
|
|
Sabe Jones
|
7637b55195
|
fix(style): Move accordion tweaks to static.styl
|
2015-09-04 17:50:01 -04:00 |
|
|
Blade Barringer
|
1eac011d0e
|
Remove padding rule
|
2015-09-04 16:46:16 -05:00 |
|
|
Blade Barringer
|
047a88cef5
|
Merge branch 'zedutchgandalf-develop' into gulp_build
|
2015-09-04 16:35:45 -05:00 |
|
|
Blade Barringer
|
f7df464ebd
|
Remove unneeded class
|
2015-09-04 16:24:10 -05:00 |
|
|
Sabe Jones
|
0a71037095
|
fix(accordion): Move jQuery to static.js
|
2015-09-04 17:19:23 -04:00 |
|