Commit graph

1107 commits

Author SHA1 Message Date
Ilyaaaaaaaaaaaaa Zhitomirskiy
fd6981c3d2 changed the default location 2011-09-07 14:38:31 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
85c64504ac capitalization 2011-09-07 11:41:55 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
80b2f69061 Revert "capitalization"
This reverts commit 9e0afb4a33.
2011-09-07 11:37:52 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
4f70147381 Revert "removed the non-used label"
This reverts commit 2bccea1b04.
2011-09-07 11:37:35 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2bccea1b04 removed the non-used label 2011-09-07 11:33:35 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
9e0afb4a33 capitalization 2011-09-07 11:28:35 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
9d142cab8d not doing an if statement 2011-09-07 11:23:36 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7362e18fc9 no need to check for empty string 2011-09-07 11:09:40 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
08b17e07f4 added the check for invitation token 2011-09-07 10:52:24 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
20f5a02eed using the the correct timeformat for the query 2011-09-07 10:34:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8bb19288f5 made the links https and made sure we pull back users with emails 2011-09-07 10:15:22 -07:00
Jonne Hass
bc4872d3a5 ensure handle is downcased on search, fix #1912 2011-09-07 15:17:42 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3ae8f300ee changed the default location 2011-09-07 03:20:37 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b76133c56a separate tmp directory 2011-09-07 02:50:43 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ef9eff300b not doing joins where they are not needed 2011-09-07 02:50:43 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c03fec1244 the non-waitlist csv writing to tmp 2011-09-07 02:50:43 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
91d60f5e01 wip 2011-09-07 02:50:43 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7485271573 wip csv gen 2011-09-07 02:50:43 -07:00
Maxwell Salzberg
0e7521df9f adding csv generator 2011-09-07 02:50:43 -07:00
Jonne Hass
292b1e7465 small cleanup 2011-09-06 20:13:56 +02:00
Sarah Mei
ad009a71dc Don't run oauth.feature on travis, but run all features locally. 2011-09-04 11:27:30 -07:00
Sarah Mei
8d95684341 move jasmine before cucumber so we can fail faster on travis 2011-09-03 20:30:26 -07:00
Sarah Mei
4f11b75ed1 RAKE jasmine:ci. Duh. 2011-09-03 18:14:26 -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
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
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
3fe6f47648 Add xvfb start to travis config. Use xvfb in specs. 2011-09-03 13:23:20 -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
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
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
Maxwell Salzberg
62aea0e820 fix for mention links, and the first tag links #ohYEAH 2011-08-31 18:06:30 -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
Sarah Mei
b6e2e9452f Fix YouTube titles on 1.9. (SIGH.) 2011-08-30 21:04:29 -07:00
Brian Wisti
8aafc61071 merged with blank markdownify check 2011-08-30 12:55:52 -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
c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown
Conflicts:
	Gemfile.lock
2011-08-27 14:13:15 -07:00
Raphael Sofaer
2c65593579 Add quick option to mysqldump 2011-08-18 10:33:27 -07:00
Raphael Sofaer
f3932132d3 Let the next backup job overwrite the sqldump 2011-08-18 08:34:34 -07:00
danielgrippi
eb8c540ac1 MS DG IZ major invite refactor. all tests are green minus weird stuff on dans computer, need to checkout this out on pivots 2011-08-17 16:28:21 -07:00
Brian Wisti
a442e7c8ae oops. left a merge conflict in 2011-08-16 23:01:08 -07:00
Brian Wisti
8f78a2d977 merge 2011-08-16 22:12:07 -07:00
Brian Wisti
888ad0a31c merging for 1305 2011-08-16 22:05:52 -07:00
Brian Wisti
805a9eb921 resolve my own merge conflicts. 2011-08-16 21:59:13 -07:00
Brian Wisti
b87c7bb489 Improve code block support 2011-08-16 21:48:48 -07:00
Brian Wisti
03127cd592 basic support for Redcarpet Markdown 2011-08-16 21:48:48 -07:00
Brian Wisti
0180aebced Merge branch 'master' of git://github.com/diaspora/diaspora into 1305-full-markdown 2011-08-16 12:39:33 -07:00