Gonzalo Rodriguez
00e93ba765
Fix people_controller specs
2011-10-13 00:01:05 -02:00
Gonzalo Rodriguez
2de057d210
Remove unused method
2011-10-12 23:57:16 -02:00
Gonzalo
12ddf00e16
Merge pull request #2165 from Pistos/issue-2136-wrong-aspect-button-text
...
Issue 2136 wrong aspect button text
2011-10-12 18:47:27 -07:00
Ilya Zhitomirskiy
d5d4b9d555
Merge pull request #2145 from bagilevi/fix-omniauth-rack-bug-1824
...
Fixes omniauth & rack-1.2 bug #1824
2011-10-12 16:13:51 -07:00
Daniel Grippi
238e106267
Merge pull request #2012 from Flink/deploy-resque-assets-fixed
...
Added task to capistrano to copy assets of resque-web (fixed)
2011-10-12 16:10:30 -07:00
Daniel Grippi
b7f4f81d28
Merge pull request #2148 from Pistos/issue-2007-comment-order-on-postgresql
...
Explicitly specify order of comments, since we cannot assume MySQL orderi
2011-10-12 16:09:18 -07:00
Daniel Grippi
9d393d0b59
Merge pull request #2172 from Pistos/fix-querying-spec-under-postgresql
...
Fixed "string vs. integer" spec breakage in spec/models/user/querying_spec.rb
2011-10-12 09:35:59 -07:00
Pistos
a60e74f339
Fixed "string vs. integer" spec breakage in spec/models/user/querying_spec.rb .
2011-10-12 11:37:01 -04:00
Pistos
1c543e3bea
Fixed the issue without breaking the aspects dropdown on the [other] user profile page.
2011-10-12 09:51:30 -04:00
Gonzalo Rodriguez
6849c3604b
Keep searched tag in the search field. Closes #1983 .
2011-10-12 04:10:26 -02:00
Gonzalo Rodriguez
f0b219f474
More simple tags_stream title. Was insane when following a lot of tags :D
2011-10-12 03:39:27 -02:00
Gonzalo Rodriguez
27d9e7a8c6
Remove this, since selected aspects are now handled in the session hash
...
Not only this code is unnecessary with the new way selected
aspects are stored, also on some edge cases could confuse the user
for example when having two tabs opened and hitting refresh in one
of them. Expecting selected aspects, but the "a_ids[]"-like url could
instead set the new group of selected aspects.
2011-10-12 02:58:42 -02:00
Pistos
e013e4103f
Corrected English for button text when no aspects are selected in publisher.
2011-10-11 23:44:41 -04:00
Pistos
cc1fea92e6
Whitespace cleanup.
2011-10-11 23:44:28 -04:00
Gonzalo Rodriguez
f655b12e98
Refactor display setup for De/select_all aspects link
2011-10-12 00:06:25 -02:00
Gonzalo Rodriguez
c694b4aa4e
Oops, remove only boldness, keep dark color of aspect selectors
2011-10-12 00:01:38 -02:00
Ilya Zhitomirskiy
8cd5fef1a6
one more csv generator option
2011-10-11 18:57:02 -07:00
danielgrippi
94e6120714
fixed all cukes except features/closes_account_feature:21
2011-10-11 18:01:39 -07:00
Maxwell Salzberg
cd2647c029
Merge branch 'manuels-oembed'
2011-10-11 16:54:56 -07:00
Maxwell Salzberg
9fd1d7db63
updating gemfile and schema.rb
2011-10-11 16:53:37 -07:00
Maxwell Salzberg
8acd9acb08
tests moved and passing
2011-10-11 16:12:32 -07:00
Maxwell Salzberg
cfb28db00f
wip, but the refactored code works
2011-10-11 16:12:32 -07:00
Maxwell Salzberg
139ddd726a
wip oembed refactor. still need to make a oembed_helper, and move some tests to their new home, but e but we are looking preeeetttttyyyy good.
2011-10-11 16:10:14 -07:00
Maxwell Salzberg
963d5c1a69
wip
2011-10-11 16:10:14 -07:00
Maxwell Salzberg
b334a048bf
merged
2011-10-11 16:09:26 -07:00
Manuel Schölling
3561021a90
Added cucumber tests for oEmbed feature
2011-10-11 16:09:16 -07:00
Manuel Schölling
f3ea8f424f
Added oEmbed support
2011-10-11 16:08:47 -07:00
Gonzalo Rodriguez
b973b66890
Remove boldness from aspect selectors
2011-10-11 20:51:58 -02:00
Ilya Zhitomirskiy
fa44ff6931
added query
2011-10-11 15:46:13 -07:00
Ilya Zhitomirskiy
496dae1607
Merge pull request #2163 from Pistos/postgresql-statistics
...
Postgresql statistics
2011-10-11 15:33:54 -07:00
Pistos
ed9328450a
Make statistics work under PostgreSQL.
2011-10-11 17:48:57 -04:00
Pistos
76ab5b2efb
Whitespace cleanup.
2011-10-11 17:48:33 -04:00
Pistos
15b3cce6ee
Refactored ordering of post comments; moved it down to model level for greater reach (DRYer code).
...
Leaving the #order call in #last_three_comments caused the generated SQL to
have two conflicting ORDER BY components, which caused the query to return
invalid results. I removed the problem by removing #last_three_comments which
I consider a premature optimization.
2011-10-11 16:06:24 -04:00
Pistos
4774b670de
Whitespace cleanup.
2011-10-11 15:50:40 -04:00
Ilya Zhitomirskiy
86e52b0799
remove statstample; made our own correlation function
2011-10-11 12:03:35 -07:00
Ilya Zhitomirskiy
6a5f448853
added comment count correlation
2011-10-11 11:31:46 -07:00
Ilya Zhitomirskiy
5f324f73a0
remove correlation for tags_followed due to missing index
2011-10-11 11:18:42 -07:00
Ilya Zhitomirskiy
7becb0ac0e
added require in admins controller
2011-10-11 11:05:32 -07:00
Ilya Zhitomirskiy
df62b29f3c
Merge branch 'stats'
2011-10-11 10:57:48 -07:00
Ilya Zhitomirskiy
7fb26c4390
dg iz limiting to one month, added contacts sharing with count
2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy
288d20b6e8
correlations on the admins page
2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy
4c9b45b9c8
WIP
2011-10-11 10:57:26 -07:00
danielgrippi
818167c565
DG IZ; wip
2011-10-11 10:57:26 -07:00
Your Name
dcb4903711
use tag name instead of its id for pagination
2011-10-11 10:42:46 -07:00
danielgrippi
f472bfa661
fix notification dropdown positioning
2011-10-11 10:20:46 -07:00
Daniel Grippi
aba29ea479
Merge pull request #2156 from manuels/new_lines
...
[PaperCut] Allow new lines (<br>)
2011-10-11 09:44:52 -07:00
Daniel Grippi
eb19bc9a78
Merge pull request #2111 from vcuculo/fix-mobile-select
...
Fix #2091 - Aspects selection on mobile
2011-10-11 09:29:45 -07:00
danielgrippi
a2b79d0338
touch up header
2011-10-11 08:00:36 -07:00
Jonne Hass
8bc67f983c
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-10-11 14:07:31 +02:00
Jonne Hass
6ff2bdd300
updated locales and added sq, uk and en_1337
2011-10-11 13:03:11 +02:00
