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

593 commits

Author SHA1 Message Date
Jason Robinson
bd4dea608a Merge branch 'hotfix/0.4.0.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-06-24 22:08:07 +03:00
Jason Robinson
90dd5d3868 Bump to 0.4.0.1 2014-06-24 22:01:12 +03:00
Jason Robinson
c475a3985e start new development cycle 2014-06-22 19:32:23 +03:00
Jason Robinson
51ecae1b77 bump to 0.4.0.0 2014-06-22 19:01:31 +03:00
Jonne Haß
b7d310f318 Merge pull request #5012 from goobertron/changelog 
Update changelog

Conflicts:
	Changelog.md
 2014-06-22 15:03:23 +02:00
goobertron
184f6225df Update changelog to reference fixes rather than bug reports, fix couple of typos. 2014-06-22 13:34:31 +01:00
Jason Robinson
e4e9f40b2c Revert "Fix toggling services for mobile bookmarklet" 
This fixed the toggling of services, but broke the actual
bookmarklet :)

This reverts commit 1bd7989045.
 2014-06-19 21:47:34 +03:00
Jason Robinson
1bd7989045 Fix toggling services for mobile bookmarklet 2014-06-02 23:29:47 +03:00
Jonne Haß
553a5258a8 Merge pull request #4968 from taratatach/4967-use-https-for-osm-locator 
Use https to load the location from OSM
 2014-05-26 20:11:49 +02:00
Jonne Haß
77133a4062 Merge pull request #4963 from Ruxton/feature/rake_task_to_run_account_deletion_fixes_4792 
Rake task for running outstanding account deletions
 2014-05-24 18:03:10 +02:00
Jonne Haß
a3bfc4e92d Add changelog entry for #4758 [ci skip] 2014-05-24 17:58:20 +02:00
Jonne Haß
cbd9c56a7a Merge pull request #4919 from hpetru/4776-mention-on-mobile 
Unescape text before add mention, this commit solve #4776

Conflicts:
	Changelog.md
 2014-05-24 17:34:29 +02:00
Jonne Haß
63c44d9f6b Merge pull request #4781 from Zauberstuhl/report_feature 
It is now possible to report posts and comments
 2014-05-15 19:53:44 +02:00
Oliver Azevedo Barnes
aec0c700b3 Add account_deleter.rb to load_libraries initializer 2014-05-07 14:36:18 -05:00
Hincu Petru
e699a682f4 Unescape text before add mention, this commit solve #4776 2014-05-06 12:13:43 +00:00
Florian Staudacher
95efbfa9c9 add changelog for #4932 [ci skip] 2014-05-06 14:06:50 +02:00
Steffen van Bergerem
232e4fa236 Improve set read/unread in notifications dropdown 2014-04-16 23:33:22 +02:00
Jason Robinson
b64e418020 Merge pull request #4810 from svbergerem/notifications-no-auto-mark-as-read 
Remove auto 'mark as read' in notifications dropdown
 2014-04-16 21:56:53 +03:00
Steffen van Bergerem
e1685c9a29 Remove auto 'mark as read' for notifications 2014-04-15 14:51:38 +02:00
Gabriel Lima
f6c0648a55 bug #4832 - send the rspec test and changelog 2014-04-15 09:23:58 -03:00
flaburgan
a4886fa77b SPV: Improve padding and interaction counts 2014-04-13 11:27:12 +02:00
Jason Robinson
ee3a9f9be0 Merge pull request #4912 from goobertron/settings 
Reorder items on settings page and improve wording
 2014-04-12 21:37:52 +03:00
Jason Robinson
6947a1945c Merge pull request #4883 from MrZYX/uuid 
Use uuids for guid generation
 2014-04-11 16:40:57 +03:00
Jonne Haß
66c511197c Merge pull request #4917 from hpetru/4806-new-status_messages-page 
Redirect to stream_path if is destkop
 2014-04-08 13:45:04 +02:00
goobertron
63abe9055b Reorder items on settings page and improve wording 
Update cukes to be text-independent
Update changelog
 2014-04-08 00:28:25 +01:00
Jonne Haß
5a60cb72bf Merge pull request #4899 from hpetru/poll-in-post-preview 
Add poll in post preview
 2014-04-04 14:12:13 +02:00
Jonne Haß
be19c2f104 Merge pull request #4897 from hpetru/update-poll-view-in-stream 
I update design for poll in post stream
 2014-04-04 09:54:06 +02:00
Jonne Haß
9eb2339368 Merge pull request #4894 from hpetru/4893-poll-in-spv 
Add poll for single post view
 2014-04-03 20:36:34 +02:00
Jonne Haß
211963d320 Merge pull request #4889 from hpetru/4874-malformed-url 
Catch error from decodeURI for prevent crash in posts parsing
 2014-04-01 00:49:27 +02:00
Jannik Streek
167884e565 added changelog pull link 2014-03-31 18:14:08 +02:00
Jannik Streek
a3837a4f19 added changelog entry 2014-03-31 18:14:07 +02:00
Jonne Haß
0ea53aa5ed Merge pull request #4882 from hpetru/4868-mention-inside-tags 
4868 mention inside tags
 2014-03-31 12:06:39 +02:00
Jonne Haß
98057885ac use uuids for guid generation 2014-03-30 15:38:18 +02:00
Jonne Haß
07aec2a630 Merge branch 'hpetru-4864-ui-bug-when-tag-is-long' into develop 2014-03-30 13:39:32 +02:00
Jonne Haß
3a91061d4f Merge pull request #4708 from goobertron/opengraph_link_fix 
Opengraph link fix (issue #4492)
 2014-03-30 11:15:29 +02:00
Jonne Haß
1b70f6fe09 Replace .rvmrc by .ruby-version 
Also relax the requirement. The .ruby-version represents
merely a recomendation for the Ruby version. The incompability
issues in the Ruby world are far less currently, than they were
when we introduced strict version enforcement. Thus strict
enforcement is no longer appropiate. Same holds for RubyGems.

This implicity also removes the recomendation on using RVM.
The .ruby-version file is supported by all major Ruby version
managers. Gemsets are no longer a needed feature since Bundler
handles multiple concurrrently installed Gems just well.
 2014-03-24 15:33:29 +01:00
Jonne Haß
ab15bad53f Merge pull request #4858 from hincupetru/4514-clicking-show-more-comments-empties-textarea 
Save textarea value before rendering comments when clicked 'show more....'
 2014-03-24 14:56:45 +01:00
Steffen van Bergerem
cd241ee94d Hovercards! Everywhere! 2014-03-23 01:15:26 +01:00
Steffen van Bergerem
4fc9c6416e Port notifications to Bootstrap 2014-03-19 18:45:52 +01:00
Steffen van Bergerem
f217a5bc11 Add filters to notifications controller 2014-03-19 17:54:22 +01:00
Hincu Petru
1cef3e42ce I save textarea value before rendering comments when clicked 'show more..' 2014-03-19 12:36:04 +00:00
Jonne Haß
835608f06f Merge pull request #4856 from hincupetru/3692-hashtags-inside-markdown-link 
Check if the hashtag is a link in function .hashtagify
 2014-03-16 14:39:20 +01:00
Jonne Haß
cfca0e88f1 Revert "Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link" 
This reverts commit 06ab498620, reversing
changes made to 3c4d8d95d3.

Conflicts:
	Changelog.md
 2014-03-15 21:08:54 +01:00
Jonne Haß
f2fedea3db Merge pull request #4853 from hincupetru/4693-notifications-hovercard-avatars-misaligned 
Fixed "hovercard avatars misaligned in notifications drop-down"
 2014-03-15 19:15:08 +01:00
Jonne Haß
06ab498620 Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link 
Solved problem with hashtags inside markdown links
 2014-03-15 19:12:37 +01:00
Jonne Haß
3c4d8d95d3 Merge pull request #4794 from Flaburgan/improve-search-page 
Add handle indication on search page, improve design
 2014-03-15 19:09:42 +01:00
Jonne Haß
d4e046ecbc Merge pull request #4787 from hincupetru/4726-infinite-photo-stream 
Added limit by max_time to photos#index for prevent "infinite photo stream"
 2014-03-15 19:07:48 +01:00
flaburgan
027650e856 Add handle indication on search page, improve design 2014-03-13 23:01:42 +01:00
Jonne Haß
11603f5496 Merge pull request #4843 from svbergerem/4228-hovercards-same-pod 
Show hovercards in the notification drop-down for users on the same pod

Conflicts:
	Changelog.md
 2014-03-11 21:50:33 +01:00
MatrixCrawler
3273028ed2 Fix atom feed for reshares of deleted posts. 
Propose for fix #4638

Added Changelog line

Added Specs for testing if the reshared origin post is deleted and therefore not shown in the atom feed
 2014-03-11 21:27:08 +01:00
Steffen van Bergerem
aefcfc7b30 Show hovercards in the notification drop-down for users on the same pod 2014-03-11 20:44:28 +01:00
Steffen van Bergerem
0cc3b10b1f port publisher and bookmarklet to bootstrap 2014-03-10 15:15:40 +01:00
Jonne Haß
bd24cb71a4 Fix plaintext mode for mentionable 
Also slight refactors to it.
 2014-03-09 14:02:15 +01:00
Jonne Haß
4fce682635 Merge pull request #4834 from Faldrian/atomfeedtohtml 
atom-feed content changed to html, use better post-title extractor
 2014-03-09 01:13:38 +01:00
Jonne Haß
a1c222dd23 Merge pull request #4681 from diaspora/upgrade_to_jquery_10 
Upgrade to jquery 10
 2014-02-24 10:29:08 +01:00
Jason Robinson
5fe5507128 Add devise_lastseenable for user last seen tracking. 
Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734
 2014-02-22 23:22:46 +02:00
Jason Robinson
f54931c813 Put #4799 changelog to correct place 2014-02-21 21:51:18 +02: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
Jason Robinson
d7748718f7 Merge pull request #4793 from Flaburgan/refactor-right-side-bar 
Refactor right side bar, see you, BRs.
 2014-02-21 20:27:02 +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
flaburgan
16309dc832 Remove the limit to 8 pictures in the view 2014-02-21 01:31:12 +01:00
flaburgan
a7c7e4b1e3 Refactor right side bar, see you, BRs. 2014-02-20 13:01:07 +01:00
Jonne Haß
57991187d1 Merge branch 'hotfix/0.3.0.3' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-02-19 11:31:02 +01:00
Jonne Haß
1df3f546c9 update rails to 3.2.17 2014-02-19 11:09:06 +01:00
Jason Robinson
283e06bd26 Merge branch 'hotfix/0.3.0.2' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-02-18 22:13:52 +02:00
Jason Robinson
d6d97c17b0 Changelogs for 0.3.0.2, changelog for #4714 2014-02-15 17:04:18 +02:00
Steffen van Bergerem
ab9e7d8035 fix hovercards 
(cherry picked from commit a51c4f0ddc)

Conflicts:
	Changelog.md
 2014-02-15 16:58:12 +02:00
Steffen van Bergerem
a51c4f0ddc fix hovercards 2014-02-15 14:09:03 +01:00
Jonne Haß
adf6c3c009 Merge pull request #4775 from dash-rai/move-mentions-input-plugin 
Moved jquery.mentionsInput plugin
 2014-02-10 21:12:12 +01: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ß
3e3979cc28 Merge pull request #4656 from svbergerem/conversations-add-participants 
Add participants to conversations menu
 2014-02-09 20:20:47 +01:00
Jonne Haß
141438a33e add changelog entry for #4768 [ci skip] 2014-02-09 20:08:23 +01:00
Steffen van Bergerem
a2b3917505 Add participants to conversations menu 2014-02-09 19:55:10 +01:00
goobertron
23e8bfa082 Update JQuery source to jquery.com 2014-02-09 17:36:35 +00:00
Jonne Haß
11b3fe7df4 Merge pull request #4673 from Flaburgan/drawer-scrollable 
New menu for the mobile version
 2014-02-09 18:06:43 +01: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
Jonne Haß
a462c84fae Merge branch 'goobertron-rename_messages' into develop 2014-02-09 15:45:15 +01:00
Jonne Haß
17754f1da8 Merge pull request #4747 from Raven24/fix_aspect_stream 
fix regression caused by updating backbone.js in aspect stream
 2014-02-09 15:38:35 +01:00
Jonne Haß
976b21ab05 Merge pull request #4702 from goobertron/new_logos 
Updated image branding (issue #4444)
 2014-02-09 14:47:40 +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
Steffen van Bergerem
97f1c286f4 improve reshared posts 2014-01-31 22:48:40 +01:00
Steffen van Bergerem
0f156cd9a4 Remove unused beta code 2014-01-24 09:01:30 +01:00
Jonne Haß
0b15e66d06 Merge pull request #4577 from svbergerem/2302-permalink-comments 
[Ready to review & merge] Add permalinks for comments

Conflicts:
	app/assets/stylesheets/application.css.sass
 2014-01-22 11:24:42 +01:00
Steffen van Bergerem
3d4bdfb665 Drop number of followers from tags page 2014-01-21 14:49:05 +01:00
Jason Robinson
590778502d Merge branch 'hotfix/0.3.0.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-01-20 23:40:58 +02:00
Florian Staudacher
0c5c17f5e2 fix regression in conversations causing an infinite recursion (fix #4715) 
(cherry picked from commit 5c059b2925)

Conflicts:
	Changelog.md
 2014-01-20 23:39:19 +02:00
Florian Staudacher
5c059b2925 fix regression in conversations causing an infinite recursion (fix #4715) 2014-01-20 22:00:26 +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
Jonne Haß
0e291fd9c4 Merge pull request #4281 from Ruxton/feature/use_rails_timeago_gem_instead_of_vendored_js 
Switched to using rails-timeago to make keeping on top of new versions o...
 2014-01-20 09:57:10 +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
flaburgan
565aba5036 Add gems upgrade in the changelog 2014-01-19 20:58:17 +01:00
Steffen van Bergerem
20e1626453 add permalinks for comments 2014-01-17 22:11:17 +01: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
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
Steffen van Bergerem
580068ed7c Remove background from badges in header 2014-01-14 15:00:36 +01:00
Jonne Haß
42f790fa13 Merge pull request #4666 from jaywink/signup-form-error-redirect 
Instead of redirect on signup form validation, render new
 2014-01-11 14:08:18 -08:00