danielgrippi
0e5bb81d66
remove all references to the websocket. bang bang.
2012-01-10 12:28:19 -08:00
Jonne Haß
52c75a7ad4
Revert "Revert "auto follow back feature""
...
This reverts commit 6408105917 .
Conflicts:
db/schema.rb
2012-01-04 13:49:56 +01:00
Maxwell Salzberg
63cdd93afc
the websocket has been completely removed, and replaced for a stub until
...
we find a better way to reimpliment it in a more sane way
2012-01-03 18:39:54 -08:00
Jonne Hass
fe82cd6609
lets not set NOT NULL fields to null…
2011-12-11 04:12:58 +01:00
Ilya Zhitomirskiy
1552b5bcc2
keep the pivate key, required for retries
2011-12-08 16:32:19 -08:00
Maxwell Salzberg
f800d50a2b
i think this works
2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
0bd101dca9
change close account to clear profile, still need to dispatch account deletion xml
2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
03ca34767a
ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed
2011-12-08 16:32:18 -08:00
danielgrippi
e6ed2d397a
added close account to user
2011-12-08 16:32:18 -08:00
danielgrippi
644e382cfd
DG IZ; remove more stuff associated with user; removed dependant destroys
2011-12-08 16:32:18 -08:00
Ilya Zhitomirskiy
05612ef733
ms iz wip
2011-12-08 16:32:18 -08:00
danielgrippi
6408105917
Revert "auto follow back feature"
...
This reverts commit 226554becf .
Conflicts:
config/locales/diaspora/en.yml
2011-11-14 17:18:43 -08:00
Kevin Fitzpatrick & Tim Frazer
84e4866e6b
Merge branch 'master' of github.com:diaspora/diaspora
2011-11-14 12:33:10 -08:00
Kevin Fitzpatrick & Tim Frazer
96f2aaa57a
Background sending password reset instructions.
2011-11-14 12:30:47 -08:00
Jonne Hass
226554becf
auto follow back feature
2011-11-14 20:25:11 +01:00
Jonne Hass
9ffeef9d20
Merge branch 'new_user_language' of https://github.com/alda519/diaspora
2011-11-06 15:17:05 +01:00
danielgrippi
ae7944418c
DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams
2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9
wip
2011-11-03 12:31:24 -07:00
danielgrippi
79ec50a16c
DG MS; added setting for displaying spotlight members in soup stream
2011-10-21 14:44:02 -07:00
Maxwell Salzberg
484f46d70f
add validation which prevent user for signing up with dead username. fix cucumber features
2011-10-20 16:32:09 -07:00
Maxwell Salzberg
cb89772a6a
when connected, external services fill in profile info that you have not yet filled out
2011-10-18 10:02:24 -07:00
Manuel Schölling
bdeae54c6c
Make Photos not inherit from Posts
2011-10-16 13:58:35 +02:00
Dan Hansen
f6845c360f
Revert "change namespace from Mail to Mailers"
...
This reverts commit f859904c76 .
2011-10-09 23:34:03 -05:00
Dan Hansen
f859904c76
change namespace from Mail to Mailers
...
locally when Resque tried to constantize Jobs::Mail Object.const_get("Jobs") returned our Jobs module but when it tried to const_get("Mail") it returned the Mail gem.
added copyright
2011-10-09 22:41:01 -05:00
Maxwell Salzberg
59e0658497
default order for tags to be sorted by name
2011-10-05 14:00:28 -07:00
Paul Spieker
0c12471feb
add username blacklist
2011-09-30 14:17:04 +02:00
danielgrippi
97f80272b2
DG MS; changed Job:: to Jobs::; require all mail jobs from Job base class
2011-09-15 12:42:53 -07:00
Maxwell Salzberg
60ace5c297
DG MS; Broke out HydraWrapper in HttpMulti job
2011-09-14 15:50:07 -07:00
alda519
a9e4b4ce99
fixed broken test, spec added
2011-09-14 20:46:52 +02:00
danielgrippi
91e649977c
MS DG update copyright
2011-09-14 11:23:12 -07:00
alda519
296c53a685
fixes new user's language setting
2011-09-13 19:57:55 +02:00
Maxwell Salzberg
665facaeb0
DG MS renamed private dispatcher; started refactor including public
...
dispatcher
2011-09-12 17:02:40 -07:00
Maxwell Salzberg
6e60905d0d
DG MS major refactor of salmon and corresponding federation logic
2011-09-12 14:05:32 -07:00
Maxwell Salzberg
87c994fa47
MS DG cleaned up and fleshed out salmon specs
2011-09-12 14:05:32 -07:00
Maxwell Salzberg
34ed07260f
MS IZ DG moar salmon refactoring
2011-09-12 14:05:31 -07:00
Maxwell Salzberg
e0429ee823
MS DG pulling apart salmon and making our custom hacks more obvious
2011-09-12 14:05:31 -07:00
buddhamagnet
010024c4f9
continuing refactor of model validation calls to rails 3 syntax
2011-09-11 21:39:02 +01:00
Maxwell Salzberg
e0fb8a08cb
set the user email if inviting by email
2011-08-17 16:28:21 -07:00
Maxwell Salzberg
19eb549889
fixed up update controller action and building users #scary #gladsofaerisstillhere
2011-08-17 16:28:21 -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
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
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
Raphael Sofaer
0b00616b8c
Create appConfig option for following diasporahq
2011-08-11 12:01:14 -07:00
danielgrippi
b6c26611ef
placed all mail jobs in the Job::Mail:: namespace & added into appropriate folders
2011-08-10 15:31:40 -07:00
Raphael Sofaer
406ab7a073
Delete a stray file, some cleanup
2011-08-02 09:47:17 -07:00
Maxwell Salzberg
bbf8f2a15b
for tests, only try to connect with an actual person
2011-07-29 21:52:46 -07:00
danielgrippi
905a982d35
add two more default aspects for new users
2011-07-29 19:21:18 -07:00
Maxwell Salzberg
73616a3e7a
new users now autofollow diasporahq@joindiaspora.com; upon connecting to a user, you now get post visibilities for their public posts (that your pod knows about)
2011-07-29 17:20:10 -07:00