| Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Resources/friendship/ui/LikeList.js
|
|
|
|
|
|
|
|
Conflicts:
Resources/friendship/ui/LikeList.js
|
|
middle of the screen when something's happening.
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Resources/friendship/ui/LikeList.js
|
|
|
|
|
|
apparently.
|
|
|
|
|
|
|
|
-- merged Anqi's stuff with Teddy's things
Conflicts:
Resources/friendship/ui/ApplicationWindow.js
Resources/friendship/ui/LikeList.js
|
|
|
|
|
|
|
|
non-logged-in. Display the right stuff it you're logged in already.
Note: the login window looks like shit, I wonder if there are some things we can do to pretty it up.
|
|
Put facebook stuff in config.js and LoginWindow.js. LoginWindow.js still needs to be completed. Committing so everybody gets new app structure.
Conflicts:
Resources/app.js
|
|
|
|
|
|
|