Jason Robinson
356096a7eb
Merge pull request #4836 from MrZYX/message_renderer
...
Introduce message renderer
2014-04-13 15:00:46 +03: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
goobertron
5556420740
Fix missing translation in #4905 .
2014-04-05 17:06:40 +01:00
Jannik Streek
6f3844b73b
fixed language files, added rails cache counter for poll answer, fixed bug with same poll input for form
2014-03-31 18:14:08 +02:00
Jannik Streek
a9843ae996
added cucumber tests, updated spec with xml class test
2014-03-31 18:14:07 +02:00
Jannik Streek
7dcf11e629
fixed federation bug due to roxml missing underscore
2014-03-31 18:14:07 +02:00
Jannik Streek
12fabe2fb9
finalized voting design + some design fixes + improved code
2014-03-31 18:14:07 +02:00
Jannik Streek
d0a77ce6b3
design for poll participation implemented, saving works as well
2014-03-31 18:14:07 +02:00
Jannik Streek
04199837b3
poll creation done
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
Steffen van Bergerem
f217a5bc11
Add filters to notifications controller
2014-03-19 17:54:22 +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
e0b23b2dc4
Fixed #4726 infinite photo stream
2014-03-12 22:22:24 +00:00
Fabian Rodriguez
9fc70a03a9
remove unused variable
2014-02-23 16:48:47 +01:00
Fabian Rodriguez
8d8d3c649a
remove aspect sorting logic
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
Ruxton
c8a0c81b6a
Updating queries for the stream to be faster
2014-02-07 14:23:19 +08:00
Steffen van Bergerem
3d4bdfb665
Drop number of followers from tags page
2014-01-21 14:49:05 +01: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
Dennis Schubert
6fc5ccb9f9
Merge pull request #4511 from MrZYX/bump_devise
...
update devise to 3.2
2014-01-15 13:17:48 -08: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
Ivan Zotov
a4ce6e267a
Fix after_create to after_commit
2014-01-14 22:35:29 +04: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
Jason Robinson
e665ebdab1
Fix posting to Twitter by correctly catching over limit exception ( #4627 ). Also when doing a retry, make smaller cuts to max characters
2013-12-15 22:01:09 +02: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
Florian Staudacher
1c4ad0986c
refactor message creation (conversations)
2013-10-20 22:46:53 +02:00
Florian Staudacher
830747a11e
refactor conversations_controller#create
2013-10-10 21:42:46 +02:00
Jonne Haß
eea9467846
refactor twitter service model
2013-09-30 10:13:14 +02:00
Florian Staudacher
260d86d501
refactor ConversationsController, move query builing to User model
2013-09-30 01:44:57 +02:00
Florian Staudacher
e614562470
avoid publishing empty posts ( fixes #4401 )
...
invalidate empty posts when created by a local user
add changelog entry
2013-09-24 21:57:22 +02:00
Oliver Azevedo Barnes
c5a1078f45
Moved account_deleter as well, same tests break
2013-08-13 18:37:51 -05:00
Oliver Azevedo Barnes
7214dc184d
Remove namespacing from federation libs recently migrated from app/models/
2013-08-13 18:23:05 -05:00
Oliver Azevedo Barnes
1c9d65e94c
WIP refactor namespacing for federation libs, into Diaspora::Federated
2013-08-12 13:10:38 -05:00
Oliver Azevedo Barnes
5564644306
WIP
2013-08-12 13:10:38 -05:00
Oliver Azevedo Barnes
689abfb49c
Move non-model federation stuff into lib/
2013-08-12 13:10:38 -05:00
Jonne Haß
f4169d7f30
Merge pull request #4384 from andrewcsmith/bug/4211-twitter-should-not-cut-links
...
Fixed problem where the add_post_link method would truncate the status update in the middle of a link
2013-08-11 00:25:12 +02:00
Andrew Smith
65a14ccc2c
Fixed problem where the add_post_link method would truncate the status update in the middle of a link. This led to sending Twitter broken links.
...
Refactored :extract_truncated_link method
Removed complicated while loop in avoiding cutting off links, using refactoring from MrZYX
2013-08-10 14:40:53 -07:00
Jonne Haß
948939cd30
Merge pull request #4381 from goobertron/4380-facebook-count
...
Updated Facebook character limit.
2013-08-10 21:40:44 +02:00
goobertron
8bffdb873a
Updated Facebook character limit.
2013-08-10 00:18:49 +01:00
