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

8675 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sarah Mei
949423ccda Make YAML::ENGINE syck under ruby 1.9 to fix travis 1.9 build issue 2011-09-03 19:52:39 -07:00
Sarah Mei
6642ee2047 Fix cucumber feature to reflect new aspect dropdown wording 2011-09-03 19:24:19 -07:00
Sarah Mei
8f9a0a032d Remove debugging output from travis script. 2011-09-03 19:22:01 -07:00
Sarah Mei
460b734b9e Must bundle exec rake on travis to avoid stack-level-too-deep rake errors. 2011-09-03 19:07:25 -07:00
Sarah Mei
60301d5a93 More debug output in travis. Also, use --without development production in the rebundle, same as in the original bundle. 2011-09-03 18:46:20 -07:00
danielgrippi
66836e53d2 Aspect dropdowns read 'All Aspects' if all aspects are selected 2011-09-03 18:38:12 -07:00
Sarah Mei
aa1aaaa0d8 Add --trace to debug the stack level too deep error on the travis 1.9 build. 2011-09-03 18:30:19 -07:00
Sarah Mei
4f11b75ed1 RAKE jasmine:ci. Duh. 2011-09-03 18:14:26 -07:00
Sarah Mei
024574534b Add execute bit to before-travis.sh 2011-09-03 18:03:42 -07:00
Sarah Mei
77149a9623 Move travis startup script to its own file. Add GC settings for REE and -q2 for aptitude install. 2011-09-03 17:57:18 -07:00
Sarah Mei
a5b120532a Use a jasmine fixture with just one post for the comment specs. 2011-09-03 17:51:51 -07:00
Sarah Mei
d46bf5f748 Horrible, horrible hack to re-bundle on the 1.9 build. 2011-09-03 17:24:02 -07:00
Sarah Mei
3619e5f4a1 Add a remove of Gemfile.lock for the 1.9 build. 2011-09-03 17:15:25 -07:00
Sarah Mei
45ffd99c11 Put a bit more messaging so we can see where the rspec double run is coming from. 2011-09-03 16:54:56 -07:00
Sarah Mei
984061cb80 Run spec, cucumber, and jasmine separately in an effort to not run rspec twice. 2011-09-03 16:38:16 -07:00
Maxwell Salzberg
09d4918e80 SM MS improve relayable semantics 2011-09-03 16:36:15 -07:00
Maxwell Salzberg
0780491d4f fix for 'undefined method 'post' for nil:NilClass' in Mail::AlsoCommented 2011-09-03 16:06:30 -07:00
Maxwell Salzberg
1853720513 MS SM fix for 'No method limit for []' 2011-09-03 16:05:44 -07:00
Maxwell Salzberg
26151263c5 put receiving in a transaction, to prevent the crazy duplicate index errors and hopefully fix federation visibility. 2011-09-03 16:04:53 -07:00
Maxwell Salzberg
fd68915461 MS DH fix tag show page comments 2011-09-03 14:47:52 -07:00
Sarah Mei
24315c1bbe Install firefox QUIETLY. 2011-09-03 14:34:17 -07:00
Sarah Mei
0a3f353f6a Run all specs on travis. Also, add 1.9.2 run. 2011-09-03 14:24:48 -07:00
Sarah Mei
14324aecc2 Install firefox on travis. Only run cucumber to save time while experimenting. 2011-09-03 14:10:06 -07:00
Sarah Mei
392db905cb Put the xvfb pidfile in /tmp instead of /root 2011-09-03 13:45:26 -07:00
Sarah Mei
2eca2c0f40 Add /etc/init.d script for xvfb. Copy it into place before trying to use it on travis. 2011-09-03 13:35:13 -07:00
Sarah Mei
79b4d0ef57 Only run on 1.8.7 for now 2011-09-03 13:25:23 -07:00
Sarah Mei
c8046842c0 Merge branch 'master' of github.com:diaspora/diaspora 2011-09-03 13:23:27 -07:00
Sarah Mei
3fe6f47648 Add xvfb start to travis config. Use xvfb in specs. 2011-09-03 13:23:20 -07:00
Maxwell Salzberg
13ba4eb3b2 update jquery expander, but disable use until we flution to working with <p> tags 2011-09-03 13:03:00 -07:00
Maxwell Salzberg
722a2a86ea remove console.log; instantiate a page for jasmine tests 2011-09-03 12:21:09 -07:00
Maxwell Salzberg
eb6263084e MS DH fix liking of posts and comment js; instansiate streamElement widgets when they are socketed 2011-09-03 12:09:34 -07:00
Sarah Mei
1a823d647e Fix comment jasmine fixture generation to be more consistent (i.e. take out more aspects.first stuff). Fix comment jasmine spec to be more consistent - remove unneeded spies, etc. 2011-09-03 12:02:51 -07:00
Sarah Mei
9960b5b189 Gotta escape & before other stuff in markdownify - in 1.8 it was always first but not in 1.9 because the list of entities was a hash. This change converts to an array. 2011-09-03 11:26:11 -07:00
Gonzalo Rodriguez
2afb646286 Minor changes on status message 2011-09-03 03:47:33 -03:00
Gonzalo Rodriguez
8dd05a5e5b Fixing method signature semantics 2011-09-03 03:36:38 -03:00
Gonzalo Rodriguez
0aeab944bf Related to #1885. Workaround to avoid crashing when searching tags with dots like cubbi.es 
What i did was to redirect to the tag without dots, in this case cubbies
I didn't consider a good idea to add route support for /tags/cubbi.es
since it get messed with request formats
 2011-09-03 00:22:27 -03:00
Daniel Grippi
c63dfb88fe Merge pull request #1883 from manuels/lightbox-click-cursor 
[PaperCut] Change cursor for lightbox thumbs
 2011-09-02 20:14:02 -07:00
Gonzalo Rodriguez
eae9c14168 Use named helper instead of hardcoded route 2011-09-02 22:49:16 -03:00
Daniel Grippi
3129aeb133 Merge pull request #1878 from vcuculo/1785-fix-bookmarklet 
1785 Fix bookmarklet
 2011-09-02 09:30:30 -07:00
vcuculo
8919d0c0ce fixed bookmarklet 2011-09-02 10:28:32 +02:00
vcuculo
9072de5096 fixed bookmarklet 2011-09-02 10:25:34 +02:00
danielgrippi
af569204b8 Revert "Merge pull request #1874 from vcuculo/1785-fix-bookmarklet" 
This reverts commit e278b39421, reversing
changes made to d0f21cb444.
 2011-09-01 16:31:49 -07:00
Maxwell Salzberg
e278b39421 Merge pull request #1874 from vcuculo/1785-fix-bookmarklet 
Fixed bookmarklet
 2011-09-01 16:20:59 -07:00
Maxwell Salzberg
d0f21cb444 small fix for lists in comments 2011-09-01 16:20:13 -07:00
vcuculo
b30a25713e fixed bookmarklet 2011-09-02 01:11:25 +02:00
vcuculo
6518a89302 fixed bookmarlet 2011-09-02 00:44:56 +02:00
Maxwell Salzberg
d395a29efb add mobile feature, thanks @vcuculo 2011-09-01 14:58:55 -07:00
MrZYX
b1f283c995 updated locales 2011-09-01 23:18:47 +02:00
Maxwell Salzberg
48cdf7c79f fix poetry mode, due to a mistake I made previously. also fixed a 500 where youtube titles do the unexpected 2011-09-01 12:03:07 -07:00
Maxwell Salzberg
e6d1617268 added timeago to notifications page. @ohaibbq, this is getting annoying :P 2011-09-01 10:52:07 -07:00