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

12076 commits

This branch
This branch
All branches
Author SHA1 Message Date
danielgrippi
92cbcae9c3 DG MS; moved framer controls into a subview & off to the side 2012-05-23 12:16:35 -07:00
Maxwell Salzberg
980ec78b7b fix piwki loading [ci skip] 2012-05-23 11:03:02 -07:00
Dennis Schubert
348c5ac522 Extend usernames pattern to allow '@', '.' and '"' to not lock out old users with dots in their username or users using their email address to sign in... 2012-05-23 20:52:43 +03:00
Maxwell Salzberg
1bcaa5a4bf fix cuke, as canvas-frame is now stream-frame 2012-05-22 22:54:22 -07:00
danielgrippi
120c6b46e0 MS; Fix fake following, as we took it out so I nuked the tests 2012-05-22 19:04:04 -07:00
danielgrippi
c6b8d75313 DG MS; cool header with background in new stream 2012-05-22 19:00:22 -07:00
danielgrippi
0c7492b94d DG MS; add hatched texture to new stream [ci skip] 2012-05-22 15:58:34 -07:00
danielgrippi
20360b5cc5 DG MS; added interactions & permalink in the new stream [ci skip] 2012-05-22 15:48:23 -07:00
danielgrippi
2e52def47a DG MS; background colors for great justice (on the stream) 2012-05-22 15:47:09 -07:00
Dennis Collinson
1c342282b0 fixing event passing 2012-05-22 15:11:21 -07:00
danielgrippi
abc4843273 DG MS; got scroll working [ci skip] 2012-05-22 14:35:05 -07:00
danielgrippi
83fec811cc DG MS; author attribution in the stream; cleaned up some *new* stream styling 2012-05-22 13:50:19 -07:00
Dennis Collinson
9f1d0b64b4 killing stream_object_view 2012-05-22 13:43:21 -07:00
Dennis Collinson
36ef010ed9 DG DC MS; stream has one interactions div 2012-05-22 12:38:48 -07:00
Maxwell Salzberg
78809798ad update schema, also made bob and admin in the seeds [ci skip] 2012-05-22 11:24:36 -07:00
Maxwell Salzberg
8752dd4d58 no more oauth steps, so remove them from the runner and options 2012-05-22 11:06:36 -07:00
Maxwell Salzberg
9e80639ee8 remove some unused gems 2012-05-22 11:03:58 -07:00
Jonne Haß
0030788a2c make pt-PT available [ci skip] 2012-05-22 17:57:25 +02:00
Jonne Haß
5c534521cc top level email is a noun, not a verb [ci skip] 2012-05-22 10:26:21 +02:00
danielgrippi
64a73fb665 new post types. remove old ones. yeah. 2012-05-21 18:45:01 -07:00
Dennis Collinson
2059fea656 put stream.haml back as it is still used in mobile 2012-05-21 17:43:49 -07:00
Dennis Collinson
17dc5eab18 can't remove these yet, cause of mobile 
Revert "do you like old views, because I don't.Kill the old stream views"

This reverts commit 370d8b0482.
 2012-05-21 17:40:23 -07:00
Dennis Collinson
370d8b0482 do you like old views, because I don't.Kill the old stream views 2012-05-21 17:20:08 -07:00
Dennis Collinson
10201f2e40 more work on new stream interactions, hella refactorz. 2012-05-21 17:15:10 -07:00
Dennis Collinson
fe0156a18b cuking out new stream, refactors. 2012-05-21 15:14:23 -07:00
danielgrippi
481160bdcb move canvas-frame functionality into js sub-class for great justice 2012-05-21 12:58:25 -07:00
danielgrippi
777c037e16 kill rich-media type with fire 2012-05-21 12:33:28 -07:00
danielgrippi
0960a090fa actually use the computed image height; remove unused presenter 2012-05-21 11:09:42 -07:00
danielgrippi
ff42f250ca make a small-frame template folder; we're not going to want the same dom structure moving forward... 2012-05-21 11:09:42 -07:00
Maxwell Salzberg
1308994bba Merge pull request #3293 from diaspora/fix-tags 
Fix hashtag case-insensitivity
 2012-05-21 09:26:09 -07:00
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
Maxwell Salzberg
4819850c92 Merge pull request #3288 from agconnor/next-post-reorder 
#3287 using reorder instead of order for newer, older
 2012-05-20 23:43:57 -07:00
Maxwell Salzberg
2a9e37f074 Merge pull request #3291 from hfase01/master 
"NewHere" dirty temporary fix.
 2012-05-20 23:43:28 -07:00
Maxwell Salzberg
e007b39f0d make newhere test less dumb [ci skip] 2012-05-20 23:42:40 -07:00
Hans Fase
04c3187f4f Changed NewHere to lowercase. Otherwise posts will not show up in stream! > https://github.com/diaspora/diaspora/issues/3237 2012-05-21 03:13:46 -03:00
Alex Connor
fe984eb426 #3287 using reorder instead of order for newer, older 2012-05-20 18:21:34 -05:00
Florian Staudacher
9c2c135731 I made a boo boo 2012-05-20 23:09:40 +02:00
Florian Staudacher
b5a53c03d7 when using system ruby, we might need sudo [ci skip] 2012-05-20 22:46:07 +02:00
Florian Staudacher
67dd49b1e4 ... wait for it ... 2012-05-20 22:44:50 +02:00
Maxwell Salzberg
bde23f8ab8 use image_tag for asset_pipeline goodness 2012-05-19 18:19:50 -07:00
Jonne Haß
ccf3bc36f2 updated 20 locale files [ci skip] 2012-05-20 00:36:31 +02:00
Florian Staudacher
9b563e39da fix login cukes 2012-05-19 22:29:12 +02:00
danielgrippi
72f718c8c3 new login page. kept the old one for safe keeping. 2012-05-19 11:10:17 -07:00
Florian Staudacher
a49fe03bd8 use schema instead of migrations for installer [ci skip] 2012-05-19 18:24:13 +02:00
Steven Hancock
125b013c10 AppsController no longer exists 
Remove the AppsController check from the next_page_path helper, since
AppsController no longer exists.

fixes #3280

I'd like to write a helper spec for this, but it'll probably require
some stubbing/mocking and I'm a little too tired to deal with that at
the moment.. so for now let's just fix the problem. :)
 2012-05-18 23:42:29 -07:00
danielgrippi
f4c06c8f88 add rounded buttons to the composer flow; slay multi-photo option 2012-05-18 19:46:51 -07:00
Maxwell Salzberg
593fa0ed8e stupid hack for photos 2012-05-17 21:49:04 -07:00
danielgrippi
72bb37d79d removed typo in travis.yml 2012-05-17 19:05:27 -07:00
danielgrippi
62ba75ad1b DG DC; Move stuff to second page of framer 2012-05-17 19:02:58 -07:00
Maxwell Salzberg
58e4c3614b update travis.yml to reflect reality [ci skip] 2012-05-17 18:53:03 -07:00