2aa3a3175f
Merge branch 'develop' into kelsin-develop
2016-04-27 19:11:56 -05:00
a326873935
chore: Add emoji lib back in
...
The 3rd party chat extension was breaking because this library was
missing. Remove this after the chat extension is updated
https://github.com/Horacious/HabitRPG-Chat-Extension/pull/40
2016-04-26 23:07:15 -05:00
e88d0ff450
feat: switch to version number for habitica-markdown
2016-04-26 12:52:59 -05:00
e7315253dd
feat: Switch out js-emoji for habtiica-markdown
2016-04-26 08:19:47 -05:00
ad57dedecb
refactor: Swap out remarkable for habitica flavored markdown-it
2016-04-25 07:36:02 -05:00
867146dc19
fix(xss): Update site to use remarkable instead of marked
...
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
2016-04-21 13:23:53 -05:00
47688bfed5
Moving to a specific commit of smart-app-banner
2016-02-22 22:57:37 -08:00
896773f9ef
Adding android app banners
...
Fixes #6692
2016-02-20 11:56:39 -08:00
475b868e67
Pin to specific bower versions
2015-08-02 21:43:27 -05:00
fb5ad3830c
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-07-05 22:06:04 -05:00
ed5afb85a5
Alphabetize dependencies in bower.json
2015-07-05 22:01:16 -05:00
1ae505eabd
Adjust tags for bower; Set github link to main habitrpg org
2015-07-05 21:58:48 -05:00
bd39d378fd
update or pin unregistered bower packages
2015-07-04 20:08:21 -04:00
4c70cfd8d2
simplify github repo urls in bower packages file
2015-07-04 19:20:24 -04:00
dc5b7f31d8
fix(build): Pin working zocial CSS commit
2015-07-03 18:19:39 -05:00
78cca423f0
feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP
2015-06-30 17:59:30 +02:00
e141e683ef
Pin to a specific versoin of swagger ui. Closes #4688
2015-06-08 17:44:08 -05:00
676562cfad
Revert "fix(emoji): move back to main jsemoji repo, fixes #4265 "
...
This reverts commit 89b1242e53
2015-03-10 22:05:24 -05:00
0c63f6cb7d
fix(auth): upgrade facebook to Graph API 2, fixes #4832
2015-03-10 14:11:28 -06:00
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
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
37c7bd8df1
Removed shared form package and bower
2015-01-21 11:00:27 -06:00
a053486fcd
fix(avatar-sharing): angular@1.3.9 upgrade fixed the /#?memberId=x
...
bug. Also, anon wasn't able to view avatar shares!
2015-01-18 14:51:40 -07:00
9a087d2d90
update angular and do not send api key to loggly
2015-01-16 17:39:47 +01:00
1c70a5bad5
upgrade angular-ui-router
2014-11-27 12:30:13 -07:00
f5d0b79573
fix(loading bar): possible fix
2014-11-26 12:38:02 +01:00
89b1242e53
fix(emoji): move back to main jsemoji repo, fixes #4265
2014-11-25 10:22:57 -07:00
b36c9c0fb0
fix(bootstrap): upgrade angular-ui-bootstrap
2014-11-20 19:02:46 -07:00
5f3eef770f
chore(modules): add angular-filter
2014-11-19 14:32:45 -08:00
2023cf852e
chore(bower): upgrade angular to 1.3.3. Remove
...
bindonce (incompatible). Note, bindonce="..." attrs still need to be
converted to their {{::}} equiv for better performance, but this is
functional for now
2014-11-19 14:32:45 -08:00
6304dd2e15
feat(auth): move to hello.js for social auth, paves the way for multiple
...
connectors. Prettier buttons via zocial
2014-11-06 14:45:06 -07:00
8651f0da25
fix(facebook): move from passport-facebook to Facebook JS SDK. Better
...
security on FB login by validating accessToken. Create user from FB
profile if none exists, allows 3rd-party apps to. Fixes #4221
2014-11-05 18:23:10 -07:00
f981223153
fix(sortable): revert back to jqueryUI, fixes #3946
2014-08-28 16:32:05 -06:00
750135b673
feat(sortable): use angular-ui-sortable instead of jqueryui directly
2014-08-19 14:35:10 -06:00
3d2d8fbfef
clean branch from develop to add audio
2014-08-08 23:03:52 +09:00
745d330ce7
fix(bower): pin angular @beta-11, that ~ was upgrading to beta-17 which
...
doesn't play well with jQuery right now
2014-07-31 16:28:40 -06:00
eb5d47f604
chore(angular): upgrade to angular 1.3.0-beta.11
2014-06-11 15:58:07 -06:00
f29eaab719
fix(shared): use develop branch
2014-05-11 16:55:12 +02:00
f3d15c9b91
fix(i18n): use correct branch
2014-05-06 20:16:28 +02:00
d485ea7143
fix(i18n): use habitrpg-shared branch for bower
2014-05-06 20:04:09 +02:00
61649d1e5a
fix(bower): pin ngIninfiteSroll, fix location in bower_components
2014-04-24 21:39:36 -06:00
9350b86fc8
Add missing angular-ui dependency.
2014-04-13 22:24:47 -04:00
1811585165
Added pnotify in place of growl
2014-04-08 22:16:05 -04:00
10c9595662
feat(subscriptions): convert paypal gem purchases from client-side javascriptButtons to serverside NVP
2014-03-24 20:47:18 -06:00
2209bd5a0c
chore(bower): back to angular-ui-router SHA, I'll explain on GH for this commit
2014-02-28 23:48:20 -07:00
4620dcebb9
chore(bower): remove SHA-based dependencies from bower.json, instead
...
using #master. Fixes #2682
2014-02-28 22:12:15 -07:00
e0193e36c3
chore(dependencies): update jquery parh
2014-02-14 18:43:18 +01:00
8f19f225f1
fix(misc): some styles & translations
2014-02-14 18:35:21 +01:00
a33eabf20b
chore(bower): angular upgrade => 1.2.12
2014-02-13 22:50:13 -07:00
fef858d555
refactor(caching): cache emojis and remove gemoji from bower
2014-02-12 15:21:40 +01:00
Blade Barringer