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

10348 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maxwell Salzberg
2cbfe75686 make this spec WIP, as there is a larger problem with hidden posts that is addressed in teh hidden posts branch that is soon to be merged in 2012-01-13 13:34:32 -08:00
Jonne Haß
0cc0b152d7 do not call .photo_count on a reshare etc. 2012-01-13 22:09:22 +01:00
Jonne Haß
e1edef9ff1 lets see how all this markdown in the title looks. Attempt to fix #2395 2012-01-13 22:09:22 +01:00
danielgrippi
aed413b463 remove unused method and controller action (move_contact) 2012-01-13 12:15:32 -08:00
Sarah Mei
e4f4f06404 Terminology clean up - remove references to Diaspora Handle, make capitalization of Diaspora ID consistent. 2012-01-13 11:24:27 -08:00
Jonne Haß
e96dd58cff Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-01-13 19:32:51 +01:00
Jonne Haß
e5663126d9 updated 80 locale files [ci skip] 2012-01-13 19:32:42 +01:00
Dennis Collective
878f258981 Updating our reference to issue tracker in the readme 2012-01-12 21:13:23 -08:00
Dennis Collinson
adc0a0b244 don't display iteration of templates 2012-01-12 20:44:55 -08:00
Dennis Collinson
9b8afba9cf metaprogram template addition 2012-01-12 19:41:39 -08:00
Dennis Collinson
dec3006b50 DH DC don't render feedback view on public posts 2012-01-12 17:47:03 -08:00
Dennis Collinson
33772a27d9 cleanup alert spec 2012-01-12 17:47:03 -08:00
Dennis Collinson
7b1d7b8ac9 small refactor 2012-01-12 17:47:02 -08:00
Maxwell Salzberg
ee6fc18703 fix oembed specs by allowing ; in auto link on client side" 2012-01-12 17:25:01 -08:00
Maxwell Salzberg
258d55df51 fully reset app_config spec to prevent test polution 2012-01-12 16:11:41 -08:00
Maxwell Salzberg
f44cb8fe2e added order default to default rspec run [ci skip] 2012-01-12 15:05:02 -08:00
Maxwell Salzberg
408bafca09 add/refactor normalize_pod_services so configured services is always defined regardless if SERVICES are set up 2012-01-12 15:04:14 -08:00
Maxwell Salzberg
2757cbb149 fix ssl problem with donate link 2012-01-12 14:49:54 -08:00
Sarah Mei
dcba59043d Related to #2020 - add note to script/server header telling people to use foreman instead for development 2012-01-12 06:29:29 -08:00
Maxwell Salzberg
f937804bb8 tell travis to run rspec files in a random order 2012-01-11 19:17:07 -08:00
Daniel Grippi
de29fd5e02 Merge pull request #2637 from CodeBlock/2598-backbone-back-button 
Fix #2598 (back button issue) by having jQuery force the browser to not cache JSON responses... [ci skip]
 2012-01-11 18:13:07 -08:00
danielgrippi
1efce2cede Revert "Merge pull request #2547 from stwf/unread_notifications" 
This reverts commit c61e84bc50, reversing
changes made to b88899ff2a.
 2012-01-11 12:11:00 -08:00
Ricky Elrod
5626948b3f Fix #2598 by having jQuery force the browser to not cache JSON responses. 2012-01-11 13:10:10 -05:00
danielgrippi
ad78e79ddd updated some gems 2012-01-11 02:40:51 -08:00
danielgrippi
953eb1db95 we can now use an up-to-date json gem now that chef is gone [ci skip] 2012-01-11 02:31:21 -08:00
Daniel Grippi
c47ebd5a18 Merge pull request #2632 from torrancew/remove_chef 
Remove chef
 2012-01-11 02:30:02 -08:00
danielgrippi
bee8aa8bcd remove unused files/methods 2012-01-11 02:26:12 -08:00
Tray Torrance
4df6b65dad Remove chef 2012-01-10 21:56:24 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
danielgrippi
2243778c17 add services to be sent to the controller via the Publisher view [ci skip] 2012-01-10 11:36:11 -08:00
danielgrippi
6ee257795f hella sod, yo [ci skip] 2012-01-10 10:57:13 -08:00
Daniel Grippi
c61e84bc50 Merge pull request #2547 from stwf/unread_notifications 
Allow users to click on read notifications to mark them as unread
 2012-01-10 10:46:26 -08:00
Daniel Grippi
b88899ff2a Merge pull request #2624 from CodeBlock/login-page-title 
Add the project name to the title of the Devise login page.
 2012-01-10 10:44:41 -08:00
Daniel Grippi
701ce3ebbf Merge pull request #2620 from jbivins/2610-ie9-backbone-fix-2 
Fixes #2610 (attempt 2).
 2012-01-10 10:43:19 -08:00
Jamie Wilkinson
743c898127 Merge pull request #2625 from torrancew/heroku_config_fix 
heroku:install_requirements task fails on default heroku apps
 2012-01-10 08:53:09 -08:00
Ricky Elrod
4556323bda Add the project name to the title of the Devise login page, so that 
applications that require a unique name in the window title (like
KeePassX) can use auto fill, etc.
 2012-01-10 11:23:13 -05:00
Joe Bivins
cb18f204ef Fixes #2610 (attempt 2). 
Works-around the IE 9 login problem without modifying vendor/backbone.js.

Tested with IE 9.0.4.
 2012-01-10 01:59:42 -05:00
Dennis Collective
d0e3d19902 Throwing dev warning note at the top of the README 2012-01-09 22:47:40 -08:00
Steven Fuchs
176797628e javascript tests for the notification click callback routine. 2012-01-10 00:07:42 -05:00
Tray Torrance
def764f29f Remove logging:basic before adding logging:expanded 2012-01-09 19:26:33 -08:00
danielgrippi
779de03111 added alpha mark to asterisk in the header 2012-01-09 16:43:24 -08:00
Jamie Wilkinson
c152ecf5a7 Fix typo in 'rake heroku:install_requirements' 2012-01-09 16:38:55 -08:00
Daniel Grippi
d8c844714c Merge pull request #2612 from torrancew/heroku_config_fix 
No longer skip false values; quote values so that whitespace is valid.
 2012-01-09 12:23:56 -08:00
Jordi Mallach
e898e2d03f Updated Catalan translation to c11fdb0. 2012-01-09 19:20:38 +01:00
Jordi Mallach
42dc12988a Updated Catalan translation to 1b8f78e. 2012-01-09 18:55:54 +01:00
danielgrippi
c11fdb0459 put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip] 2012-01-08 23:43:17 -08:00
Tray Torrance
a35612410f No longer skip false values; quote values so that whitespace is valid. 2012-01-08 23:21:21 -08:00
Daniel Grippi
46cffe3b61 Merge pull request #2602 from judytuna/master 
fixed issue 1991 - giving long pre & code a scrollbar [ci skip]
 2012-01-08 21:47:36 -08:00
Daniel Grippi
84e47ba159 Merge pull request #2601 from Raven24/fix-2567-2 
this fixes #2567
 2012-01-08 20:23:34 -08:00
Daniel Grippi
bdc9421bc5 Merge pull request #2549 from lprelle/no_stream_redirect_from_settings 
No stream redirection from settings
 2012-01-08 20:22:53 -08:00