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

12410 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
4a77ccb0cc update travis badge to point at master branch [ci skip] 2012-09-10 13:44:00 +02:00
Sean Tilley
3deff9327a Merge pull request #3557 from movilla/web_mobile_login_second 
New web mobile login (Jonne suggestion) [ci skip]
 2012-09-08 12:02:15 -07:00
Sean Tilley
fa6a379d6b Merge pull request #3558 from movilla/404_mobile_page 
404 page set for mobile [ci skip]
 2012-09-08 11:11:14 -07:00
movilla
c6d24c61f9 404 page set for mobile 2012-09-08 19:43:10 +02:00
movilla
a564cbff9d New_login_mobile_web_ 2012-09-08 15:30:59 +02:00
Florian Staudacher
9bd2def105 Merge pull request #3551 from jeremyjh/2769-profile-tags 
#2769 let profile tag entry grow to size of input box
 2012-09-08 02:59:10 -07:00
Jeremy Huffman
c8f8f6741a let profile tag entry grow to size of input box 
use auto so line-breaks work better
 2012-09-07 23:24:41 -04:00
Jonne Haß
a9ebe42b9f turn mailer on in test env so the stubs can take action 2012-09-07 22:12:07 +02:00
Jonne Haß
d27408d8a9 set perform_deliveries, this should fix #3524 2012-09-07 21:46:13 +02:00
Jonne Haß
edc9d75df7 remove deprecation warning about outdated render call 2012-09-07 01:55:53 +02:00
Jonne Haß
8a759c3aca Use Builder::XChar.encode instead of to_xs in spec 2012-09-07 00:09:43 +02:00
Jonne Haß
a488dd50c4 follow up of last commit fixing remaining specs 
changed spec since it didn't actually test what it said
 2012-09-06 22:11:04 +02:00
Jonne Haß
81442f0f2a Erb::Util.h now escapes ' which it didn't before 
this is what 3.2.8 actually fixes to prevent XSS iirc
We're including the raw message in the atom feed so
we should test for it
 2012-09-06 21:12:49 +02:00
Jonne Haß
60e8107763 remove percent memory/swap usage info in testsuites 2012-09-06 20:36:56 +02:00
Jonne Haß
6780d83770 update to rails 3.2.6 2012-09-06 20:35:18 +02:00
Florian Staudacher
9f27eba174 Merge pull request #3539 from movilla/404_blank_page_mobile 
Fix #3428 blank page 404 on mobile
 2012-09-06 10:05:09 -07:00
Florian Staudacher
f9ec7bb51f Merge pull request #3542 from Raven24/fetcher-fixes 
fix date and guid assigment for fetched posts
 2012-09-06 09:57:05 -07:00
Florian Staudacher
2e3da0cf05 fix date and guid assignment for fetched posts 2012-09-06 18:16:40 +02:00
Jonne Haß
3ae76cd5eb updated 14 locale files [ci skip] 2012-09-06 15:47:32 +02:00
Jonne Haß
6122cfb096 Merge pull request #3545 from hfase01/master 
Remove Git-submodule to import to Launchpad.
 2012-09-06 02:39:00 -07:00
Hans Fase
92ec48e98a Removed git-submodules to be able to import to Launchpad [ci skip] 2012-09-05 21:56:20 -04:00
Florian Staudacher
bb7b084522 Merge pull request #3544 from Raven24/fix-like-spec 
fix travis build (LikesController spec)
 2012-09-05 15:24:57 -07:00
Florian Staudacher
99c6b8bf45 don't test for actually deleted likes, 
instead check whether the `retract` method was called, everything
else should be tested there.
 2012-09-05 23:48:23 +02:00
Sean Tilley
a6d372b961 Merge pull request #3543 from movilla/Another_fix_uncomfortable_overflow_mobile_post 
Another Fix #3167 uncomfortable overflow mobile post [ci skip]
 2012-09-05 10:07:07 -07:00
movilla
b0ecc57631 Fix uncomfortable overflow mobile post 2012-09-05 16:51:27 +02:00
movilla
c0c568365a Fix blank page 404 on mobile 2012-09-04 00:09:45 +02:00
Jonne Haß
5372e86d55 update i18n interpolation fallback to use renamed method 2012-09-01 01:07:17 +02:00
Jonne Haß
b1173950e4 updated 26 locale files, made Sinhala and Interlingua available [ci skip] 2012-08-31 21:01:37 +02:00
Florian Staudacher
45223fd634 Merge pull request #3520 from movilla/new_mobile_resgistrations_ 
New mobile page registrations, add an error message to registrations page, friendlier design, add placeholders and ().upcase
 2012-08-31 01:17:20 -07:00
Maxwell Salzberg
8b7934006e Merge pull request #3491 from fermionic/issue-3420-remote-comments-dont-delete 
Give relayable retractions a chance to propagate locally before deleting the target
 2012-08-30 13:04:59 -07:00
Sean Tilley
3775deb03f Merge pull request #3525 from movilla/big_block_login_ 
Issue #3523: The text 'Gebruikersnaam' (unsername in Dutch) overlay the inputfield. [ci skip]
 2012-08-30 10:13:44 -07:00
movilla
6a32bdd570 Issue #3523: Overflow text username in Duych - maybe several language-_ 2012-08-30 16:03:35 +02:00
movilla
94525f5e45 Issue #3523: Overflow text username in Duych - maybe several language- 2012-08-30 15:55:54 +02:00
movilla
6c6be3e22a New mobile_web registrations 2012-08-29 23:09:52 +02:00
Jonne Haß
984db998d3 Merge pull request #3517 from ruby-ve/locale-es_VE 
new translation
 2012-08-28 17:10:07 -07:00
Jonne Haß
b7c18be1e7 updated 19 locale files [ci skip] 2012-08-29 00:12:38 +02:00
Maxwell Salzberg
4cf27d4248 use a fork of rails admin due to default proc problem override use in rails admin 2012-08-28 00:23:11 -07:00
Johan
3e3701f325 adding devise.es-VE.yml es-VE.yml javascript.es-VE.yml 2012-08-28 02:50:04 -04:30
Johan
488e27509c adding temporary files of emacs 2012-08-28 02:50:04 -04:30
Maxwell Salzberg
61f40fc6bf Revert "rails admin is conflicting with client side validations: see https://github.com/sferik/rails_admin/issues/985" 
This reverts commit b70165b97f.
 2012-08-28 00:19:35 -07:00
Maxwell Salzberg
b70165b97f rails admin is conflicting with client side validations: see https://github.com/sferik/rails_admin/issues/985 2012-08-28 00:07:52 -07:00
Maxwell Salzberg
67ee4b6a95 updating typhoeus as it seemed to break inter pod communication 2012-08-27 12:10:55 -07:00
Maxwell Salzberg
fb909fcb48 this seemed to break things :( 2012-08-27 10:48:41 -07:00
Maxwell Salzberg
c3f073b520 Merge pull request #3511 from movilla/placeholder_friendly_mobile_search 
Add placeholder search mobile[ci skip]
 2012-08-26 23:26:50 -07:00
movilla
b1815c8e9a Add placeholder search mobile 2012-08-25 03:45:02 +02:00
Daniel Grippi
b8f7d025d5 update landing page 2012-08-24 13:45:05 -07:00
Maxwell Salzberg
ec6fd4f9e9 Merge pull request #3509 from movilla/fix_css_default_web 
Fix css error default web [ci skip]
 2012-08-23 17:48:30 -07:00
movilla
f9ce061c09 fix css error default web 2012-08-24 02:01:17 +02:00
Maxwell Salzberg
1f2d305bd1 Merge pull request #3507 from movilla/fix_LogIn_default_web 
Fix issue #3348 Log In button is off the right side of the screen [ci skip]
 2012-08-23 12:53:09 -07:00
Maxwell Salzberg
b99b01a320 Merge pull request #3506 from devendram/cukes-r 
Changing cucumber steps to use tabular form where possible
 2012-08-23 12:52:50 -07:00