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

11345 commits

This branch
This branch
All branches
Author SHA1 Message Date
danielgrippi
e19c84b5a3 remove the monkey patch that didn't work. 2012-03-21 13:58:20 -07:00
danielgrippi
def5b81fbf MS DG; fix cukes and stuff 2012-03-21 13:50:25 -07:00
danielgrippi
0883ce1dbb fix a bunch of cukes. the disabled functionilty in rails helpers changed and we had to update out JS accordingly 2012-03-21 13:50:24 -07:00
danielgrippi
03409495f9 better patch for ActiveSupport 2012-03-21 13:50:24 -07:00
danielgrippi
9c0ed946a7 no more rspec failures; and suppress a warning with a backported 
monkeypatch
 2012-03-21 13:50:24 -07:00
danielgrippi
5c431d933f MS DG down to four failures 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
835f808e5a more progress 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
35a6f4f265 basic 3.1 upgrade... a few things are still broken. help me out and run the tests and fix them <3 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
a2aabeb599 remove ActiveSupport::SecureRandom 2012-03-21 13:49:34 -07:00
Jonne Haß
3c23364fbc refactor locale initialization and selection a bit 2012-03-21 19:25:47 +01:00
Raven24
907e19e885 don't let oembed content grow beyond stream width 2012-03-21 17:51:05 +01:00
Jonne Haß
280184c85e Merge pull request #3029 from movilla/master 
Fixed translation missing back-to-top and add traslation "Mark unread" /app/views/notifications/index.html.haml
 2012-03-21 09:49:38 -07:00
movilla
2d32595db6 Añadida traducción en castellano para comprobar 2012-03-21 15:41:53 +01:00
movilla
965c30f406 Update config/locales/diaspora/en.yml 2012-03-21 15:37:54 +01:00
movilla
bb2d474771 Add translation to "Mark unread" 2012-03-21 15:35:44 +01:00
movilla
f7a1b09639 Fixed translation missing back-to-top 2012-03-21 15:06:14 +01:00
Diaspora Europe
30af2e7188 handle users without created at date 2012-03-21 09:56:06 +01:00
Maxwell Salzberg
416b577eca I am a jerk and I told someone to take this out last night fixes #3027 2012-03-20 15:17:41 -07:00
Sean Tilley
1eaa6a25e9 Give the README some tough love. 2012-03-20 13:16:12 -05:00
Jonne Haß
dceb3253a0 updated 8 locale files [ci skip] 2012-03-20 14:00:05 +01:00
Maxwell Salzberg
ba01d3a7af some sad fixes for webmock in the facebook service spec 2012-03-19 20:07:36 -07:00
Maxwell Salzberg
79a3da11e8 Merge pull request #3026 from SuperTux88/fix-old-invite-routes 
fix legacy routes for old invite links [ci skip]
 2012-03-19 19:55:27 -07:00
Benjamin Neff
042a125f4d fix legacy routes for old invite links 2012-03-20 03:47:48 +01:00
Maxwell Salzberg
7b0c7ee4a0 make the invite flow not look totally terrible 2012-03-19 19:47:46 -07:00
Maxwell Salzberg
3cb7003361 remove the swallowing of generic messages from facebook and twitter postiing. I want to know why sometimes these things are failing 2012-03-19 19:17:46 -07:00
Maxwell Salzberg
3c83f671ac Merge branch 'Raven24-show-more' 2012-03-19 19:13:34 -07:00
Maxwell Salzberg
af008ab713 remove unused expander plugin 2012-03-19 19:13:15 -07:00
Maxwell Salzberg
2e1f353ac4 Merge branch 'show-more' of https://github.com/Raven24/diaspora into Raven24-show-more 
Conflicts:
	public/javascripts/app/views/content_view.js
 2012-03-19 19:11:57 -07:00
Maxwell Salzberg
e0c71e13de Merge pull request #3012 from Raven24/oembed-fixes 
small fixes for oembed in posts [ci skip]
 2012-03-19 19:03:26 -07:00
Jonne Haß
491d484a2e updated 28 locale files [ci skip] 2012-03-18 22:22:07 +01:00
Maxwell Salzberg
39c7478b4a Revert "freeze time in conversations show spec to make ree travis happy" 
as it did not work :/

This reverts commit d668b21cd4.
 2012-03-17 19:21:24 -07:00
Maxwell Salzberg
d668b21cd4 freeze time in conversations show spec to make ree travis happy 2012-03-17 19:06:26 -07:00
Maxwell Salzberg
aee17798c1 rearrange some of the invite link stuff. This still needs some serious love but we now place emphisis on the link, rather than the email form 2012-03-17 17:10:08 -07:00
Maxwell Salzberg
5868ff06f1 remove user inspect at the top of invites. Thx Blaine [ci skip] 2012-03-17 16:56:20 -07:00
Jonne Haß
7e7de439f8 fix untranslatable stuff from the invite refactor 2012-03-17 13:52:46 +01:00
Jonne Haß
e413a6e70a hopefully get rid of cookiejar error at travis by getting rid of diaspora-clients ruby 1.9 dependencies before bundle install. Not sure why it's only needed if DB=postgres 2012-03-17 13:05:29 +01:00
danielgrippi
4a564c0c0e Merge branch 'invite_link' 2012-03-16 17:56:59 -07:00
danielgrippi
852687b31c MS DG fix a few final tests 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
11505a386c adding a test for decremented invites, as, and check the invite is valid in the controller 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
319b3c4d3b fixed rspec tests, more fit and finish around how the invite code works, 
and improving admin functionality
 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
6b97b8044b small updates, and it looks like we are mostly working 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Florian Staudacher
27997e9525 refactored test method into helpers 2012-03-16 22:25:53 +01:00
Maxwell Salzberg
35cef7727f Merge pull request #3019 from diasp/fix-renderer 
fix will paginate renderer
 2012-03-16 11:11:48 -07:00
Diaspora Europe
d626148a83 fix will paginate renderer 2012-03-16 18:58:01 +01:00
Diaspora Europe
743e42c1e9 mobile: remove stream link from header 2012-03-16 08:38:45 +01:00
Diaspora Europe
cd62c33f17 mobile: added stream and activity links to header 2012-03-16 08:20:42 +01:00
Florian Staudacher
5dae27c170 finally some working tests for "show more" 2012-03-16 02:00:50 +01:00
Florian Staudacher
784f1ffbe1 using $ instead of jQuery ... 2012-03-15 20:15:48 +01:00
Daniel Grippi
39ee27acf0 Merge pull request #3003 from diasp/will-paginate-bootstrap 
mobile: added will paginate for bootstrap
 2012-03-15 12:09:29 -07:00