nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13633 commits 4 branches 0 tags 121 MiB
Commit graph

2770 commits

Author SHA1 Message Date
Jonne Haß
eea3818c45 streamline new profile sidebar elements 
* titlecase "Photos"
* Pull "See all" to the left (to match up with  "View all")
* Replace "See all" with "View all"
 2013-08-19 14:26:14 +02:00
Steffen van Bergerem
f22b4d7da7 Change contact list on profile page 2013-08-19 14:02:08 +02:00
Dennis Schubert
051cceaf34 Merge pull request #4371 from MrZYX/bump_devise 
Update devise
 2013-08-16 14:13:13 -07:00
Oliver Azevedo Barnes
4b516603f7 Fix #4361 twitter access level check breaking facebook addition to user 
Rewrite twitter access-level check

Fixed tests, still working on getting facebook up

Add heroku example to diaspora.example.yml
 2013-08-12 13:17:18 -05:00
flaburgan
820fa4e9b2 Extract and factorize the header css in a new file, fix ugly registration header design 2013-08-11 20:18:40 +02:00
Bender Bending Rodríguez
7086055f4e Bitcoin donations 2013-08-11 15:31:05 +02:00
Sean Tilley
7eb4707606 Merge pull request #4382 from goobertron/develop 
Update javascript.en_1337.yml
 2013-08-10 00:41:26 -07:00
goobertron
00a63d381a Update javascript.en_1337.yml 
Corrected a couple of spelling mistakes (don't ask me what I was doing looking in the 1337 file...!)
 2013-08-10 00:45:59 +01:00
Jonne Haß
769bc5ce90 update devise to 2.2.4 2013-08-08 15:40:46 +02:00
Jonne Haß
54311cb226 Merge pull request #4359 from goobertron/4357-locator-typo 
Correct grammar error in Locator feature - fix 4357
 2013-08-07 00:23:42 -07:00
Jonne Haß
a2e5f1f88e Merge pull request #4335 from Team-D/feature/4169-tag_search_autocomplete 
#4169 tag search autocomplete
 2013-08-06 13:29:12 -07:00
Jonne Haß
efbd3c8605 Merge pull request #4344 from oliverbarnes/4124-check-twitter-write-access-before-auth 
Issue #4124 Check write access before authorizing Twitter
 2013-08-06 21:21:56 +02:00
goobertron
005e12c3f7 My first attempt at a commit. Simply correcting a grammatical error in the Locator feature - 'Near from' becomes 'Posted from'. 
I hope I have done this correctly. Please forgive me if not.
 2013-08-06 20:13:48 +01:00
flaburgan
ac533f8383 Refactor the left bar side menu, improve tag autosuggestion design, close #4271 2013-08-06 18:30:24 +02:00
Oliver Azevedo Barnes
55a58713a5 Issue #4124 Check write access before authorizing Twitter 2013-08-05 13:52:19 -05:00
mokus
df9a42c397 update search controller + serch.js so that autocomplete works 
Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec

Fixed merged conflict in Changelog

update routes and search controller

remove useless except from search controller

Fix indentation in search_controller
 2013-08-05 11:49:23 +02:00
Andrew Smith
2bb6bc8eef Added Wordpress service functionality, 
for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs.

Added model for Wordpress service

Added very very basic Wordpress cross-posting functionality.

Added markdown support to post body

Fixed Wordpress::MAX_CHARACTERS problem

cleanup

Added default settings for Wordpress OAuth

Added default settings for Wordpress OAuth

Added Wordpress to configured services spec.

changelog changes
 2013-08-04 07:46:56 -07:00
James Fleming
9ca9a6f310 Remove duplicates and bad code habits. 
Remove some blank line.

Do not chain bang methods.
 2013-08-02 11:39:24 +02:00
carolina
143a970e61 Added strong_parameters gem to Gemfile and created an initializer in config 2013-08-02 11:39:05 +02:00
carolina
f6fe74aeae Migration to turn ActivityStreams::Photo to StatusMessage 
deletes ActivityStream model and all it's references

update migration with the without_protection option to disable mass assignment protection
 2013-07-31 15:15:08 +02:00
J. Fleming
b75bb8dc0a Change devise config and templates to make logout a delete request. 2013-07-17 21:00:18 +02:00
Jonne Haß
af332b6cab Fix typo in diaspora.yml.example 2013-07-06 15:45:30 +02:00
Ruxton
dce1531ba6 Changed follow_diasporahq to be configurable to auto follow any user on join. 
Fixing example config file

Updated changelog
 2013-07-06 13:02:27 +02:00
Jonne Haß
3da9b1bf7f Merge pull request #4259 from netom/4173-disable-invite-button 
Disable invite button after sending invite

Conflicts:
	Changelog.md
 2013-07-06 12:40:05 +02:00
Jonne Haß
091951a929 bumped unicorn timeout to 90 seconds and made it configurable 2013-07-03 12:52:35 +02:00
Fábián Tamás László
6e178af551 Disable invite button after sending invite 2013-07-01 10:19:56 +02:00
Jonne Haß
30dff802d5 Merge pull request #4243 from davexunit/feature/2948 
Show the user if a contact is sharing with them when viewing their profile page
 2013-06-29 10:16:41 +02:00
Jonne Haß
92d3bb9c69 Merge pull request #4252 from Raven24/diasp-feature/1283-coppa-admin 
Admin: find users under the age of 13 (COPPA)
 2013-06-29 10:03:59 +02:00
Jonne Haß
e0812c9a0e start new development cycle 2013-06-28 17:50:01 +02:00
Jonne Haß
2e7c571fa7 bump to 0.1.1.0 2013-06-28 17:38:13 +02:00
Jonne Haß
0bc1cb7177 make wolof and western frisian available 2013-06-28 16:10:35 +02:00
Jonne Haß
464cc34177 updated 37 locale files [ci skip] 2013-06-28 16:10:35 +02:00
Adrián Chaves Fernández (Gallaecio)
42bccb2bfc Updated the Galician (gl) translation 2013-06-27 06:45:26 +02:00
Florian Staudacher
44fbb6472f Merge branch 'feature/1283-coppa-admin' of https://github.com/diasp/diaspora into diasp-feature/1283-coppa-admin 2013-06-23 13:38:48 +02:00
David Thompson
f7cceecb52 Add PeopleHelper#sharing_message method and english localized message text. 2013-06-19 22:03:37 -04:00
Jonne Haß
221c1bf959 update all wiki links 2013-06-17 20:00:48 +02:00
Jonne Haß
c6d158bd81 move asset_sync require to the earliest point possible 2013-06-13 20:57:38 +02:00
Jonne Haß
dfef6ee598 Do not load environment when precompiling assets 2013-06-13 20:57:10 +02:00
Florian Staudacher
c2a9cb55ef Merge branch 'add_conv_participants_preview' of https://github.com/marpo60/diaspora into marpo60-add_conv_participants_preview 2013-06-04 17:12:38 +02:00
Juan Azambuja
3f3fe3ecc7 Add participants preview con conversations 2013-06-01 12:14:16 -03:00
Jonne Haß
009209d939 bump Typhoeus and refactor HydraWrapper 2013-05-25 13:45:37 +02:00
Jonne Haß
ac147cc9f4 Refactor config/ directory 
* Get rid of early pathname requirement
* Use require_relative where approciate
* Drop unused files
* Imported new application.rb, environment.rb and environments/* from fresh Rails app
* Cleaned up boot.rb
* Load config in boot.rb
* Deduplicate environments/integration*.rb
* Move username blacklist into defaults.yml
* Ruby 1.9 Hash syntax everywhere
* Reorganize lib/diaspora/markdownify to match conventions
* Get rid of full path requires where possible
* Add dummy content to production section diaspora.yml.example to prevent warning
* Drop sqlite? method
* Move postgres? method into ConfigurationMethods
* Drop token authentication from User
 2013-05-19 18:54:54 +02:00
Jonne Haß
bf90dfffbd start new development cycle 2013-05-19 16:03:01 +02:00
Jonne Haß
79c9460e0b change version to 0.1.0.0 2013-05-19 16:01:16 +02:00
Jonne Haß
1c61172b14 updated 186 locale files [ci skip] 2013-05-19 04:49:24 +02:00
Ruxton
4f1bfd7eea oembed_providers.yml added for custom (outside of ruby-oembed) oEmbed providers. 2013-05-07 09:38:30 +08:00
Ruxton
f6e31fdd95 Merge branch 'develop' of https://github.com/diaspora/diaspora into develop 2013-05-07 09:37:05 +08:00
Jonne Haß
6b1fdaafc0 Merge branch 'locator' of git://github.com/tangosource/diaspora into tangosource-locator 2013-05-06 17:33:10 +02:00
Jonne Haß
c41db6634c Fix reading of redis namespace from config 
Changed default to nil to not screw users running develop already
 2013-05-05 16:12:22 +02:00
Jonne Haß
fdff9c8b8a drop another capistrano leftover 2013-05-05 10:53:35 +02:00