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

8854 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Maxwell Salzberg
7d96b603d3 fix bug where if youtube_maps or vimeo_maps were passed in as explicitly nil, the app would 500. #somethingididnotknow (Hash#fetch is kind of weird 2011-09-01 10:14:53 -07:00
Daniel Grippi
9cff210b24 Merge pull request #1691 from manuels/issue1596-Make-hashes-of-hashtags-in-text-shinier 
[PaperCut] add underlining for hovered tags
 2011-09-01 10:05:54 -07:00
Daniel Grippi
00ffc996e4 Merge pull request #1866 from TheLambdaCalculus/b1126-deletion-of-all-photos-from-a-post-with-no-words-should-result-in-the-post-being-deleted 
B1126 deletion of all photos from a post with no words should result in the post being deleted
 2011-09-01 10:04:10 -07:00
Maxwell Salzberg
5685b8964a Merge pull request #1867 from vcuculo/1863-fix-mobile-comments 
Fix for mobile comments
 2011-09-01 08:58:16 -07:00
vcuculo
8270a486ae dont forget mobile site :) 2011-09-01 09:48:57 +02:00
The Lambda Calculus
9d7b8d7f5d Have passing Cucumber tests [Finishes issue #1126] 2011-09-01 01:59:51 -04:00
The Lambda Calculus
98b71f92ab We now do a check on photo deletion to ensure that any associated status messages are also deleted if now empty [Issue #1126] 2011-09-01 01:59:51 -04:00
The Lambda Calculus
636f05bd32 [Issue 1126] Starting to build cucumber test for issue 2011-09-01 01:59:51 -04:00
maxwell
f5fbaaadcf added timeago and stream to the tag page 2011-08-31 21:54:14 -07:00
Sarah Mei
2e747e814f Turns out we need that absolute option after all. 2011-08-31 21:21:55 -07:00
Sarah Mei
1e50137815 Fix person_href 2011-08-31 20:29:53 -07:00
Maxwell Salzberg
b8ca4bfcab added Link to profile page in webfinger profile to make federation a bit easier 2011-08-31 19:57:46 -07:00
Maxwell Salzberg
62aea0e820 fix for mention links, and the first tag links #ohYEAH 2011-08-31 18:06:30 -07:00
Dan Hansen
818af38bdf autoresize inputs 2011-08-31 17:13:24 -05:00
danielgrippi
7e72a29401 fixed aspect edit pane (removed diaspora ids) 2011-08-31 14:55:23 -07:00
MrZYX
6ef8edc9c1 updated locales 2011-08-31 20:34:45 +02:00
Maxwell Salzberg
197dcc1a61 Merge pull request #1856 from vcuculo/fix-search-user 
Previous fix for avatars doesnt work on FF
 2011-08-31 09:29:52 -07:00
Maxwell Salzberg
0e646d7bf7 Merge pull request #1858 from vcuculo/1847-fix-mobile-site 
1857 Fix for mobile site
 2011-08-31 09:24:48 -07:00
vcuculo
5b0ce6b2a9 fix for mobile site 2011-08-31 14:11:51 +02:00
vcuculo
3832f24a02 previous fix for avatars doesnt work on FF 2011-08-31 09:25:39 +02:00
Maxwell Salzberg
27864660f9 add feature for mentions 2011-08-30 23:18:08 -07:00
Maxwell Salzberg
272ab55482 Merge branch '1844-mentions-in-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1844-mentions-in-markdown 2011-08-30 22:15:52 -07:00