Dennis Collinson
|
78b0ee10da
|
bump item height for great justice.
|
2012-03-22 18:43:35 -07:00 |
|
Dennis Collinson
|
254bd9b89c
|
move padding down to post
|
2012-03-22 18:14:29 -07:00 |
|
Stephan Schulz
|
716315409a
|
Limit allowed contacts for sending messages to, to the ones that are sharing with you.
|
2012-03-23 01:21:04 +01:00 |
|
Dennis Collective
|
47dbced6d7
|
Merge pull request #3028 from diasp/fix-weekly-user-stats
Admin: handle users without created at date [ci skip]
|
2012-03-22 14:38:02 -07:00 |
|
Dennis Collective
|
f55e6fa5a1
|
Merge pull request #3039 from movilla/master
Add translation app/views/admins/correlations.haml[ci skip]
|
2012-03-22 14:37:10 -07:00 |
|
movilla
|
3b2725f133
|
Comprobación para el castellano para app/views/admins/correlations.haml
|
2012-03-22 21:57:29 +01:00 |
|
movilla
|
1c14f4bdf3
|
Update en.yml for translation app/views/admins/correlations.haml
|
2012-03-22 21:51:21 +01:00 |
|
movilla
|
5bfafd549f
|
Add translation to app/views/admins/ correlations.haml
|
2012-03-22 21:46:20 +01:00 |
|
Dennis Collective
|
a369ee6145
|
Merge pull request #3037 from movilla/master
Add translation app/views/admins/_admin_bar.haml for Admin Panel
|
2012-03-22 11:44:26 -07:00 |
|
Dennis Collective
|
cfe71f612e
|
Merge pull request #3036 from diasp/missing-template
Added status message spec, fix render nothing
|
2012-03-22 11:42:45 -07:00 |
|
Dennis Collective
|
48d2bf02b6
|
Merge pull request #3030 from Raven24/patch-1
don't let oembed content grow beyond stream width
|
2012-03-22 11:40:55 -07:00 |
|
Diaspora Europe
|
88bb3403d8
|
added 3 invalid status message specs
|
2012-03-22 17:24:30 +01:00 |
|
movilla
|
c8c708930f
|
Añadida comprobación en castellano
|
2012-03-22 17:02:51 +01:00 |
|
movilla
|
708c61bc2f
|
Upload en.yml for translation /app/views/admins/_admin_bar.haml
|
2012-03-22 17:01:12 +01:00 |
|
Diaspora Europe
|
e8933fa1da
|
added status message html and mobile spec
|
2012-03-22 16:59:14 +01:00 |
|
movilla
|
7cb577a24f
|
Add translations to /app/views/admins/_admin_bar.haml
|
2012-03-22 16:59:09 +01:00 |
|
Diaspora Europe
|
97233851df
|
added status message spec, fix render nothing
|
2012-03-22 16:52:19 +01:00 |
|
danielgrippi
|
f213500451
|
Merge branch 'update-rails'
|
2012-03-21 13:58:50 -07:00 |
|
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 |
|