Commit graph

3053 commits

Author SHA1 Message Date
Steffen van Bergerem
0cc3b10b1f port publisher and bookmarklet to bootstrap 2014-03-10 15:15:40 +01:00
flaburgan
67d71e2280 Fix drawer in some mobile browsers.
Remove the black background on menu badges.
Fix body content on screen width > 768px.
Start split of mobile css in different files in /mobile/
2014-02-24 23:30:57 +01:00
Fabian Rodriguez
4042e50289 Removes client_side_validations
Conflicts:
	Gemfile
	Gemfile.lock
2014-02-23 16:48:47 +01:00
Jonne Haß
e5465728d7 Merge pull request #4809 from Gallaecio/gl
Updated the Galician (gl) translation
2014-02-23 16:21:30 +01:00
Adrián Chaves Fernández (Gallaecio)
b37d008849 Updated the Galician (gl) translation 2014-02-23 16:06:33 +01:00
Jason Robinson
ea82a91085 Merge pull request #4799 from JannikStreek/feature/4778-comment_counters
Added count of comments to statistics
2014-02-21 21:49:25 +02:00
Jannik Streek
d603ff818c added comment count to statistic to calculate posts/comments ratios
fixeds tests for comment count in statistics

added changelog entry and default entry
2014-02-21 12:25:23 +01:00
goobertron
3c2b0a44d4 Update English locales to diaspora* instead of Diaspora. 2014-02-20 17:48:17 +00:00
Jonne Haß
3ed4467155 Merge pull request #4765 from goobertron/jquery_source
Update JQuery source to jquery.com

Conflicts:
	Changelog.md
2014-02-10 17:02:09 +01:00
Jonne Haß
3a616469f4 Merge pull request #4707 from goobertron/improved_new_password
New reset password form

Conflicts:
	Changelog.md
2014-02-10 01:35:37 +01:00
Jonne Haß
90784b3b38 Merge pull request #4768 from MrZYX/manwithtwowatches-feature/4455-make-help-view-backbone-view
Make help pages a backbone view
2014-02-09 20:05:09 +01:00
goobertron
23e8bfa082 Update JQuery source to jquery.com 2014-02-09 17:36:35 +00:00
goobertron
2a145e67ab Update design of forgot_password and change_password forms
Fix redirect to stream, make labels lower-case

Fix cuke
2014-02-09 15:48:06 +00:00
Jonne Haß
4a3869cda8 Merge pull request #4769 from Ruxton/feature/faster_stream_queries
Updating queries for the stream to be faster
2014-02-09 16:25:59 +01:00
Richard
1561690303 moved call to help backbone view init to separate file included only on faq view.
extending loaded js locales.

cleaned up unused routes. removed some comments. loading help locales only on help view.

removed afterRender from backbone views. extended load_javascript_locales method to take a section.
2014-02-09 16:00:15 +01:00
Richard
da6b037f24 highlighting menu items when clicked. collapsing questions and answers on the static content help sections.
removed unused help haml templates.

put locales back to how they were and wrote a small js parser to swap in links to help views which have generated links in them.

using locales text for help section headers.
2014-02-09 16:00:15 +01:00
Richard
afec5977e9 Started converting the help section into a backbone view. Things missing are: some urls which were calculated and inserted into the yml, all the pre-existing erb templates are still there, it's still at /faq/faq, nothing has been tested, some of the questions don't collapse and expand.
changed the locales to have the hard coded urls in them because they can no longer be calculated server side. this is pretty crap because i'm going to have to change it for all the languages now so i might change my mind about this later.

deleted some unused views.
2014-02-09 16:00:15 +01:00
goobertron
7bcea07b99 Standardise - code refs to 'messages' to 'conversations' 2014-02-09 15:44:12 +01:00
goobertron
c12efdf5e6 Changing text messages -> conversations 2014-02-09 15:44:10 +01:00
Jonne Haß
ecd8a8200b Merge pull request #4754 from svbergerem/small-improvements-spv
SPV small improvements
2014-02-09 14:26:41 +01:00
Florian Staudacher
6c9cce7cda Merge branch '4264-embed-youtube-on-https' of https://github.com/arlogn/diaspora into arlogn-4264-embed-youtube-on-https 2014-02-09 13:05:39 +01:00
Jonne Haß
d27c6a8305 updated 31 locale files [ci skip] 2014-02-09 12:31:00 +01:00
Ruxton
c8a0c81b6a Updating queries for the stream to be faster 2014-02-07 14:23:19 +08:00
Steffen van Bergerem
97f1c286f4 improve reshared posts 2014-01-31 22:48:40 +01:00
arlogn
1563d088bc embedding youtube videos over https 2014-01-30 18:01:27 +01:00
Steffen van Bergerem
655fbfcd79 Fix timeago on mobile devices. Fix missing space 2014-01-30 10:15:14 +01:00
Adrián Chaves Fernández (Gallaecio)
672686a72d Fixed typo: ‘[…] your password, If it was […]’ → ‘[…] your password. If it was […]’. 2014-01-25 08:56:55 +01:00
Adrián Chaves Fernández (Gallaecio)
e9b5da1741 Updated the Galician (gl) translation. 2014-01-25 08:55:13 +01:00
Steffen van Bergerem
7519fcc255 Remove unused cubbies code 2014-01-24 08:58:47 +01:00
Jonne Haß
9ea6e9c166 Merge pull request #4517 from Zauberstuhl/report_post_feature
Added post reporter feature

Conflicts:
	Changelog.md
	app/assets/stylesheets/application.css.sass
	db/schema.rb
2014-01-20 10:03:45 +01:00
Jason Robinson
93b30dcda4 start new development cycle 2014-01-19 22:47:56 +02:00
Jason Robinson
edbed6c44a bump to 0.3.0.0 2014-01-19 22:38:10 +02:00
Jonne Haß
18a2b6c0d3 updated 158 locale files [ci skip] 2014-01-19 19:18:14 +01:00
Jonne Haß
dae69f9558 Merge pull request #4662 from Raven24/update_underscore-backbone
update backbone.js and underscore.js
2014-01-17 03:24:46 -08:00
Florian Staudacher
1924c40d38 replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem
- updates underscore to 1.5.2 and backbone to 1.1.0

backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
  models

other changes:
- fix some events triggering multiple times in connection with deleting
  a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
  * no longer test the backbone router as part of our code
  * jasmine factory already returns model instances, no need to wrap
    that again
2014-01-16 23:23:30 +01:00
goobertron
0b0d0000fe Remove alpha references to invites and buggy software 2014-01-16 18:51:39 +00:00
Jonne Haß
15b1dae362 update devise to 3.2 2014-01-15 12:59:59 +01:00
Lukas Matt
5c9a3aaf3e Added post report feature
You can report a single post by clicking the correct icon in the controler section

Workflow:
* Report a post as offensive
* Trigger alerts to every pod-admin
* Pod-admin can review it in the admin interface
* Delete the post or mark it as reviewed
2014-01-14 15:00:55 -05:00
goobertron
a1ac848d62 Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting) 2014-01-12 20:02:33 +00:00
Jason Robinson
db71c9c50b Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$ 2014-01-06 22:00:53 +02:00
maruf
c17a474142 Simple captcha for signup page 2014-01-06 22:00:37 +02:00
flaburgan
6aced29bb6 Add expand the publisher test 2013-12-13 17:55:33 +01:00
flaburgan
923a4f2ab4 Add indication about markdown formatting in the publisher 2013-12-13 16:02:39 +01:00
Jonne Haß
c660c90091 Merge pull request #4612 from diaspora/drop_spv_old_code
Drop spv old code
2013-12-11 07:41:51 -08:00
Fabian Rodriguez
6c8c4fc99e remove template picker functionality 2013-12-03 20:53:00 -02:00
Jason Robinson
2c83d0e846 Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings. 2013-12-02 22:35:18 +02:00
Jonne Haß
1ce027eb2c Merge pull request #4605 from manwithtwowatches/feature/4509-image-upload-response-errors
Feature/4509 image upload response errors
2013-12-02 00:10:25 +01:00
Jonne Haß
d3f41a97c5 Merge pull request #4548 from diaspora/remove_acts_as_taggable_on_from_admin_panel
Remove acts as taggable on from admin panel
2013-12-01 14:48:02 -08:00
Adrián Chaves Fernández (Gallaecio)
a590fbfc5f Updated the Galician (gl) translation. 2013-12-01 12:16:26 +01:00
Jonne Haß
6c77df6ecb Fix wrong pluralization key in en.yml 2013-11-30 15:44:43 +01:00
Richard
1b83b6942b Merge branch 'develop' into feature/4509-image-upload-response-errors 2013-11-28 21:46:01 +11:00
Richard
3671f09b1d checking file upload response error and giving an error alert if there is one. 2013-11-28 12:26:30 +11:00
Fabian Rodriguez
e7ee7892ee Add ActsAsTaggableOn::Tag to excluded models in rails_Admin
Fixes #4538
2013-11-24 11:51:39 -02:00
Fabian Rodriguez
5ed5b1f8ce remove trailing whitespaces and indent rails_adimn initializer 2013-11-24 11:51:39 -02:00
Jonne Haß
05fa086caa replace ugly 'followed by' grammar assumption at tags#show with proper version 2013-11-20 23:47:50 +01:00
flaburgan
1833edfd67 Add actions to contacts/index.html page 2013-11-12 19:10:00 -08:00
flaburgan
3df0fdc09b Improve the management of the contacts visibility settings in an aspect 2013-11-07 12:55:35 -08:00
Jonne Haß
1da6664712 updated 44 locale files [ci skip] 2013-09-24 13:46:59 +02:00
flaburgan
02ef9e08f6 Remove the (now useless) last post link from the user profile. 2013-09-20 17:37:34 -07:00
Jonne Haß
d4504589c9 add translation for connect to wordpress 2013-09-20 18:54:13 +02:00
Jonne Haß
a2b6740fed pluralize admins.user_search.you_currently 2013-09-20 13:21:33 +02:00
Jonne Haß
ad20a8487b bump ruby-oembed 2013-09-19 23:39:13 +02:00
flaburgan
0c8adb2070 Add link to the faq in the right panel 2013-09-18 15:53:04 -07:00
Jonne Haß
5a821efa18 hardcode default(=fallback) language 2013-09-18 22:14:47 +02:00
Fabian Rodriguez
1dbf9642c8 Merge pull request #4515 from fubik/develop
Disables submit button in sign up form after submission to avoid email already exists error
2013-09-12 14:32:55 -07:00
Jonne Haß
f65671b29e updated 73 locale files [ci skip] 2013-09-12 22:52:23 +02:00
Titouan Lorieul
26a3f56c22 Disables submit button in sign up form after submission to avoid email already exists error 2013-09-11 20:49:23 +02:00
sjain1107
5223a2d906 Adding ignore user icon
Adding ignore user icon

Added jquery

Changed profile.js
2013-09-04 14:47:23 +02:00
Jonne Haß
991a505439 Merge pull request #4485 from colindean/rename_bitcoin_wallet_id
change bitcoin_wallet_id to bitcoin_address
2013-09-01 19:24:44 +02:00
Jonne Haß
58e8df4455 Remove automatic setting of the DB variable from script/server
* It's broken for those that would benefit from it (postgres users)
* It's broken in the design: Reading it from the config requires bundle exec ruby, which requires it being set properly
2013-09-01 19:08:44 +02:00
Colin Dean
a4ce4404ff change bitcoin_wallet_id to bitcoin_address
It is better to call it an address than a wallet ID, because the latter may
confuse Bitcoin users who conflate the two. They are not the same.

Also adds convenience method to handle the deprecated variable.
2013-08-31 20:16:23 -04:00
Nils Vogels
a3f3bcf6ef Adjusting the description of the 404 message, in order to avoid having
to specify why users got a 404, and possibly leaking information while doing this

See discussion in #3717 for rationale on not implementing specific HTTP codes
This solves around #3717 and #3728

Adjusting travis breakage
2013-08-30 14:42:19 +02:00
Jonne Haß
625159c8ad start new development cycle 2013-08-27 09:59:46 +02:00
Jonne Haß
2919c7c73f bump to 0.2.0.0 2013-08-27 09:57:46 +02:00
Jonne Haß
38f01b9cd5 remove extra is in help section [ci skip] 2013-08-27 09:42:34 +02:00
Steffen van Bergerem
324b09a72a add help page 2013-08-26 15:26:18 +02:00
Jonne Haß
748b38434f update plural rules and make bosnian available 2013-08-26 13:16:51 +02:00
Jonne Haß
5238004eff updated 58 locale files [ci skip] 2013-08-26 11:06:29 +02:00
Jonne Haß
f9a3990562 do not leak photos through photos#show 2013-08-26 09:39:39 +02:00
Jonne Haß
348a7b6c5b update branding 2013-08-25 18:21:14 +02:00
Jonne Haß
0d1bf85931 drop outdated hints from right sections 2013-08-25 18:21:14 +02:00
Steffen van Bergerem
0cf50838e1 Add 'no comments' message to SPV 2013-08-23 01:36:58 +02:00
Steffen van Bergerem
7fe972555a profile message and mention icons 2013-08-21 23:05:42 +02:00
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
Marco Gallardo
4aab8762fa Locator feature
added marker image for publisher, showing div for address, and added
functionality to close it when clicking 'X' image

showing marker image in publisher

renamed map-marker to locator

fixed style for map marker image in publisher

added locator.js to get user's location

loading google maps api

removed unecessary append and showing location next to publisher

moved location address inside div and  added image to close location

styled div location address an image to close location

removing location when clicking close image

cleaned code

cleaned code

showing loader while location is being obtained, translated normal js to
backbone structure, created locations db stuff, and removing location
div when clicking 'share'

refactored code; started to move code to backbone

refactored js code; moving functionality to backbone structure

created address function to make accessible address variable value

refactored locator.js

showing and removing location div from dom

created location; it belongs_to status_message

added location model and created association with status_message

added hidden field for location address and added respective code on js files to retrieve it on ajax call

saving location for status_message (post)

removing location when sharing

renamed locator backbone view to location, added template, showing
location, and saving lat and lng

prepared and added template to show location

added location to post model in order to have it accessible in backbone

retrieving location to show it in template

removed console.log XD

fixes when removing location

cleanind location_address hidden field when location is removed

more fixes; showing location when sharing

saving location just when it exists

created method to retrieve location address just when location was created

fixed issue about showing 'Near from' message when there was not any location

added style for location

cleaned code

renamed locator view

retrieving lat and lng from locator.js

saving lat and lng in location_coords

saving lat and lng

added style for input location_address

removed location_address  hidden field; the value will be taken directly from input with the location

replaced div with location for input; the user will be able to edit the place

avoiding submitting the form when pressing Enter key on new input for location

added missed spec file for location model

refactored location_view code

refactored location_view code

cleaned code

added sinon library for testing

added describes for new publisher's view functions

created test for destroyLocation function

added test for showLocation publisher view function

created test for avoidEnter publisher view function

removed unnecessary div

Created first test for locations view, added more specs, added Sinon.js,
and fixed issue with assets

loading locator.js for tests

moved location stuff to app/assets

moved locator.js and sinon.js to app/assets

fixed route for images

included locator.js to assets

fixed issue when post object is different than StatusMessage; also fixed issue with lat and lng

loading Sinon for specs

refactoring locator errorGettingposition and start replacing google maps stuff with OSM

added OpenLayers JS, osmlocator, and added them into the main js

changing the locator from Google to OSM instance

changing lat and lng value in the backbone view

removing google javascript tag in application layout

adding jasmine to locator test and removed locator.js

adding jasmine to locator test using OSM

adding Jasmine test to OSM locator

removed locator.js

removed require locator and updated schema

fixed js response; added location

since we are using OSM Locator we don't need locator-spec test

fixed spec for location view; we are not using google maps anymore

changed description of osmlocator-spec

fixed issue with status-message-location template

fixed style for location_address textbox

fixed tests for locator

moved split function to model

created test for location model

removed puts

added effect for location marker

added translations for locator

removed conflicting-unnecessary lines that were loading files for specs

removed sinon library; using sinon-rails gem

removed useless code

removed puts; added Rails.logger.error

added sinon.js file

added specific version of sinon-rails gem

improving validations sintax

using openlayers-rails gem

removed 'google API' text

using sinon gem

isolating LocationStream view

refactored validation

getting location when post is a Reshare

refactored code

fixed aligment for elements under location message

improved styling for location message

refactored begin-rescue block

getting absolute root instead of just the root

added address method to retrive address of location

removed code from Post model; also added descriptinon why it was removed

removed validation when retrieving address; with latest refactorizations we dont need them any more

interpolated location; using file in locales

fixed width for div of location

moved Sinon gem into development and test group

fixed method's description

added missed indexes

updated schema with locations table

removed openlayers-rails gem

preventing location to be saved if there are not coordinates

fixed spec; wrong closing tag
2013-05-02 17:31:53 -05:00
Braulio Martinez
00a3332013 Remove unnecessary ruby187 hacks 2013-05-02 10:07:30 -03:00
Ruxton
694fc01124 Added MixCloud oEmbed to oembed_providers_list 2013-04-29 12:11:11 +08:00
Greg Tangey (Ruxton)
9f66e32cce MixCloud oEmbed support
Adding support for MixCloud oEmbed
2013-04-26 15:25:08 +08:00
Jonne Haß
ea792246d0 bump sidekiq 2013-04-25 21:30:35 +02:00
Jonne Haß
322f4da4d8 Embed associated photos into the status message xml 2013-04-21 19:44:09 +02:00
Florian Staudacher
6bcac2a7ad Merge pull request #4117 from MrZYX/script_server
Refactor script/server
2013-04-21 07:25:33 -07:00
Jonne Haß
c8eec463e5 bump configurate 2013-04-20 14:37:41 +02:00
Jonne Haß
aca134d54a Refactor script/server
* Made style consistent
* Add helper functions to print messages
* Abort script if critical command fails
* Made number of started Sidekiq workers configurable again
2013-04-15 17:03:41 +02:00
Jonne Haß
bef8b1ea3c Fix typo in devise initializer 2013-04-15 02:35:53 +03:00
Florian Staudacher
f3aa802a0d remove capistrano from the main source code repo
capistrano deployment scripts will be maintained in a separate deployment repo
2013-04-15 00:50:23 +02:00
Jonne Haß
bef05c14d7 Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop
Conflicts:
	Changelog.md
2013-04-10 18:24:47 +02:00
Diaspora Europe
783d98745a added to admin section: which users are under the age of 13 #1283 2013-04-08 16:50:33 +02:00
Steffen van Bergerem
6e724fc1d4 preview posts in stream 2013-04-07 17:43:27 +02:00
Jonne Haß
be470784c5 add app directory to the autoload paths so that the worker files are loaded in development mode too 2013-04-04 23:32:11 +02:00
Florian Staudacher
19f94fb169 Merge pull request #4095 from embs/feature/3064-add-services-explanation
Add explanation to services index page. Closes #3064
2013-04-04 12:38:50 -07:00
embs
4ef37c64be Add explanation to services index page. Closes #3064 2013-04-04 15:51:11 -03:00
Jonne Haß
92a2a9189d bump sidekiq and cleanup unicorn.rb 2013-04-04 20:42:41 +02:00
Jonne Haß
79a79d65d6 Bye Resque. Ohai Sidekiq.
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
  sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
  for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
  configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
2013-03-21 23:39:07 +01:00
Jonne Haß
3fc3b249e7 End the require mess
* Rename and reorganize post fetcher to fix autoloading, also let it use
  Faradays default connection so we get nice redirects
* Add initializer to load libs at a central place
* added lib dir to autoload_once paths to increase thread safety
* Moved lib/exceptions.rb to lib/diaspora/ to conform namespacing
2013-03-21 23:37:53 +01:00
workwareusa
8745611f33 Update diaspora.yml.example
Fixed the wording so admins know invites are either enabled or disabled, and the number of invites is set by default to 25.
2013-03-21 14:30:13 -03:00
Florian Staudacher
472649f0d7 Merge pull request #4050 from Flaburgan/patch-2
Update en.yml
2013-03-16 04:29:38 -07:00
Antoine D
fa1d0ce68e Update en.yml
Only one sentence was not in future.
2013-03-14 20:42:04 +01:00
Jonne Haß
97a8ff65ba Merge pull request #4048 from marpo60/s3_max_age
Set max-age header to Amazon S3 resources
2013-03-10 06:14:49 -07:00
Marcelo Dominguez
b950c4f171 Set max-age header to Amazon S3 resources 2013-03-08 16:07:56 -02:00
Jonne Haß
43f21d6e55 Pass the real values to stderr_path and stdout_path in unicorn.rb since it runs a case statement on them 2013-03-05 23:37:51 +01:00
Adrián Chaves Fernández (Gallaecio)
3d84467532 Updated the Galician (gl) translation. 2013-03-03 21:15:07 +01:00
movilla
76b1e9b0dc Add the ability to upload photos from the mobile site 2013-02-26 23:25:58 +01:00
Jonne Haß
ba9aee5902 update changelog; replace "pre" releases with a plain "head" 2013-02-18 20:20:50 +01:00
Jonne Haß
f3093ca8ae Merge pull request #3864 from Raven24/aspect_memberships
[WIP] aspect membership dropdown Backbone.js rework
2013-02-17 05:54:12 -08:00
Jonne Haß
1f0f9dabc1 last minute updates to french locale 2013-02-17 14:52:25 +01:00
Jonne Haß
20f6034bbb fix missing quote in javascript.ca.yml 2013-02-17 14:10:37 +01:00
Jonne Haß
3111c805de Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca into develop 2013-02-17 14:08:39 +01:00
Jonne Haß
bfc811d912 updated 112 locale files [ci skip] 2013-02-17 14:08:36 +01:00
Jonne Haß
150f03489a remove obsolete thin.yml 2013-02-17 14:02:33 +01:00
Florian Staudacher
4cbae601e8 [WIP] aspect membership dropdown Backbone.js rework
* initial backbone port
* changed AspectMembershipsController#destroy to use aspect_membership_id
* included rudimentary jasmine specs
* more specs, updating the list elements after de-/selection
* update selected aspect count on button
* don't even try to render html in AspectMembershipsController
* more specs for button summary text
* adapt aspect management on contacts page and in the popup boxes
* adapt inline creation of aspects + memberships

TODO
* more tests
2013-02-17 13:40:10 +01:00
Jonne Haß
b8128d356b Merge branch 'hotfix/0.0.2.4' into develop
Conflicts:
	Changelog.md
	app/views/people/show.html.haml
	config/defaults.yml
	spec/helpers/layout_helper_spec.rb
2013-02-01 22:24:37 +01:00
Jonne Haß
7134513b28 Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948
From a quick look at the for us available databases this was not actually used in the wild.
2013-02-01 22:20:31 +01:00
Asphyxia
6df84ed703 Fix wrong message on infinite scroll on contact page 2013-01-31 23:09:51 -03:00
Jonne Haß
cba76060bf ensure our locales are at the bottom of the load path, fixes #2614 2013-01-31 16:41:09 +01:00
fhsdi2
931e4c4f41 Fix uncapitalization of a word 2013-01-26 16:09:34 -02:00
Jonne Haß
b654fb2d02 one unicorn worker should be enough for development 2013-01-26 13:28:40 +01:00
Ruxton
40fdf3819b Added DailyMotion & Twitter oEmbeds 2013-01-25 22:31:44 +08:00
Ruxton
89042078ca Oembed Update - Added instagram, better display for rich/photo 2013-01-22 22:37:36 +08:00
Fabián Rodríguez
d7574a9efb add locale to aspects 2013-01-16 19:59:10 -02:00
Fabián Rodríguez
29c48ca557 Add ability to toggle aspects 2013-01-16 19:33:19 -02:00
Diaspora Europe
fe2a6b5f85 Write unicorn stderr and stdout log 2013-01-16 13:11:33 +01:00
Jordi Mallach
d795ed2e3e Update Catalan translation to 597ab20. 2013-01-09 01:31:58 +01:00
Jordi Mallach
56357ce0bd Updated Catalan translation to 2d3df3e. 2013-01-09 01:22:25 +01:00
Florian Staudacher
b320e50236 bump Rails to 3.2.11
see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
2013-01-09 00:09:07 +01:00
Jonne Haß
38eba6703e add Armenian pluralization rule 2013-01-03 23:32:50 +01:00
Jonne Haß
11f82c794e Bump to Rails 3.2.10 as per CVE-2012-5664
https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
2013-01-02 23:40:46 +01:00
Blaž Hrastnik
d3f5f34fa0 Load the entire lib folder refactor.
Removed hack, replaced with a proper solution.
2012-12-30 13:08:16 +01:00
Florian Staudacher
0092acd492 re-add hovercards
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
2012-12-28 22:37:13 +01:00
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00
movilla
ceace52762 Add progress percentage to upload images 2012-12-20 21:24:09 +01:00
Florian Staudacher
ff173e233c add cucumber feature for taking screenshots of important pages
- for before/after comparisons,
including rake tasks for easily generating the images from command line
2012-12-17 20:25:34 +01:00
Yury Bulka
d8dae23bc2 Fix typos, small improvements to Ukrainian translation 2012-12-09 13:55:26 +02:00
Yury Bulka
ae55f5ab9d Fixed and improved Ukrainian translation 2012-12-09 13:24:02 +02:00
Jonne Haß
2fcf729f64 don't use a rails method in a pre-rails environment 2012-12-08 00:50:30 +01:00
Jonne Haß
459df9b735 Merge pull request #3791 from movilla/suggest_member
Translation "suggest member" of Community Spotlight
2012-12-06 09:34:01 -08:00
movilla
491c2a537c Add feature contact pod admin 2012-12-06 15:26:49 +01:00
movilla
65376a604b Allow translation of "suggest member" of Community Spotlight 2012-12-06 13:15:34 +01:00
Jonne Haß
bf27cca03a Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead. 2012-11-30 18:16:56 +01:00
Jonne Haß
2a7a0b7b99 * made number of unicorn worker processes configurable
* made configuration loader indepenent of rails
* corrected mismatch between example and default config (server.db/server.database)
2012-11-30 14:00:25 +01:00
Jonne Haß
669dd87b11 extract configruation system to a gem 2012-11-30 13:35:59 +01:00
Dennis Schubert
656e52360f Remove REEs garbage collection [ci skip]
We are not using REE anymore, so...
2012-11-29 22:57:38 +01:00
Jonne Haß
7aa0726971 use file? instead of exists? to check for correct ca bundle path 2012-11-27 21:14:44 +01:00
Jonne Haß
7b548fd571 Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags
port tagFollowings to BackBone
2012-11-25 09:30:47 -08:00
rschaden
49d4079065 add email validation to invitations 2012-11-25 14:25:20 +01:00
Jonne Haß
f1aeecc00b force typhoeus (and thus curl) to use diaspora.yml's CA bundle 2012-11-21 17:28:39 +01:00
Jonne Haß
60aa1ffe2e post release version bump [ci skip] 2012-11-20 22:02:54 +01:00
Florian Staudacher
eea59b0918 Merge branch 'release/0.0.2.0'
Conflicts:
	Changelog.md
	config/defaults.yml
2012-11-20 19:11:48 +01:00
Jonne Haß
1af49a0477 updated 78 locale files [ci skip] 2012-11-20 18:54:27 +01:00
Jonne Haß
e9bccb8afe get rid of string concat of translatable strings in getting started 2012-11-18 17:24:43 +01:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
Braulio Martinez
3260bada38 Remove posts#new action from Rails and related tests 2012-11-07 23:14:35 -02:00
Dennis Schubert
ba5b779cd0 Make Devise remember the session for 2 weeks. Fix #3472 2012-11-06 22:24:57 +01:00
Besnik
1d3493909d updating sq locale 2012-11-06 19:46:51 +01:00
Jonne Haß
2a45470232 Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services
Conflicts:
	Changelog.md
	app/models/services/facebook.rb
	spec/models/services/facebook_spec.rb
2012-11-02 11:31:47 +01:00
Jason Robinson
e974d2934f Always use basic Facebook Graph API to post messages, fixes public posts. Remove unnecessary Facebook opengraph config items 2012-11-02 00:23:33 +02:00
Jonne Haß
f91ca7d650 added short description to the server section [ci skip] 2012-10-27 11:45:26 +02:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Florian Staudacher
e0d50c8522 bump version to 0.0.1.2 2012-10-24 19:54:37 +02:00
Florian Staudacher
f0eacc801b Merge pull request #3611 from MrZYX/feature/cleanup_rake_tasks
rake tasks cleanup
2012-10-21 06:33:46 -07:00
Jonne Haß
f0ef4a764e refactor script/server and associated stuff 2012-10-19 12:25:15 +02:00
Jonne Haß
811ef66b1c No need for Gentoo having its own certificate_authorities example 2012-10-13 18:53:42 +03:00
Fabián Rodríguez
40f5314184 adds password_confirmation field to registration page 2012-10-11 19:45:52 -02:00
Jonne Haß
e6ec41930b Merge branch 'hotfix/0.0.1.1' into develop
Conflicts:
	Changelog.md
	config/defaults.yml
2012-10-09 22:37:53 +02:00
Jonne Haß
3eb628c2a3 fix french javascript pluralization rule and add specs for locale loading 2012-10-09 22:36:30 +02:00
Jonne Haß
8493dfe86d post release version bump [ci skip] 2012-10-08 13:22:43 +02:00
Jonne Haß
1f9f0c2932 Changing release mode to true, hopefully the last commit ever violating the branching model. DO NOT BACKPORT THIS COMMIT TO DEVELOP 2012-10-07 15:08:21 +02:00
Jonne Haß
fdc5811e1e made hy available, temporarily switched to git release of rails-i18n to fix #3023 [ci skip] 2012-10-07 14:30:29 +02:00
Jonne Haß
bd9b4543dc updated 15 locale files [ci skip] 2012-10-07 14:19:48 +02:00
Jonne Haß
5b73176d07 make diaspora.yml.example a bit clearer about sections [ci skip]
thanks to @hfase01 for pointing that out
2012-10-01 15:43:21 +02:00
Jonne Haß
5c7a9c1ce6 Release cleanup, closes #3620
* remove un-/underused gems
* remove their associated files
* remove some parallel_tests leftovers
2012-09-30 22:26:23 +02:00
Florian Staudacher
8678c14735 Merge pull request #3589 from MrZYX/refactor_config
New configuration system, details: see changelog
2012-09-30 13:07:40 -07:00
Jonne Haß
f42c4799ac updated plural rules [ci skip] 2012-09-28 16:07:48 +02:00
Jonne Haß
468982f3cc updated 28 locale files [ci skip] 2012-09-28 16:07:37 +02:00
Jonne Haß
d04d6faab7 correct dumb typo in diaspora.yml.example 2012-09-28 14:54:45 +02:00
Jonne Haß
a0d60e7333 Remove unused rake tasks, make cumber rake file the vanilla one 2012-09-27 17:07:33 +02:00
Jonne Haß
234b76a936 properly integrate asset_sync 2012-09-26 20:23:45 +02:00
Jonne Haß
e05c6e8897 drop heroku, heroku_san and associated rake tasks and files 2012-09-26 20:21:20 +02:00
Jonne Haß
ce728f6b7b add possibility to embed a resque worker into the unicorn process 2012-09-26 20:19:38 +02:00
Jonne Haß
2a4db54db9 New configuration system
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
2012-09-26 20:19:37 +02:00
Jonne Haß
1277cf92b2 refactor ci scripts 2012-09-23 19:00:52 +02:00
Jonne Haß
0a1be1400d Merge pull request #3603 from movilla/translation_ignore_user_popup
traslation popup ignore user => /stream
2012-09-22 13:47:34 -07:00
movilla
812fce7181 traslation popup ignore user /stream 2012-09-22 22:07:17 +02:00
Jonne Haß
24c1c908f7 remove routes to removed controller 2012-09-22 14:16:28 +02:00
Jonne Haß
6c1a1ec6d2 it's enviroNment 2012-09-15 18:52:12 +02:00
Jonne Haß
48dcccf7b3 Unify redis initialization
REDISTOGO_URL is now deprecated in favor of REDIS_URL which is supported by the redis gem too.
2012-09-15 18:23:22 +02:00
Jonne Haß
3e935e1104 use present to check if redis_url is empty 2012-09-12 22:30:08 +02:00
Jonne Haß
70a9218ea5 add thread_safe true to redis initialization because resque does it too now 2012-09-12 22:17:14 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +02:00
Jonne Haß
ab0ad630df strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep 2012-09-12 05:48:12 +02:00
Jonne Haß
51bde9bf66 updated 8 locale files [ci skip] 2012-09-11 18:40:54 +02:00
Jonne Haß
a9ebe42b9f turn mailer on in test env so the stubs can take action 2012-09-07 22:12:07 +02:00