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

7934 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ilya Zhitomirskiy
ce94779766 not showing the reshare button to the users on things they can't reshare 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f wip removed some generated specs 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
06f886ad77 WIP reshare 2011-07-21 18:22:17 -07:00
Raphael Sofaer
bf59bf1c72 Delete old jqueries 2011-07-21 18:13:49 -07:00
Raphael Sofaer
e2bdd54dd8 Undo part of the refactor so that StatusMessage validations work. 2011-07-21 17:56:53 -07:00
Raphael Sofaer
caf26a5c64 Upgrade rails.js, add CSRF token manually in the photo uploader. 2011-07-21 17:49:33 -07:00
Raphael Sofaer
20de3a5622 Refactor StatusMessagesController#create, move the photo dispatching into an after_dispatch hook 2011-07-21 16:30:00 -07:00
Raphael Sofaer
a58a06a010 Fix youtube embedder, scale it down into the stream 2011-07-21 15:18:09 -07:00
Raphael Sofaer
ae29e2478a Merge branch 'upgrade_rails' 2011-07-21 14:51:26 -07:00
Maxwell Salzberg
09a43418ef dont try to fix vanna max\! 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
ad8ccbbeb9 added test for admin inviter 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
757c9169fc updated gemfile 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
9ac88a8c39 update gemfile 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
0cc018dd6b i think this works. there is some weird stuff in vannacontroller, but that might have always been there 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
eee2225f04 rspec is green 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
df62f58156 fixed the safe_buffer issues 2011-07-21 14:32:09 -07:00
Raphael Sofaer
1ba49caeca Fix like socketing to use GUIDs 2011-07-21 13:59:02 -07:00
Raphael Sofaer
8eea37cbdb Fix people socketing 2011-07-21 13:41:46 -07:00
Raphael Sofaer
333e56b4d9 Fix post socketing 2011-07-21 13:26:48 -07:00
Raphael Sofaer
a5fd01cc09 Fix comment socketing 2011-07-21 13:21:48 -07:00
Raphael Sofaer
4de2ca9958 Get websocket pushing posts 2011-07-21 13:21:48 -07:00
Jonne Hass
f3b7cf1391 Merge pull request #1623 from anassahmed/master 
Fix Issue #991: RTL SASS Stylesheet
 2011-07-21 03:03:43 -07:00
Anass Ahmed
d650845161 Edited RTL CSS SASS style sheet 2011-07-21 04:42:20 +02:00
Raphael Sofaer
e5c8ebf6e2 Add cucumber feature for changing email address 2011-07-19 11:43:24 -07:00
Raphael Sofaer
b01ffb4489 We don't use perform_delegate anymore 2011-07-19 10:55:23 -07:00
Raphael Sofaer
9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
 2011-07-19 10:44:00 -07:00
Raphael Sofaer
9789d1d6cb Fix issue #1579, like.target, not like.post 2011-07-17 21:18:21 -04:00
Raphael Sofaer
d30228abb8 Merge remote branch 'untitaker/1589-remove-unicode-smileys' 2011-07-17 21:12:20 -04:00
Dan Hansen
6a11784a2e Rewrote ContactsController#index, thoughts? 2011-07-17 15:44:07 -07:00
Jonne Hass
7ad80bb358 Merge pull request #1609 from ticho/master 
Fix for issue #1600: Missing string for translation ("Recent notifications")
 2011-07-17 08:16:41 -07:00
Andrej Kacian
713f4dcc9d Fix for issue #1600: Missing string for translation ("Recent notifications") 2011-07-17 17:04:51 +02:00
Markus Unterwaditzer
d4257f4a68 Removed unicode smileys, #1589 2011-07-17 10:45:06 +02:00
danielgrippi
22fdf7f895 fix 500 on posts show on mobile 2011-07-15 22:37:21 -07:00
danielgrippi
39da9302a1 Revert "deleted unused file". sorry!! :( 
This reverts commit a6f2f82c5e.
 2011-07-15 22:33:55 -07:00
danielgrippi
a6f2f82c5e deleted unused file 2011-07-15 21:44:12 -07:00
danielgrippi
12cb51d194 take ':' out of translation 2011-07-15 21:32:01 -07:00
danielgrippi
c4b715f3ff fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews 2011-07-15 21:22:29 -07:00
Jonne Hass
8cfd2e02e1 Merge pull request #1583 from Gallaecio/master 
Update of Galician (gl) translation
 2011-07-15 15:28:42 -07:00
Raphael Sofaer
fb492b2b62 Shorter backtrace in the SQL logs 2011-07-15 15:28:05 -07:00
Raphael Sofaer
5d64611f2b Include profile in contactsController index for the publisher 2011-07-15 14:49:35 -07:00
Raphael Sofaer
f60a748c21 Ajax in the contacts for mentioning after page load 2011-07-15 14:23:44 -04:00
Adrián Chaves Fernández (Gallaecio)
bd8bedc22a Had forgotten to use the right string delimiters (not needed, but hey, I want to do things right\!). 2011-07-15 12:05:07 +02:00
Adrián Chaves Fernández (Gallaecio)
282f68e624 Review of Galician (gl) translation of Diaspora finished. 2011-07-15 11:59:47 +02:00
Adrián Chaves Fernández (Gallaecio)
92b06323d3 Added correct string delimiters to the last strings of ‘diaspora/gl.yml’ file. 2011-07-15 11:55:53 +02:00
Adrián Chaves Fernández (Gallaecio)
80b72a9213 Minor (translation) fix for a string, the one related to the “time ago”. 2011-07-15 11:48:08 +02:00
Adrián Chaves Fernández (Gallaecio)
db22c60578 Minor (translation) fix for a string, the one related to the “time ago”. 2011-07-15 11:44:50 +02:00
Adrián Chaves Fernández (Gallaecio)
effd951f58 Finished the review of the Galician (gl) translation of ‘diaspora/(lang).yml’ file. 2011-07-15 11:40:55 +02:00
Raphael Sofaer
37e939d476 Use activerecord-import in ReceiveLocalBatch. The default behavior of it is to do an On Duplicate Key Update updated_at = Time.now, but we have a test for that case anyway. 2011-07-14 21:27:16 -07:00
Sarah Mei
088e2dfdb4 Maybe...we're not waiting long enough on CI? It is a very slow box. 2011-07-14 19:09:14 -07:00
Sarah Mei
6974b205a1 CI's cucumber output is once again a blessed field of dots. 2011-07-14 18:44:59 -07:00