Gonzalo Rodriguez
|
d3a5bc1fb8
|
Merge branch 'master' into aspect_nav_rework
|
2011-10-01 03:58:50 -03:00 |
|
Maxwell Salzberg
|
5348c72209
|
add sqlite method; fix chubbies cukes
|
2011-09-30 14:27:54 -07:00 |
|
Paul Spieker
|
0c12471feb
|
add username blacklist
|
2011-09-30 14:17:04 +02:00 |
|
Maxwell Salzberg
|
b27a8dd330
|
fix up info sidebar"
|
2011-09-29 12:51:00 -07:00 |
|
danielgrippi
|
6b73527379
|
vcuculo's fixes (flattened mobile.scss into mobile boilerplate's css instead of just flipping the load order)
|
2011-09-29 10:19:03 -07:00 |
|
Jonne Hass
|
68f15a8a34
|
fix ca.yml
|
2011-09-29 14:37:10 +02:00 |
|
Jonne Hass
|
a6977c55a2
|
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
|
2011-09-29 14:35:12 +02:00 |
|
Jonne Hass
|
710f241b42
|
updated 21 locale files [ci skip]
|
2011-09-29 14:34:17 +02:00 |
|
Ilya Zhitomirskiy
|
1fe9de328b
|
removing newrelic resque for now
|
2011-09-28 18:47:42 -07:00 |
|
Ilya Zhitomirskiy
|
1da0bf5d95
|
changed the load order for newrelic
|
2011-09-28 18:34:56 -07:00 |
|
Ilya Zhitomirskiy
|
95c8986b8e
|
added new relic resque support
|
2011-09-28 17:53:29 -07:00 |
|
Gonzalo Rodriguez
|
74d00d7db4
|
Merge branch 'master' into aspect_nav_rework
|
2011-09-28 19:52:15 -03:00 |
|
Jordi Mallach
|
2e86e9ece7
|
Fix a variable and add missing ellipsis.
|
2011-09-28 21:18:52 +02:00 |
|
Jordi Mallach
|
b712586ca3
|
Updated Catalan translation to d2d205e.
|
2011-09-28 21:11:10 +02:00 |
|
danielgrippi
|
d2d205ee08
|
make autoexpand work
|
2011-09-28 11:21:14 -07:00 |
|
danielgrippi
|
64113eb8f2
|
increment counter on comment add
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
ea357a96ef
|
expand&collapse comments; added comment form (wip)
|
2011-09-27 21:09:27 -07:00 |
|
danielgrippi
|
f2f14c2894
|
fixed ajax for likes
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
645af37358
|
more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
00e561dd01
|
comments -> reactions
|
2011-09-27 21:09:26 -07:00 |
|
danielgrippi
|
8c586c4567
|
added html5 boilerplate meta tags to mobile; stripped functionality to add back
|
2011-09-27 21:09:25 -07:00 |
|
Gonzalo Rodriguez
|
372a472fbf
|
Empty aspect stream when no aspect selected on the left nav
|
2011-09-27 23:46:02 -03:00 |
|
Gonzalo Rodriguez
|
e0ffd7c63e
|
Merge branch 'master' into aspect_nav_rework
Conflicts:
features/posts_from_main_page.feature
public/javascripts/aspect-filters.js
spec/javascripts/aspect-filters-spec.js
|
2011-09-27 00:08:05 -03:00 |
|
Ilya Zhitomirskiy
|
f9172c8733
|
added aspect dropdown to the getting started page, renamed the button to be add contact
|
2011-09-26 17:32:37 -07:00 |
|
Ilya Zhitomirskiy
|
675908a57d
|
added an expanation of what connecting services does(getting started), also indicate services whick are connected connected services
|
2011-09-26 16:04:25 -07:00 |
|
Ilya Zhitomirskiy
|
afd1913de4
|
added a link to resque-web from admin page
|
2011-09-26 10:25:29 -07:00 |
|
danielgrippi
|
131166841a
|
added logged out page referencing mobile
|
2011-09-25 11:58:44 -07:00 |
|
Maxwell Salzberg
|
95ad709324
|
change that profile url to something I like slightly better
|
2011-09-24 23:44:21 -07:00 |
|
Maxwell Salzberg
|
049eb74ab2
|
added route to grab users profile picture if you know their username
|
2011-09-24 23:33:14 -07:00 |
|
Jonne Hass
|
6ffcec0885
|
updated 53 locale files [ci skip]
|
2011-09-24 21:08:18 +02:00 |
|
Ilya Zhitomirskiy
|
461cb22109
|
in the getting started featured tags are now followable
|
2011-09-23 17:06:21 -07:00 |
|
Ilya Zhitomirskiy
|
494ab8b13b
|
added community welcome and a non-mandatory wording
|
2011-09-23 14:56:33 -07:00 |
|
Raphael Sofaer
|
2e96f0121e
|
simplify multi-server spec running with foreman. couldn't really get it automated tonight, not sure why.
|
2011-09-22 00:24:01 -04:00 |
|
Ilya Zhitomirskiy
|
f8c05851f6
|
added an email link to the right section
|
2011-09-21 14:40:59 -07:00 |
|
Ilya Zhitomirskiy
|
4fb62afa2d
|
getting stated links open in new tabs, translated a string
|
2011-09-21 14:12:37 -07:00 |
|
Ilya Zhitomirskiy
|
c98f2d1664
|
added a weekly user stat for admin
|
2011-09-21 13:23:09 -07:00 |
|
Sarah Mei
|
346e1f1c87
|
SPELL CHECK PLZ.
|
2011-09-20 21:56:17 -07:00 |
|
Maxwell Salzberg
|
8187fb9ddb
|
clean up and move help widget up the page
|
2011-09-20 10:05:39 -07:00 |
|
Jonne Hass
|
70c2fda2ca
|
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
|
2011-09-20 18:42:56 +02:00 |
|
Sarah Mei
|
3a9d8f0f38
|
ARRRGGGHH *twitch* *twitch*
|
2011-09-19 22:00:00 -07:00 |
|
Ilya Zhitomirskiy
|
352be4d0c0
|
added the have support section and reworded the donation section to be clearer
|
2011-09-19 15:29:19 -07:00 |
|
Jonne Hass
|
473642234d
|
updated locales and pulled in NN
|
2011-09-19 15:36:12 +02:00 |
|
Jordi Mallach
|
ff5919f43f
|
Change "Click this link" to "Follow this link".
As discussed with @rsofaer in 9797e04957,
"follow" is more device-neutral, better for mobile browser users.
|
2011-09-18 22:46:31 +02:00 |
|
Jordi Mallach
|
d006ca9850
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2011-09-18 03:21:57 +02:00 |
|
Jonne Hass
|
661d5d3bbc
|
pull in ur-PK
|
2011-09-18 00:56:04 +02:00 |
|
Jordi Mallach
|
98aa2a0196
|
Update Catalan translation to 91e6499.
|
2011-09-17 21:50:37 +02:00 |
|
Jordi Mallach
|
021f704de7
|
Add trailing dot.
|
2011-09-17 21:47:57 +02:00 |
|
Jonne Hass
|
d498110b3d
|
updated 117 locale files [ci skip]
|
2011-09-17 17:32:01 +02:00 |
|
Maxwell Salzberg
|
bc1aef4999
|
MS IZ start to implement followed tags in the stream
|
2011-09-16 18:19:34 -07:00 |
|
Maxwell Salzberg
|
17b5e7b066
|
move admin rack to its own file
|
2011-09-16 13:33:05 -07:00 |
|