Raphael Sofaer
686464c36e
move account deletion out of a tranaction and into a job
2011-06-03 12:05:57 -07:00
Maxwell Salzberg
7204ef8e26
the test that was failing should not exsist
2011-06-02 19:18:28 -07:00
Maxwell Salzberg
72c6efe41c
basic specs
2011-06-01 22:38:15 -07:00
Raphael Sofaer
df04b59857
Change :on to :post in the comment and post methods
2011-06-01 16:45:29 -07:00
Raphael Sofaer
06217a0a1d
Fix stream query
2011-06-01 14:19:27 -07:00
Raphael Sofaer
ee75426963
Add failing spec for being overloaded with updated pending photos
2011-06-01 14:05:25 -07:00
Raphael Sofaer
537de1ce4c
build_like and build_comment now take only an options hash, and call build_relayable
2011-05-31 12:27:58 -07:00
MrZYX
c937f76433
specs for new methods in user model
2011-05-29 18:46:30 +02:00
Sarah Mei
f16cf223eb
This test was not testing how person objects are actually built. Fixed.
2011-05-28 20:14:18 -07:00
Sarah Mei
828cbab792
Keep pod_url and pod_uri settings in sync.
2011-05-28 20:13:38 -07:00
Sarah Mei
31a5ef19de
Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE.
...
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
2011-05-28 19:44:40 -07:00
Jakob Kramer
0efaa77c46
fixes bug #1092
2011-05-27 18:59:02 +02:00
danielgrippi
d12944d57e
record objectId in post (cant use object_id booo)
2011-05-25 12:16:52 -07:00
Sarah Mei
f29a605a7c
Remove photo-related pending specs.
2011-05-25 09:08:49 -07:00
Raphael Sofaer
609439f948
Destroy notifications on contact destroy
2011-05-23 18:33:18 -07:00
Raphael Sofaer
cc84051541
Fall back to author if the diaspora_handle isn't set, that column just needs to be removed
2011-05-23 14:54:27 -07:00
Raphael Sofaer
d22878f3f0
Fix AS::Photo federation, hopefully
2011-05-23 13:56:42 -07:00
Maxwell Salzberg
d4d3b1e44c
MSSM like notification are concatinated, and backfilled some like tests
2011-05-22 13:59:33 -07:00
danielgrippi
c8e31825c5
Bookmark -> ActivitiyStreams::Photo
2011-05-19 11:57:06 -07:00
danielgrippi
dd31f37fd0
only generate new token if admin
2011-05-19 11:57:06 -07:00
danielgrippi
9b941e6520
Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed.
2011-05-19 11:57:06 -07:00
Raphael Sofaer
c942f76d29
Turn off user collapse and turn up status messages to over 9000
2011-05-17 18:14:35 -07:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
Raphael Sofaer
70fd2e916a
Update rspec
2011-05-13 17:52:37 -07:00
Raphael Sofaer
f8b7307441
Downcase emails upon inviting
2011-05-13 16:32:07 -07:00
Raphael Sofaer
a46ff394b1
update devise_invitable and devise
2011-05-13 16:32:07 -07:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
Raphael Sofaer
84779c6773
typo in a test
2011-05-11 16:13:59 -07:00
Raphael Sofaer
970190fb7a
OMG SO MANY EMAILS, fixed
2011-05-11 16:07:24 -07:00
danielgrippi
ebb17ff70c
few cucumber steps failing. wip.
2011-05-11 11:08:30 -07:00
danielgrippi
7e838fc778
only display contacts you are sharing with in aspect edit panes
2011-05-04 18:05:49 -07:00
danielgrippi
0db8541f6e
added a pane for people sharing with you on all aspect page
2011-05-04 17:57:42 -07:00
danielgrippi
e854bd0a32
split 'mutual' flag into 'sharing' and 'receiving' on Contact
2011-05-04 17:09:48 -07:00
danielgrippi
648a10e6d3
Merge branch 'master' into follow
...
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
Arzumy MD
cdf94a0275
#1019 comment/post handles multiple youtube links properly
2011-05-05 00:05:59 +08:00
Maxwell Salzberg
c20cd5381e
create a new notifciation if previous was read, only concatinate when it is the same unread message
2011-05-02 18:18:30 -07:00
Raphael Sofaer
efe79eb351
Fix stream on pages other than 1, rename raw_visible_posts to visible_posts
2011-04-13 14:35:20 -07:00
Raphael Sofaer
92b50c3d90
Add some comments, a test for pagination
2011-04-13 10:45:11 -07:00
danielgrippi
106ae983d5
Merge branch 'master' into follow. all specs green.
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/people_controller.rb
app/models/person.rb
config/assets.yml
db/schema.rb
public/javascripts/aspect-edit.js
spec/controllers/aspects_controller_spec.rb
spec/models/user/querying_spec.rb
spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
danielgrippi
352d1c6abf
fixed disconnecting logic. specs&cucumber green
2011-04-11 15:10:51 -07:00
Raphael Sofaer
080f08187d
Disable typhoeus everywhere but the HTTPMulti specs
2011-04-11 14:52:21 -07:00
danielgrippi
aeda5a4e39
dispatching / receiving logic complete. following wip.
2011-04-07 18:29:24 -07:00
maxwell
51b3cd9c77
attempt to fix the problem where people who wanted emails were no longer getting them
2011-04-07 14:05:40 -07:00
danielgrippi
4f972a23f6
drop requests table wip
2011-04-06 19:01:41 -07:00
danielgrippi
2e5b5e1efe
request notification emails -> started sharing notification emails
2011-04-06 13:21:15 -07:00
Raphael Sofaer
a172e56290
Make the ordering in querying spec less brittle
2011-04-06 12:33:20 -07:00
Raphael Sofaer
3fb822c6c5
Fix distinct problem
2011-04-06 12:29:05 -07:00
danielgrippi
847f4fd260
edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip.
2011-04-05 18:53:10 -07:00
danielgrippi
68375fdb02
added mutual flag, removed pending from contact, specs are green. wip
2011-04-05 16:12:53 -07:00
Raphael Sofaer
fa41c1fc52
Stream query... FIXED?????
2011-04-05 14:56:56 -07:00
