Maxwell Salzberg
|
8046a59da9
|
new stream has a loader [ci skip]
|
2012-05-23 16:00:27 -07:00 |
|
danielgrippi
|
2a37491be0
|
changed service icons; icons for template picker [ci skip]
|
2012-05-23 15:09:57 -07:00 |
|
Maxwell Salzberg
|
c21bc14c78
|
center big text on frames [ci skip]
|
2012-05-23 15:03:38 -07:00 |
|
Maxwell Salzberg
|
f3af73efc2
|
make some text on some legacy posts readable in the new stream [ci skip]
|
2012-05-23 14:59:11 -07:00 |
|
Sean Tilley
|
afdb5350ea
|
Merge pull request #3309 from OhaiBBQ/master
Bug Mash Monday #5, NoMethodError in InvitationsCotnroller [ci skip]
|
2012-05-23 13:14:31 -07:00 |
|
Dan Hansen
|
cf847d61ba
|
bug mash #5
fix NoMethodError on InvitationsController
|
2012-05-23 13:05:01 -07:00 |
|
danielgrippi
|
0e1c66f5b6
|
DG MS; only show applicable frames in the framer step
|
2012-05-23 12:59:27 -07:00 |
|
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 |
|
movilla
|
a7f967c2c5
|
Translation new make something /stream
|
2012-05-23 00:43:45 +02: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 |
|