danielgrippi
|
91e649977c
|
MS DG update copyright
|
2011-09-14 11:23:12 -07:00 |
|
Ilya Zhitomirskiy
|
6b9ad7c4c6
|
SM IZ pared down markdownify to basic markdown, bumped version of RedCarpet
|
2011-09-13 20:20:49 -07:00 |
|
danielgrippi
|
ec4dc7a905
|
Created AspectStream; removed all logic from AspectsController#index
|
2011-09-11 14:16:48 -07:00 |
|
alda519
|
b5f8f49ddd
|
default profile photo is no longer marked as set
|
2011-09-10 17:31:34 +02:00 |
|
Gonzalo Rodriguez
|
1a6ee84ed5
|
Refactor aspect listings partial. Splited in two, one for index and
other for contacts.
|
2011-09-07 00:09:39 -03: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 |
|
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 |
|
Brian Wisti
|
a6e87ebcb2
|
placeholder commit, working on mentions in markdown merging.
|
2011-08-30 14:44:49 -07:00 |
|
Brian Wisti
|
8aafc61071
|
merged with blank markdownify check
|
2011-08-30 12:55:52 -07:00 |
|
Maxwell Salzberg
|
bb8a9f0b3f
|
small bug in markdownify to prevent barfing with a nil message
|
2011-08-30 11:34:54 -07:00 |
|
Sarah Mei
|
e8eb496e66
|
Ruby 1.9 can find markdownify.
|
2011-08-29 20:01:57 -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 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
8c9a585337
|
reshares now have notifications, slight refactor of the notification helper
|
2011-08-25 17:16:09 -07:00 |
|
Raphael Sofaer
|
dec10e3de9
|
Finish setting up sesssions#new prefill when logged out by authorizationsControlelr
|
2011-08-23 16:37:51 -07:00 |
|
Raphael Sofaer
|
89edfb7ed6
|
WIP prefilling username on logout of user is almost there
|
2011-08-23 16:37:50 -07:00 |
|
Maxwell Salzberg
|
fe78a69161
|
combine invitation emails
|
2011-08-19 12:15:11 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
c3bcb9c962
|
Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""
This reverts commit a407f12463.
|
2011-08-18 16:48:20 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
a407f12463
|
Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
|
2011-08-18 16:16:14 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
064ae972b3
|
the cucumber is now passing & renamed the partial to conform with convention
|
2011-08-18 15:38:27 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
b1e95def4a
|
Merge branch 'master' into issue1586-aspectdropdown-when-posting
|
2011-08-18 12:59:00 -07:00 |
|
Maxwell Salzberg
|
0473037d1b
|
fix notification links
|
2011-08-18 11:12:58 -07:00 |
|
Brian Wisti
|
736b179888
|
Turn on all the redcarpet options
|
2011-08-16 21:48:48 -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 |
|
Raphael Sofaer
|
89639edb3a
|
Use the Contact#in_aspect? helper in aspect_membership_dropdown
|
2011-08-16 15:01:48 -07:00 |
|
Raphael Sofaer
|
cc3eeac98e
|
Merge the aspect dropdown in the publisher with master, some things are still broken
|
2011-08-16 14:59:53 -07:00 |
|
Raphael Sofaer
|
140268365c
|
Simplify aspect dropdown views
|
2011-08-16 12:43:08 -07:00 |
|
Raphael Sofaer
|
f0583de36c
|
Some optimizations to ServicesController#finder. Apparently setting an association on an unsaved record to an empty array hits the database.
|
2011-08-13 09:40:31 -07:00 |
|
danielgrippi
|
1c5f61fb78
|
dropdown images as embedded assets and not 2 separate image tags
|
2011-08-12 18:18:58 -07:00 |
|
danielgrippi
|
75f3accd37
|
moved facebook friend inviter/finder into contacts layout & re-added search
|
2011-08-12 17:05:01 -07:00 |
|
Raphael Sofaer
|
7f69714d08
|
Fix paul.elicker link, refactor people_helper
|
2011-08-11 16:26:14 -07:00 |
|
danielgrippi
|
08f12ee348
|
fixed the 'a post' bug in notification emails
|
2011-08-11 14:40:45 -07:00 |
|
danielgrippi
|
db645e8da8
|
merged publics/show and posts/show
|
2011-08-10 18:07:38 -07:00 |
|
danielgrippi
|
1e7a2f327b
|
use post_message in all mailer html views
|
2011-08-10 15:31:39 -07:00 |
|
Raphael Sofaer
|
f51b71b7db
|
Fix NotifierHelper
|
2011-08-10 10:38:11 -07:00 |
|
Maxwell Salzberg
|
4bff560a30
|
add helper file
|
2011-08-10 10:27:34 -07:00 |
|
Maxwell Salzberg
|
47d5ea7a83
|
remove weird whitespace bug
|
2011-08-09 19:14:49 -07:00 |
|
Maxwell Salzberg
|
86e374b8ce
|
add hovercards back to mentions, reorganized some helpers, made getting started view mobile accessible
|
2011-08-09 16:54:24 -07:00 |
|
danielgrippi
|
a78fa96e99
|
don't display a reshare link if the original post has been deleted
|
2011-08-09 10:26:21 -07:00 |
|
Raphael Sofaer
|
f385eef851
|
Fix like socketing
|
2011-08-08 11:54:32 -07:00 |
|
Raphael Sofaer
|
08ae8d23cc
|
aspect_membership_dropdown, not aspectmembership
|
2011-08-07 12:53:22 +02:00 |
|
Manuel Schölling
|
fead6032f7
|
Issue 1586: added a aspect drop down next to the submit button in the publisher
|
2011-08-07 12:51:32 +02:00 |
|
Raphael Sofaer
|
817d6701e4
|
We don't have fakes anymore, get rid of most of the reshare? method
|
2011-08-05 22:31:32 -07:00 |
|
Maxwell Salzberg
|
b4d4499299
|
adding invite email
|
2011-08-05 18:32:25 -07:00 |
|
Raphael Sofaer
|
6d3da0d0d1
|
Memoize the facebook invitation form on the facebook finder page
|
2011-08-05 11:31:45 -07:00 |
|
Raphael Sofaer
|
0d864935cd
|
Make reshares helper a little more readable
|
2011-08-05 11:31:45 -07:00 |
|
danielgrippi
|
6a56e3298c
|
only show connect to services if all services not already connected
|
2011-08-03 19:02:54 -07:00 |
|