nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9331 commits 4 branches 0 tags 121 MiB
Commit graph

9331 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Hass
4e17df17fc Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-15 15:06:11 +02:00
Jonne Hass
eb20f7e2f8 updated 84 locale files [ci skip] 2011-10-15 15:06:06 +02:00
Jonne Hass
e9ce5456d6 round in statistics spec since Float#to_s has changed in 1.9.2 2011-10-15 14:30:33 +02:00
Jonne Hass
5a96c8ff49 fix require for 1.9 in statistics_spec.rb 2011-10-15 13:51:10 +02:00
Jordi Mallach
01aecabfae Update Catalan translation to 01d7b95. 2011-10-15 13:44:50 +02:00
Jonne Hass
88c6db5de4 pendingfy the other .ajax_stream? spec too for now 2011-10-15 13:17:40 +02:00
Jonne Hass
517e37b56a fix another missing translation and a cucumber feature 2011-10-15 12:59:50 +02:00
Jonne Hass
df8e5039a6 make failing spec pending for now. Btw. we have too many pending specs... 2011-10-15 12:45:35 +02:00
Jonne Hass
6606bd01b1 fix missing translation 2011-10-15 12:28:18 +02:00
Jonne Hass
1e26f5d045 Merge pull request #2175 from Pistos/postgresql-fix-fb_connected_distribution_sql 
Postgresql: Fix fb_connected_distribution_sql
 2011-10-15 03:27:57 -07:00
Maxwell Salzberg
e0ee200eb7 ajax that stream if you are not cachin' outrageous 2011-10-14 16:03:20 -07:00
Maxwell Salzberg
d4e36167f5 remove featured users for now 2011-10-14 15:59:23 -07:00
danielgrippi
ce309ebad3 update application.yml.example to reflect redis cache changes 2011-10-14 15:49:06 -07:00
Maxwell Salzberg
bcb52b35cf make soup available to everyone to see if we can get feedback 2011-10-14 14:43:51 -07:00
Maxwell Salzberg
934b47cadb lets try not ajaxing the stream because the cache is superfast 2011-10-14 14:28:46 -07:00
Maxwell Salzberg
bde5fd205c MS DG fix soup, memoize posts 2011-10-14 14:23:18 -07:00
Maxwell Salzberg
5a8024a71a MS DG; some stream refactoring; can comment now exists in base stream; default behavior is to allow you to comment on locals post, and then remote people if you are connected with them 2011-10-14 11:50:38 -07:00
Maxwell Salzberg
01d7b9507b DG MS; ajax in the soup 2011-10-14 11:17:25 -07:00
Maxwell Salzberg
14c5f1c564 MS DG; only select the ids for soup query 2011-10-14 11:08:47 -07:00
danielgrippi
0ce7f0c4bf properly scope Stream::Soup in SoupsController 2011-10-14 06:44:25 -07:00
danielgrippi
9013903b14 featured users -> community spotlight 2011-10-13 23:33:57 -07:00
Maxwell Salzberg
56dc565fc7 yeah I need to commit the files i guess 2011-10-13 22:27:07 -07:00
Maxwell Salzberg
f959ca0c12 refactor streams to be in a Stream module, hopefully they will auto-reload now 2011-10-13 22:26:15 -07:00
Maxwell Salzberg
44b0887e0a who wants a goat that fetches SOAP?!! 2011-10-13 22:26:15 -07:00
Daniel Grippi
213a1af0bc Merge pull request #2180 from Pistos/fix-oembed-spec 
Fixed aspects_controller_spec.rb
 2011-10-13 22:22:54 -07:00
Pistos
2cd004da24 Added an additional stub_request so aspects_controller_spec.rb passes under more conditions. 2011-10-13 21:56:59 -04:00
Pistos
455e59e442 Introduce #fb_connected_distribution to make statistics_spec.rb pass under PostgreSQL. 
Statistics can still be gathered the same way when MySQL is being used; no alteration there.
 2011-10-12 22:36:42 -04:00
Pistos
bc48ed16f9 Add users.sign_in_count to GROUP BY clause in #fb_connected_distribution_sql. (How did this even work without it?) 2011-10-12 22:33:46 -04:00
Daniel Grippi
cfe1506847 Merge pull request #2162 from Pistos/cucumber-postgresql-non-root 
Allow Cucumber tests to run with PostgreSQL with a non-root user.
 2011-10-12 19:15:01 -07:00
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