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

3483 commits

Author SHA1 Message Date
Florian Staudacher
0d51bba959 port bookmarklet to Backbone.js, use gon for params (fixes #4931) 2014-04-19 17:41:21 +02:00
Gabriel Lima
f6c0648a55 bug #4832 - send the rspec test and changelog 2014-04-15 09:23:58 -03:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer 
Introduce message renderer
 2014-04-13 15:00:46 +03:00
Hincu Petru
2311b761e1 Redirect to stream_path if is destkop 2014-04-08 09:34:14 +00:00
Jonne Haß
682a49605e Merge pull request #4910 from hpetru/rewrite-poll-creator 
Rewrite poll creation inputs
 2014-04-06 22:27:01 +02:00
Jannik Streek
095d616198 fixed federation issue due to missing delegation + test + some minor tweaks 
fixed indenting

renamed test
 2014-04-06 20:58:58 +02:00
Hincu Petru
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +00:00
Hincu Petru
2ae4d41db3 Fixed 4903 and not render vote form when user is not logged 2014-04-05 14:29:07 +00:00
Hincu Petru
6c00db23cd I update design for poll in post stream 2014-04-03 20:57:14 +00:00
Hincu Petru
cee90e737c Make poll to be compatible with bootstrap 2014-04-03 09:03:54 +00:00
Hincu Petru
fed5ea8cda Refactored poll_view.js 2014-04-02 16:19:07 +00: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
Hincu Petru
552310796c Catch error from decodeURI for prevent crash in posts parsing 2014-03-31 20:24:47 +00:00
Jannik Streek
2d0abbae23 added jasmine test for poll view 2014-03-31 18:14:07 +02:00
Jannik Streek
dde39aa1bb added jasmine publisher tests 2014-03-31 18:14:07 +02:00
Jannik Streek
a9843ae996 added cucumber tests, updated spec with xml class test 2014-03-31 18:14:07 +02:00
Jannik Streek
95d98ff2b6 improved code for poll participation 2014-03-31 18:14:06 +02:00
Jannik Streek
c02414c36d fixed wrong indenting and broken messages tab for polls 2014-03-31 18:14:06 +02:00
Jannik Streek
8a4f833d1d added more tests for the poll federation + fixed broken rspec tests 2014-03-31 18:14:06 +02:00
Jannik Streek
5d560609e4 poll_participation_spec no longer fails, added poll_participation factory 2014-03-31 18:14:06 +02:00
Jannik Streek
fe67bdf2e7 added tests for poll federation and impl for the federation itself. Still in progess 2014-03-31 18:14:06 +02:00
Jannik Streek
dfbe17d046 Poll input fields and data model now available 
question field of poll now in db

fixed merge issues
 2014-03-31 18:14:06 +02: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
4fc9c6416e Port notifications to Bootstrap 2014-03-19 18:45:52 +01:00
Steffen van Bergerem
eabdc7390c Port aspect membership dropdown and hovercards 2014-03-19 17:54:22 +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
Hincu Petru
694dc7d80b Check if the hashtag is a link in function .hashtagify 2014-03-16 11:59:49 +00: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ß
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ß
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
Jonne Haß
8280556a47 Introduce message renderer 
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
 2014-03-15 17:16:17 +01:00
Hincu Petru
7c4d783d51 Check if the hashtag is a link in function .hashtagify 2014-03-14 15:49:41 +00:00
Hincu Petru
e0b23b2dc4 Fixed #4726 infinite photo stream 2014-03-12 22:22:24 +00: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
0241d9c7db use fixture 2014-03-10 17:21:54 +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
Florian Staudacher
a2aff720a2 clear locale on each spec run, fix indentation 2014-02-23 17:13:01 +01:00
Florian Staudacher
dc1c156175 try to appease CI 2014-02-23 16:48:48 +01:00
Florian Staudacher
69a1718d08 fix comment spec, jasmine should be ok now 2014-02-23 16:48:48 +01:00
Florian Staudacher
e3b22ed95c fix likes spec 2014-02-23 16:48:47 +01:00
Florian Staudacher
b27edcb2d1 fix search specs 2014-02-23 16:48:47 +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
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
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ß
2e8dc8fb61 move PasswordsController specs to the new appropiate location 2014-02-10 10:18:20 +01:00