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

8063 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Hass
d75ee2aa62 Merge pull request #1637 from anassahmed/991-rtl-stylesheet 
#991 RTL stylesheet for conversations
 2011-07-22 01:31:08 -07:00
Anass Ahmed
eaef931703 final commit 2011-07-22 09:34:19 +02:00
Anass Ahmed
fd4f88c8eb Merge branch '991-rtl-stylesheet' of https://github.com/anassahmed/diaspora into 991-rtl-stylesheet 2011-07-22 09:30:56 +02:00
Anass Ahmed
3c8d21fde5 Edited RTL conversations stylesheet 2011-07-22 09:20:55 +02:00
Raphael Sofaer
17774d8b3b Getting repost back to almost green. 2011-07-21 19:15:47 -07:00
Raphael Sofaer
a1bf22fe7e More work on retracting posts with reshares, one failing spec on User#retract 2011-07-21 18:23:34 -07:00
Raphael Sofaer
7382dfb7be Multi-server spec now successfully passes along a reshare 2011-07-21 18:23:33 -07:00
Raphael Sofaer
e19fb6d0f8 Use authority instead of host in order to get the port as well. 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
537766d0d7 Started working on repost integration test 2011-07-21 18:23:33 -07:00
Raphael Sofaer
70be713b15 Drop the integration databases in rebuild 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
bd1c8efe54 wip integration servers 2011-07-21 18:23:33 -07:00
danielgrippi
2d6f51f68c repost wip 2011-07-21 18:22:18 -07:00
danielgrippi
987d44c41c fixed reshare specs; all specs green 2011-07-21 18:22:18 -07:00
danielgrippi
a8400ad460 2 more specs failing. wip 2011-07-21 18:22:18 -07:00
danielgrippi
a32ef3c1d8 added xml response to the post 2011-07-21 18:22:18 -07:00
danielgrippi
bdc4b9f746 marsharing reshares now grabs the post from the original poster, also fetcheer that person if they don't exist locally still need to ping for xml and give the right xml back 2011-07-21 18:22:18 -07:00
danielgrippi
509a435cc9 moving to not including the post in the reshare xml 2011-07-21 18:22:17 -07:00
danielgrippi
7b3180e5da user can retract a reshared post 2011-07-21 18:22:17 -07:00
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 2011-07-21 18:22:17 -07:00
danielgrippi
d1bbbdbc4c fixed all specs; rebased. 2011-07-21 18:22:17 -07:00
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
Anass Ahmed
8abfe67ed4 Edited RTL conversations stylesheet 2011-07-21 15:54:18 +02:00
Jakob Kramer
cb0124f48e fixing #1602 2011-07-21 15:52:34 +02: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
Jan-Christoph Borchardt
5d998a8e93 Fix issue #1410, remove cancel button in messages conversation 2011-07-20 11:20:18 +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
Jordi Mallach
956e2ead27 Update Catalan translation to 713f4dc. 2011-07-18 12:15:42 +02:00