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

11693 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
2f7bed1f44 Merge pull request #3128 from m4tze/master 
email-invitation translation error in subject and body
 2012-04-09 05:26:34 -07:00
Jonne Haß
2205353171 Merge pull request #3127 from movilla/amp_arito3 
Add translation /authorizations fix image
 2012-04-09 05:19:48 -07:00
matze
76073d45ed ~FIX: changed the translate pattern inside notifier.rb: correct mail subject will be translated 
~Translate: changed the mail contents of the invitation mail: no weird html string below the invitecode url.

- M
 2012-04-09 00:25:08 +02:00
movilla
6ded31a940 Add translation /authorizations fix image 2012-04-08 15:33:46 +02:00
Liam Nicholson
0cd2eb7b8d Fix Bookmarklet By Adding application.css. 2012-04-08 09:31:40 +02:00
David Morley
c9431a6512 Update app/views/shared/_photo_area.mobile.haml 2012-04-07 15:28:35 -07:00
Maxwell Salzberg
40fd476836 remove warning in readme [ci skip] 2012-04-06 14:25:34 -07:00
Jonne Haß
c1694eb06e Merge branch 'update-for-sq-locale' of https://github.com/ujdhesa/diaspora 2012-04-06 22:26:40 +02:00
Florian Staudacher
0bd4d63640 fix jasmine test for publisher textarea "resets height on close" 2012-04-06 22:24:13 +02:00
Besnik
62c4469a9c using other quotes throughout the file 2012-04-06 23:21:40 +03:00
Besnik
44f48f7ae1 using other quotes throughout the file 2012-04-06 23:21:00 +03:00
Florian Staudacher
9c7103be1d don't set publisher height on focus (already done in css), fixes #3109 2012-04-06 21:21:35 +02:00
Besnik
866524aff2 update-for-sq-locale - adding javascript.sq.yml 2012-04-06 20:13:30 +03:00
Besnik
65c698b448 update-for-sq-locale - adding devise.sq.yml 2012-04-06 20:13:30 +03:00
Jonne Haß
30a2a8cb82 fix path to logo in default.html [ci skip] 2012-04-06 17:04:29 +02:00
Florian Staudacher
d7eb4b242f this seems to be in fact a bug in ruby 1.9.2, disabled for now 
... when running with 1.9.3 everything's peachy :/
 2012-04-06 03:42:37 +02:00
Florian Staudacher
518346deab try setting a higher swappiness, take other val for mem calculation 2012-04-06 01:55:07 +02:00
Florian Staudacher
248e9d9ae7 add more output (swapping), increase swapfile size 
MY FIRST COMMIT <3 (it would be so awesome if this would make travis green)
:P
 2012-04-06 01:16:37 +02:00
Jonne Haß
0850d5147f fix syntax errors in sq locale 2012-04-06 00:40:23 +02:00
Jonne Haß
469c23138e Merge pull request #3114 from Raven24/swapfile 
create a 64MB swafile on travis
 2012-04-05 15:33:40 -07:00
Jonne Haß
8744c6017d Merge pull request #3113 from ujdhesa/patch-1 
Updating the translation for sq - part I
 2012-04-05 15:32:10 -07:00
Florian Staudacher
b6a56ca52c create a 64MB swafile on travis 2012-04-06 00:24:08 +02:00
Besnik
f0ef59256f Updating the translation for sq 2012-04-06 00:50:08 +03:00
Maxwell Salzberg
8de9ce9963 Merge branch 'Raven24-memory-control' 2012-04-05 14:29:52 -07:00
Maxwell Salzberg
e1d86bddcf some tweaks so it fails gracefully on systems that do not have free command 2012-04-05 14:29:41 -07:00
Florian Staudacher
fc941fa88b try monitoring used memory an GC by that 2012-04-05 22:21:30 +02:00
Maxwell Salzberg
21667768aa cucumber should not fail with pending steps :( 2012-04-05 12:49:56 -07:00
Maxwell Salzberg
20fee66eee dont do speedup magic on travis 2012-04-05 12:28:07 -07:00
Maxwell Salzberg
2e86d069b8 try two seconds 2012-04-05 12:15:17 -07:00
Maxwell Salzberg
f65a3d760e defer gc for half as long to prevent travis dying 2012-04-05 12:08:15 -07:00
Maxwell Salzberg
a36d5558db use merge not merge! so we dont create false user objects 2012-04-05 11:42:32 -07:00
Maxwell Salzberg
3ecd920cd7 Merge branch 'speedier-tests' of https://github.com/Raven24/diaspora into Raven24-speedier-tests 2012-04-05 10:06:05 -07:00
Florian Staudacher
024f1fee74 disable jQuery effects for tests 
... might buy us a few seconds
 2012-04-05 16:12:45 +02:00
Florian Staudacher
90387e83f8 speed up cukes by deferring GC 
-> https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection

this speeds up tests from 9min 47sec to 9min 16sec on my machine
(6% improvement)
 2012-04-05 16:01:58 +02:00
Florian Staudacher
4051651737 speeding up rspec by deferring garbage collection 
-> https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection

on my machine the rspec tests went from taking 5min 02sec to 3min 29sec :O
(31% improvement)
 2012-04-05 15:59:23 +02:00
Jonne Haß
9c85b0b42b hotfix spanish locale [ci skip] 
If anybody has a cool idea on how to generally sanitize the input for the tag_path (own helper method?) that would be great
Thanks to jankusanagi for pointing me to this
 2012-04-05 15:55:00 +02:00
Maxwell Salzberg
d53b7b5f9a fix trumpeter spec 2012-04-04 23:05:41 -07:00
danielgrippi
59917e95ab update feature_flagger to have access to current user 2012-04-04 19:35:53 -07:00
danielgrippi
169fc743d5 update feature to pending outdated assertion 2012-04-04 19:20:00 -07:00
Maxwell Salzberg
2fd0905591 dump more data in invite rake task 2012-04-04 19:08:36 -07:00
Maxwell Salzberg
9c9562d0fd fix http urls with 3 slashes 2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d DG DC; visual fixups 2012-04-04 18:59:19 -07:00
danielgrippi
6098890783 redirect to post show on create 2012-04-04 18:59:19 -07:00
danielgrippi
9b02633dff framer has better styling 2012-04-04 18:59:19 -07:00
Dennis Collinson
06110b8732 newspaper template WIP 2012-04-04 18:59:19 -07:00
Jonne Haß
9c337ac03e updated locales [ci skip] 2012-04-05 03:43:48 +02:00
Jonne Haß
5866ebe638 using an image tag as a path is an interesting idea... but a path is still working better :P [ci skip] 2012-04-05 03:14:02 +02:00
danielgrippi
59f092c26a added bootstrap extensions to new-templates [ci skip] 2012-04-04 13:22:44 -07:00
Maxwell Salzberg
d755f03cd0 add two more images to the assets 2012-04-04 13:12:07 -07:00
Maxwell Salzberg
d616e902c9 add favicon back 2012-04-04 13:00:25 -07:00