Raphael Sofaer
|
14759b2c80
|
Use person_link in notifications_helper, move hovercard css out to a file
|
2011-07-12 16:21:03 -07:00 |
|
Raphael Sofaer
|
c622c08d49
|
Clarify already invited
|
2011-07-12 15:13:45 -07:00 |
|
MrZYX
|
7e84747a52
|
clean up routes.rb a bit
|
2011-07-12 16:47:04 +02:00 |
|
MrZYX
|
5934616422
|
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
|
2011-07-12 15:12:00 +02:00 |
|
MrZYX
|
8863bb2091
|
updated locales
|
2011-07-12 15:08:44 +02:00 |
|
MrZYX
|
2a15a17983
|
rails-i18n is now a gem
|
2011-07-12 15:04:48 +02:00 |
|
danielgrippi
|
2e15b6a61e
|
Likes in comments, cache counter disabled for now.
|
2011-07-11 15:00:48 -07:00 |
|
Raphael Sofaer
|
eafe6a7c85
|
Merge branch 'ajaxy-comments'
|
2011-07-11 14:05:45 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
594c9b02b1
|
A admin is now able to allow open invitations
|
2011-07-11 13:32:02 -07:00 |
|
Raphael Sofaer
|
3f555eefc4
|
Server side of ajaxy comments done, need to modify comments/_comments and make it work.
|
2011-07-11 09:11:16 -07:00 |
|
Jordi Mallach
|
676035f0c2
|
Updated Catalan translation to 97ca10d.
|
2011-07-11 15:51:36 +02:00 |
|
Raphael Sofaer
|
2fb0fce1a8
|
Nest likes and comments routes in the post route
|
2011-07-10 21:44:34 -07:00 |
|
danielgrippi
|
e09ddef361
|
DH DG; lightboxin wip
|
2011-07-10 21:08:34 -07:00 |
|
Raphael Sofaer
|
934ae80a5f
|
Take index route off until I actually make it
|
2011-07-10 20:26:38 -07:00 |
|
Raphael Sofaer
|
97ca10ddda
|
Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController
|
2011-07-10 20:06:31 -07:00 |
|
manuels
|
30b2a6fe88
|
Corrected german translation (from noun to verb for 'mention')
|
2011-07-09 07:12:04 -07:00 |
|
MrZYX
|
ed23406f57
|
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
|
2011-07-08 01:36:18 +02:00 |
|
MrZYX
|
7a7cfbf33f
|
updated locales
|
2011-07-08 01:32:57 +02:00 |
|
Jordi Mallach
|
2e67549dc7
|
Updated Catalan translation to 738487b.
|
2011-07-07 14:43:52 +02:00 |
|
Jordi Mallach
|
84072305c5
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2011-07-07 14:34:41 +02:00 |
|
danielgrippi
|
b1fc87ea30
|
add basic overview page to admin controller
|
2011-07-06 19:08:09 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
738487b381
|
moved the are you sure dialog into a translation
|
2011-07-06 16:34:51 -07:00 |
|
Jordi Mallach
|
355e29c237
|
Better messages for following.
|
2011-07-07 00:34:19 +02:00 |
|
Jordi Mallach
|
fcb3d843e5
|
Fix names and indentation of some keys. Oops.
|
2011-07-06 23:47:24 +02:00 |
|
Jordi Mallach
|
5cac35ed27
|
Updated Catalan translation to c3e477f2.
|
2011-07-06 23:47:24 +02:00 |
|
danielgrippi
|
76382b074c
|
fix jammit warnings; specs
|
2011-07-06 14:32:40 -07:00 |
|
danielgrippi
|
fd015129c4
|
final touchups to hovercard
|
2011-07-06 13:51:19 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
1c79c2c6f0
|
made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses
|
2011-07-06 12:45:16 -07:00 |
|
Dan Hansen
|
e852940382
|
HOVERCARD
|
2011-07-06 12:45:16 -07:00 |
|
Daniel Grippi
|
030e7663f4
|
Merge pull request #671 from disconn3ct/deploy-current-branch
deploy the currently checked-out branch
|
2011-07-06 10:07:44 -07:00 |
|
Dis McCarthy
|
bf4fb994f5
|
deploy the currently checked-out branch
|
2011-07-06 10:41:19 -04:00 |
|
MrZYX
|
78ba1590e5
|
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
|
2011-07-06 15:44:46 +02:00 |
|
MrZYX
|
b7e86673e8
|
updated locales
|
2011-07-06 15:41:29 +02:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
c3e477f2c5
|
Color the follow tag button
|
2011-07-05 15:03:26 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
2d8b5bd54c
|
refactored the controller, moved flash message into translations
|
2011-07-05 15:03:26 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
f0d9d318e8
|
a user can now follow and unfollow a tag
|
2011-07-05 15:03:26 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
1e4ee472b7
|
WIP you can now follow a tag, needs a clean up, and ajax love
|
2011-07-05 15:03:26 -07:00 |
|
danielgrippi
|
47aab723bd
|
fix message focus bug
|
2011-07-05 12:17:23 -07:00 |
|
Jordi Mallach
|
10f40043cc
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2011-07-05 10:28:49 +02:00 |
|
Jordi Mallach
|
99abd474c1
|
Updated Catalan translation to ecd7976.
|
2011-07-05 10:28:26 +02:00 |
|
danielgrippi
|
ecd79766ce
|
remove aspect badges
|
2011-07-04 22:36:21 -07:00 |
|
Raphael Sofaer
|
4f056dca8e
|
Ajax in likes in stream
|
2011-07-04 22:10:30 -07:00 |
|
Jordi Mallach
|
9248a34c89
|
Updated Catalan translation to 85d6eb70.
|
2011-07-05 02:06:57 +02:00 |
|
Jordi Mallach
|
035b8893c9
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2011-07-05 01:56:51 +02:00 |
|
danielgrippi
|
9debec4410
|
fix the build.
|
2011-07-04 16:53:43 -07:00 |
|
danielgrippi
|
85d6eb70e7
|
fix cubbies info page (removed reference to token, changed infographic)
|
2011-07-04 16:14:05 -07:00 |
|
Maxwell Salzberg
|
b645a77be9
|
translate a string in services#index view
|
2011-07-04 13:59:44 -07:00 |
|
Maxwell Salzberg
|
2f1118f95f
|
refactor AppConfig to guess what services are configured, and clean up the services view for a user. also, add a box so people can realize what they can connect
|
2011-07-04 13:54:05 -07:00 |
|
Jordi Mallach
|
c4c0846ed3
|
Updated Catalan translation to 9ec9055.
|
2011-07-04 19:02:20 +02:00 |
|
MrZYX
|
b8ff203af8
|
updated locales
|
2011-07-04 01:19:17 +02:00 |
|