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 |
|
Maxwell Salzberg
|
cc6618d294
|
some progress
|
2011-08-17 16:28:21 -07:00 |
|
danielgrippi
|
159fce3ef2
|
refactor wip
|
2011-08-17 16:28:21 -07:00 |
|
danielgrippi
|
bf0eb3dac3
|
4 failures left in postgres
|
2011-08-17 14:18:51 -07:00 |
|
danielgrippi
|
4d4d11b90b
|
upgrade selenium-webdriver to 2.4 for FF6 support
|
2011-08-17 12:49:07 -07:00 |
|
MrZYX
|
1da481d362
|
updated locales
|
2011-08-17 21:26:59 +02:00 |
|
Raphael Sofaer
|
88b317f0c1
|
Fix jasmine spec for aspectFilters
|
2011-08-17 10:17:14 -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
|
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 |
|
Brian Wisti
|
6b34a2611d
|
Turn on all the redcarpet options
|
2011-08-16 21:11:34 -07:00 |
|
Brian Wisti
|
0b2ab94506
|
Merge branch 'master' of git://github.com/diaspora/diaspora into 1305-full-markdown
|
2011-08-16 19:30:23 -07:00 |
|
Brian Wisti
|
ddf912d3ac
|
Remove unnecessary invite seeds
|
2011-08-16 19:30:19 -07:00 |
|
Raphael Sofaer
|
97ab077e04
|
Abort old aspectFilters requests, close issue 1759.
|
2011-08-16 15:31:02 -07:00 |
|
Raphael Sofaer
|
a5d9d6d212
|
Remove reference to invites counter from db seeds, close #1778
|
2011-08-16 15:07:25 -07:00 |
|
Raphael Sofaer
|
f2e079f532
|
Revert "Move the include of splunklogging into the appconfig check"
This reverts commit 25752e9f93.
|
2011-08-16 15:04:51 -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 |
|
Brian Wisti
|
0180aebced
|
Merge branch 'master' of git://github.com/diaspora/diaspora into 1305-full-markdown
|
2011-08-16 12:39:33 -07:00 |
|
Brian Wisti
|
6e248c2d5c
|
Improve code block support
|
2011-08-16 12:28:09 -07:00 |
|
Raphael Sofaer
|
25752e9f93
|
Move the include of splunklogging into the appconfig check
|
2011-08-16 12:26:57 -07:00 |
|
Raphael Sofaer
|
1bd7e1314f
|
Make the signs up feature more robust
|
2011-08-16 11:34:34 -07:00 |
|
MrZYX
|
1e53261606
|
updated locales
|
2011-08-16 19:43:57 +02:00 |
|
Brian Wisti
|
2303686e31
|
basic support for Redcarpet Markdown
|
2011-08-16 10:28:00 -07:00 |
|
Maxwell Salzberg
|
a06f25b297
|
Merge pull request #1763 from grzuy/conversation-creation-refactor
Refactor conversations creation
|
2011-08-16 10:26:54 -07:00 |
|
danielgrippi
|
511517b3c7
|
cleaned up and documented Invitation. moved an action into a User before_create callback
|
2011-08-15 16:44:37 -07:00 |
|
danielgrippi
|
32ae21a213
|
removed user invite counter, as it was already depricated
|
2011-08-15 15:15:43 -07:00 |
|
danielgrippi
|
669cd8578e
|
scoped invite_user_by_email job into Mail module
|
2011-08-15 12:35:32 -07:00 |
|
MrZYX
|
78aa6d0943
|
updated locales
|
2011-08-15 14:01:36 +02:00 |
|
MrZYX
|
a9312daf69
|
fixed syntax error in ml.yml
|
2011-08-15 13:50:05 +02:00 |
|
Anish A
|
e7f1c3d251
|
malayalam localization stage 3. diaspora completed
|
2011-08-15 14:03:17 +05:30 |
|
Anish A
|
2cea39672e
|
malayalam localization stage 2. javascript completed
|
2011-08-15 14:03:17 +05:30 |
|
Anish A
|
a3ac384aa5
|
malayalam localization restarted. devise.ml.yml completed
|
2011-08-15 14:03:17 +05:30 |
|
Luke Snyder
|
b62801bd64
|
Initial styling and links
|
2011-08-14 22:10:56 -04:00 |
|
Raphael Sofaer
|
a2f7fed8f4
|
Fix syntax error in WSR, move tipsy from views into stream.js, fix stream element delete tipsy.
|
2011-08-14 17:45:50 -07:00 |
|
Andrej Kacian
|
b7b20b241f
|
Do not mangle href in the show/hide comment toggle link when posting new comment.
|
2011-08-15 01:39:55 +02:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
3f1e8f0b6e
|
added the check for open invitations
|
2011-08-14 16:06:25 -07:00 |
|
Andrej Kacian
|
8dc1b70621
|
Use tipsy for post scope tooltip
|
2011-08-15 00:54:27 +02:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
ba11bb6d89
|
you are now able to invite friends from the mobile site
|
2011-08-14 15:40:07 -07:00 |
|
Andrej Kacian
|
657a9f96ef
|
Fix error when accessing a tag page without being signed in.
|
2011-08-14 23:51:53 +02:00 |
|
Andrej Kacian
|
4fe61892e1
|
Added list of followed tags also to tags view, as suggested in issue #1632
|
2011-08-14 21:34:56 +02:00 |
|
MrZYX
|
7e59193e2c
|
updated locales
|
2011-08-13 23:54:14 +02:00 |
|
Raphael Sofaer
|
d228f50557
|
Acceptable ajax loader for the aspect dropdown.
|
2011-08-13 12:45:17 -07:00 |
|
Raphael Sofaer
|
3a18044821
|
Fix infinite scroll on search... some kind of weird thing with rails responding with json even when request.format is html, with a mime type of html
|
2011-08-13 09:59:17 -07:00 |
|
Raphael Sofaer
|
f60ce932b1
|
Localize string
|
2011-08-13 09:44:40 -07:00 |
|