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

9459 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dan Hansen
2b31999f28 pull in jasmine-ajax, start testing our ajax callbacks with meaningful responses 2011-08-31 00:00:49 -05:00
Sarah Mei
a5cbf59c6a Merge branch 'master' of github.com:diaspora/diaspora 2011-08-30 21:22:57 -07:00
Sarah Mei
f30e913743 Fix markdownify spec in 1.9. 2011-08-30 21:22:36 -07:00
Dan Hansen
cbc168fc27 only request comments once 2011-08-30 23:12:17 -05:00
Sarah Mei
31239df8b9 Merge branch 'master' of github.com:diaspora/diaspora 2011-08-30 21:05:00 -07:00
Sarah Mei
b6e2e9452f Fix YouTube titles on 1.9. (SIGH.) 2011-08-30 21:04:29 -07:00
Dan Hansen
3bed2ac834 only pass in the post's likes container to the likes widget, comments have likes widgets 2011-08-30 22:53:47 -05:00
Daniel Grippi
50e7d2a254 Merge pull request #1852 from vcuculo/fix-search-user 
fixed user search + avatar
 2011-08-30 20:44:55 -07:00
Dan Hansen
624e7277e8 the "When I open the comment box" step used an old javascript function of ours that no longer exists. remove the feature and replace it with "When I focus the comment field" 2011-08-30 22:08:54 -05:00
Dan Hansen
7e20cece42 remove stray console.logs, set $.fx.off to true to make the failing likes spec pass in firefox 2011-08-30 21:44:43 -05:00
Dan Hansen
f788de17fd allow the user to see who has liked a specific comment. 2011-08-30 21:13:12 -05:00
Dan Hansen
dc947e449b fix issues with comment stream, fix likes, merge comment stream and comment toggler widgets. 
make timeago widget a simple wrapper for $.fn.timeago (we don't really need this.)
 2011-08-30 21:07:40 -05:00
Brian Wisti
d2f1f2fba9 Merge branch '1844-mentions-in-markdown' of github.com:brianwisti/diaspora into 1844-mentions-in-markdown 2011-08-30 14:56:56 -07:00
Brian Wisti
8afa8a7617 Tentative commit for mentions in markdown 2011-08-30 14:55:18 -07:00
Brian Wisti
c33d20ce86 merge 2011-08-30 14:51:04 -07:00
Brian Wisti
a6e87ebcb2 placeholder commit, working on mentions in markdown merging. 2011-08-30 14:44:49 -07:00
vcuculo
640408b166 fixed user search + avatar 2011-08-30 22:38:39 +02:00
Brian Wisti
8aafc61071 merged with blank markdownify check 2011-08-30 12:55:52 -07:00
Maxwell Salzberg
51ace97323 fix youtube embedding. camelCase is such a bummer 2011-08-30 11:55:51 -07:00
Maxwell Salzberg
bb8a9f0b3f small bug in markdownify to prevent barfing with a nil message 2011-08-30 11:34:54 -07:00
Maxwell Salzberg
e25decedc3 Merge pull request #1845 from fermionic/1811-mobile-share-button 
1811 mobile share button
 2011-08-30 11:27:36 -07:00
Brian Wisti
9bb6be9773 Tags and mentions are done post-render by helper, if applicable. 2011-08-30 11:21:31 -07:00
danielgrippi
1ed839fb00 defualt foreman to run thin on port 3000 (unless otherwise specified). 2011-08-30 10:59:44 -07:00
danielgrippi
4d1c93d95b Removed , but not the table. Record all in httpmulti success 2011-08-30 10:14:32 -07:00
danielgrippi
0dfcbca51b Revert "removed the pod_stats table (was the cause of bloat on the database)." 
This reverts commit 902c40e42d.
 2011-08-30 10:03:56 -07:00
danielgrippi
902c40e42d removed the pod_stats table (was the cause of bloat on the database). 2011-08-30 10:01:59 -07:00
Manuel Schölling
2b6167f99d Change cursor for lightbox thumbs 2011-08-30 15:18:10 +02:00
Gonzalo Rodriguez
57c531ffdc Sorry, only for the user name link 2011-08-30 03:32:19 -03:00
Gonzalo Rodriguez
447b92a6fe Remove annoying dotted rectangle on user menu 2011-08-30 03:26:14 -03:00
Sarah Mei
2255e80b69 So. It turns out that postgresql has a less-consistent idea of what .first means in an association with no default ordering. All the places we were doing bob.aspects.first (& etc.) needed to be more specific. & o ya, POSTGRES IS GREEN. 2011-08-29 22:03:05 -07:00
Zach Prezkuta
3f5dd7e5b1 Issue #1811: Share button missing in mobile version 2011-08-29 22:30:14 -06:00
Zach Prezkuta
dfe9e15107 Issue #1811: Share button missing in mobile version 2011-08-29 21:22:07 -06:00
Sarah Mei
e8eb496e66 Ruby 1.9 can find markdownify. 2011-08-29 20:01:57 -07:00
Maxwell Salzberg
83b99890ba another shot at fixing markdownify 2011-08-29 19:43:29 -07:00
Maxwell Salzberg
e30c84ee96 small fix for markdownify 2011-08-29 19:38:51 -07:00
Maxwell Salzberg
224b59322b remove console.log in spec 2011-08-29 19:16:41 -07:00
Maxwell Salzberg
3bde507a3a DC MS fix crazy status.net linkback accept header 2011-08-29 18:44:31 -07:00
Andrej Kacian
36e32ba497 Update jasmine tests for the stream element widget. 2011-08-30 01:46:39 +02:00
Andrej Kacian
e1cfd59dce Move bindings for post hiding/deleting effect from old stream.js to StreamElement 2011-08-30 01:18:51 +02:00
danielgrippi
3e80e4366d specifiy web process first in Procfile, otherwise passing -p to foreman won't do anything. 2011-08-29 16:04:23 -07:00
danielgrippi
bd77560636 cucumber green in postgres (i think?). touched up aspect spec. 2011-08-29 15:53:47 -07:00
danielgrippi
1198670383 Added Foreman gem. Run Diaspora using foreman start (will start everything except mySQL. Passing in a -p flag will let you specifiy the port. Also: I took single_process_mode out of app config and made it an environment variable. If you want to boot a lightweight server, run SINGLE_PROCESS=true rails s. 2011-08-29 14:38:07 -07:00
Andrej Kacian
4d666e3f5b Fix back-to-top scroller widget. 2011-08-29 22:50:28 +02:00
Maxwell Salzberg
f479a9a144 Merge branch 'brianwisti-1305-full-markdown' 2011-08-29 10:56:48 -07:00
Andrej Kacian
e1838729fe Fix account name color in user menu, issue #1833. 2011-08-29 11:55:44 +02:00