Commit graph

108 commits

Author SHA1 Message Date
Blade Barringer
475b868e67 Pin to specific bower versions 2015-08-02 21:43:27 -05:00
Blade Barringer
fb5ad3830c Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-07-05 22:06:04 -05:00
Blade Barringer
ed5afb85a5 Alphabetize dependencies in bower.json 2015-07-05 22:01:16 -05:00
Blade Barringer
1ae505eabd Adjust tags for bower; Set github link to main habitrpg org 2015-07-05 21:58:48 -05:00
Joe Gallo
bd39d378fd update or pin unregistered bower packages 2015-07-04 20:08:21 -04:00
Joe Gallo
4c70cfd8d2 simplify github repo urls in bower packages file 2015-07-04 19:20:24 -04:00
Sabe Jones
dc5b7f31d8 fix(build): Pin working zocial CSS commit 2015-07-03 18:19:39 -05:00
Matteo Pagliazzi
78cca423f0 feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP 2015-06-30 17:59:30 +02:00
Blade Barringer
e141e683ef Pin to a specific versoin of swagger ui. Closes #4688 2015-06-08 17:44:08 -05:00
Sabe Jones
676562cfad Revert "fix(emoji): move back to main jsemoji repo, fixes #4265"
This reverts commit 89b1242e53.
2015-03-10 22:05:24 -05:00
Tyler Renelle
0c63f6cb7d fix(auth): upgrade facebook to Graph API 2, fixes #4832 2015-03-10 14:11:28 -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
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
Blade Barringer
37c7bd8df1 Removed shared form package and bower 2015-01-21 11:00:27 -06:00
Tyler Renelle
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
Matteo Pagliazzi
9a087d2d90 update angular and do not send api key to loggly 2015-01-16 17:39:47 +01:00
Tyler Renelle
1c70a5bad5 upgrade angular-ui-router 2014-11-27 12:30:13 -07:00
Matteo Pagliazzi
f5d0b79573 fix(loading bar): possible fix 2014-11-26 12:38:02 +01:00
Tyler Renelle
89b1242e53 fix(emoji): move back to main jsemoji repo, fixes #4265 2014-11-25 10:22:57 -07:00
Tyler Renelle
b36c9c0fb0 fix(bootstrap): upgrade angular-ui-bootstrap 2014-11-20 19:02:46 -07:00
Tyler Renelle
5f3eef770f chore(modules): add angular-filter 2014-11-19 14:32:45 -08:00
Tyler Renelle
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
Tyler Renelle
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
Tyler Renelle
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
Tyler Renelle
f981223153 fix(sortable): revert back to jqueryUI, fixes #3946 2014-08-28 16:32:05 -06:00
Tyler Renelle
750135b673 feat(sortable): use angular-ui-sortable instead of jqueryui directly 2014-08-19 14:35:10 -06:00
Adrien Lemaire
3d2d8fbfef clean branch from develop to add audio 2014-08-08 23:03:52 +09:00
Tyler Renelle
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
Tyler Renelle
eb5d47f604 chore(angular): upgrade to angular 1.3.0-beta.11 2014-06-11 15:58:07 -06:00
Matteo Pagliazzi
f29eaab719 fix(shared): use develop branch 2014-05-11 16:55:12 +02:00
Matteo Pagliazzi
f3d15c9b91 fix(i18n): use correct branch 2014-05-06 20:16:28 +02:00
Matteo Pagliazzi
d485ea7143 fix(i18n): use habitrpg-shared branch for bower 2014-05-06 20:04:09 +02:00
Tyler Renelle
61649d1e5a fix(bower): pin ngIninfiteSroll, fix location in bower_components 2014-04-24 21:39:36 -06:00
chrisdotcode
9350b86fc8 Add missing angular-ui dependency. 2014-04-13 22:24:47 -04:00
James Hsiao
1811585165 Added pnotify in place of growl 2014-04-08 22:16:05 -04:00
Tyler Renelle
10c9595662 feat(subscriptions): convert paypal gem purchases from client-side javascriptButtons to serverside NVP 2014-03-24 20:47:18 -06:00
Tyler Renelle
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
Tyler Renelle
4620dcebb9 chore(bower): remove SHA-based dependencies from bower.json, instead
using #master. Fixes #2682
2014-02-28 22:12:15 -07:00
Matteo Pagliazzi
e0193e36c3 chore(dependencies): update jquery parh 2014-02-14 18:43:18 +01:00
Matteo Pagliazzi
8f19f225f1 fix(misc): some styles & translations 2014-02-14 18:35:21 +01:00
Tyler Renelle
a33eabf20b chore(bower): angular upgrade => 1.2.12 2014-02-13 22:50:13 -07:00
Matteo Pagliazzi
fef858d555 refactor(caching): cache emojis and remove gemoji from bower 2014-02-12 15:21:40 +01:00
Tyler Renelle
cb079977e6 feat(marketing): start fleshing out the about page with images, content,
etc. Create separate videos page
2014-02-11 00:51:29 -07:00
Matteo Pagliazzi
9ea9ed841d refactor(bs3): buyQuest fix, add back badges colors, minor fixes 2014-02-08 19:20:10 +01:00
Tyler Renelle
7fbd84afd9 chore(angular): upgrade 1.2.1 => 1.2.11 2014-02-07 22:20:26 -07:00
Matteo Pagliazzi
3d1ee31856 refactor(bs3): remove unused bootstrap-datepicker from bower 2014-02-05 20:19:09 +01:00
Matteo Pagliazzi
379da41982 refactor(bs3): port notifications 2014-02-04 20:53:09 +01:00
Matteo Pagliazzi
ff49695635 refactor(bs3): misc fixes & port death modal 2014-02-01 16:46:48 +01:00
Matteo Pagliazzi
0764aa8c17 refactor(bs3): convert icons to new format 2014-01-31 19:47:48 +01:00
Matteo Pagliazzi
9481b32b0f chore(bs3): upgrade to 3.1.0 2014-01-30 19:34:50 +01:00