Maxwell Salzberg
|
2e64d004f8
|
Merge pull request #3050 from justindthomas/fix-resque
Add Resque.before_fork to correct critical problem for PostgreSQL
|
2012-03-25 15:02:04 -07:00 |
|
Justin Thomas
|
22ac1d96a6
|
Add Resque.after_fork to correct problem with database connections and remove resque-ensure-connected
|
2012-03-25 14:39:42 -07:00 |
|
Maxwell Salzberg
|
95012f45af
|
Merge pull request #3052 from Raven24/fix-umlauts-fix-webkit
fix broken markdown links in webkit-browsers [ci skip]
|
2012-03-24 14:26:33 -07:00 |
|
Florian Staudacher
|
f3a7385eca
|
webkit apparently uses 'undefined' instead of "" for non-matches
|
2012-03-24 21:27:39 +01:00 |
|
Maxwell Salzberg
|
a0d6df6afa
|
Merge pull request #3047 from Raven24/fix-umlauts-2665
allow umlauts and other non-ascii characters in markdown urls
|
2012-03-24 09:04:59 -07:00 |
|
Maxwell Salzberg
|
9e56c42328
|
Merge pull request #3049 from vcuculo/fix-spinner-path
Fix spinner path [ci skip]
|
2012-03-24 09:03:39 -07:00 |
|
Vittorio Cuculo
|
d02ecacb26
|
fix spinner path
|
2012-03-24 12:52:35 +01:00 |
|
Florian Staudacher
|
49801644cc
|
also handle images and links without sub-domain
|
2012-03-24 02:57:32 +01:00 |
|
Florian Staudacher
|
c5139c9a71
|
improve behaviour, add more tests
|
2012-03-24 01:51:41 +01:00 |
|
Florian Staudacher
|
b7b8a11551
|
fix #2665 - allow umlauts and other non-ascii characters in url
|
2012-03-24 00:10:36 +01:00 |
|
Maxwell Salzberg
|
4006c1502e
|
Merge pull request #3013 from diasp/mobile-header
Mobile: added activity link to header
|
2012-03-23 11:05:01 -07:00 |
|
Maxwell Salzberg
|
34f3aa21e8
|
Merge pull request #3040 from s-f-s/limit_allowed_contacts_for_sending_messages
Limit allowed contacts for sending messages to
|
2012-03-23 11:03:08 -07:00 |
|
Jonne Haß
|
f847308d79
|
Merge pull request #3045 from shavit/rtl_posting_fix
Rtl posting fix
|
2012-03-23 08:36:10 -07:00 |
|
=
|
2e6355d780
|
rtl statuses
|
2012-03-23 16:33:10 +02:00 |
|
=
|
46efb7237c
|
rtl in textarea
|
2012-03-23 16:23:13 +02:00 |
|
=
|
a5a1594049
|
rtl style
|
2012-03-23 16:22:27 +02:00 |
|
=
|
a631cee005
|
rtl
|
2012-03-23 16:20:06 +02:00 |
|
Jonne Haß
|
37d4f97764
|
updated 22 locale files [ci skip]
|
2012-03-23 13:26:16 +01:00 |
|
Maxwell Salzberg
|
5517eb45e6
|
omg remove ugly boarder from css3 spinner
|
2012-03-22 18:54:26 -07:00 |
|
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 |
|