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

3490 commits

Author SHA1 Message Date
Benjamin Neff
804784ed3f fix @pod_uri/@pod_url and add url_to to AppConfig 2015-07-14 05:50:26 +02:00
Benjamin Neff
f875be8d5b use federation-gem for webfinger/hcard generation 
remove old webfinger/hcard generation code

this fixes #5143
 2015-07-14 05:50:26 +02:00
Dennis Schubert
6b6bf84598 Merge pull request #6151 from SuperTux88/federation-gem 
Federation Gem Step 1: Webfinger/HCard generation
 2015-07-12 17:02:23 +02:00
Benjamin Neff
94fc378eb7 fix @pod_uri/@pod_url and add url_to to AppConfig 2015-07-11 11:19:42 +02:00
Jonne Haß
397845161f Merge pull request #6162 from cmrd-senya/5684-public-additional-profile 
Allow additional profile fields (previously private profile) to be set public (new updated version)
 2015-07-11 10:19:19 +02:00
cmrd Senya
7a5a0a909a Allow extended profile fields (previously private profile) to be set public (#5684). 
This adds a new boolean field "public_details" to person model.
By default it is false and represents old behaviour. When it is
set to true, extended profile (bio,location,gender,birthday)
get available to people who didn't log into diaspora and to
people you don't share with (i.e. it is made public).

In UI, a bootstrap-switch added on the profile-edit page in order to
change the setting.

This also changes wording from public/private profile to basic/extended.
The latter could be public and limited.
 2015-07-11 04:36:45 +03:00
Benjamin Neff
46a22fefe9 use federation-gem for webfinger/hcard generation 
remove old webfinger/hcard generation code

this fixes #5143
 2015-07-10 01:46:48 +02:00
Jonne Haß
18c1dcc26a Merge branch 'stable' into develop 2015-07-09 09:02:11 +02:00
Benjamin Neff
2df4a1cc5c add logfile-appender in test environment 
closes #6175
 2015-07-09 09:02:04 +02:00
Jonne Haß
6b240199a8 Merge branch 'stable' into develop 2015-07-04 10:48:42 +02:00
Johan
1e0d81190b updating es-VE locale 
closes #6165
 2015-07-04 10:48:35 +02:00
Steffen van Bergerem
9c4f80346b Use entypo-rails mappings 2015-07-03 15:31:29 +02:00
Jonne Haß
188e554b7b Merge branch 'stable' into develop 2015-06-21 20:48:57 +02:00
fap
1061e101fd Adds welcome message on registration Welcome message is only send out if podmin account is defined and welcome message is enabled in the config. 
This also enables the podmin account to send messages
to any local user.

closes #6128
 2015-06-21 20:48:48 +02:00
fap
073f028f88 Adds welcome message options to config 2015-06-21 20:48:20 +02:00
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +02:00
Steffen van Bergerem
078e7a722f Merge branch 'stable' into develop 2015-06-19 21:30:15 +02:00
SansPseudoFix
cce5a98537 Add link to pod statistics in right navigation 
closes #6117
 2015-06-19 21:29:25 +02:00
fla
a7d88adde1 Improve services setting translation 2015-06-18 20:36:18 +02:00
Flaburgan
3e4b8500a4 Refactor Account settings page with bootstrap grid 2015-06-18 17:26:31 +02:00
Steffen van Bergerem
b3a5e92eca Remove all faceboxes 2015-06-15 14:09:24 +02:00
Jonne Haß
8a6706337a Merge branch 'stable' into develop 2015-06-15 13:47:01 +02:00
Benjamin Neff
beb06bc42d precompile images from facebox gem 
regression from #6005

closes #6105
 2015-06-15 13:46:07 +02:00
fla
44a12e74b1 Improve mobile conversation design 2015-06-15 12:32:03 +02:00
Jonne Haß
15aa40631e Merge pull request #6104 from svbergerem/jquery-autosize 
Replace jquery.autoresize with autosize
 2015-06-14 22:20:35 +02:00
Steffen van Bergerem
92a3dd53f0 Replace jquery.autoresize with autosize 2015-06-14 20:03:15 +02:00
Jonne Haß
1dee08843b Merge branch 'stable' into develop 2015-06-14 17:42:00 +02:00
Jonne Haß
5a63d201a3 Merge branch 'release/0.5.1.0-RC' into stable 2015-06-14 17:41:42 +02:00
Jonne Haß
7052f2a63b updated 12 locale files [ci skip] 2015-06-14 17:40:55 +02:00
Jonne Haß
1be1bec9c9 Merge branch 'stable' into develop 2015-06-09 22:55:23 +02:00
Benjamin Neff
ce380d78c9 make sql and federation debug-logging configurable 
by default both are disabled now, you can enable them in the
diaspora.yml if you need them.

closes #6090
 2015-06-09 22:55:16 +02:00
Jonne Haß
38b32ca2c4 updated 73 locale files [ci skip] 2015-06-09 05:51:16 +02:00
Jonne Haß
aeeb6570d3 Merge branch 'stable' into develop 2015-06-08 13:52:53 +02:00
Jonne Haß
dd1cea9665 Merge branch 'release/0.5.0.0-RC' into stable 2015-06-08 13:52:42 +02:00
Jonne Haß
baafa9c51b updated 73 locale files [ci skip] 2015-06-08 13:51:17 +02:00
Dennis Schubert
b80785e06e Update Changelog for the upcoming 0.5.2.0 2015-06-08 04:32:29 +02:00
Dennis Schubert
ad52eaf6d7 Merge branch 'stable' into develop 2015-06-08 04:09:57 +02:00
Jan Berdajs
ec4e7b4a69 upgrade Twitter gem - fixes Faraday deprecation warning 2015-06-08 04:08:02 +02:00
efstrian
69c3a4100d Issue #4297: Color themes can override bootstrap variables 2015-06-07 19:58:54 +03:00
efstrian
d64ea15891 Issue #4297: Style fixes - Default theme is configurable 2015-06-07 19:58:14 +03:00
dimana
31d760867c Issue #4297: Updated color themes and testing 2015-06-07 19:57:37 +03:00
efstrian
57d766346c Issue #4297: Enable color theme setup 2015-06-07 19:57:16 +03:00
Jonne Haß
63554e222d Fix production override for listen setting 2015-06-04 22:03:07 +02:00
Steffen van Bergerem
676c0ab611 Add missing translation for lock account 2015-06-04 18:05:44 +02:00
Augier
207b6c6153 Port to Bootstrap 3 
correcting images display on stream sidebar

Corrections on profile page
 2015-06-04 18:05:43 +02:00
Dennis Schubert
b41007fae7 Merge branch 'stable' into develop 2015-06-04 04:18:34 +02:00
Benjamin Neff
b6c46b3fc4 add logging mixin and replace federation-logger 2015-06-04 04:16:03 +02:00
Dennis Schubert
0fdf624690 Merge branch 'stable' into develop 
[ci skip]
 2015-06-02 02:47:28 +02:00
Jason Robinson
d2e0b3ceae Fix Facebook scopes for cross-posting 
Facebook deprecated their v1.0 API and thus the old ones no longer work (for new authorizations).

closes #6019 [ci skip]
 2015-06-02 02:47:20 +02:00
Jonne Haß
c85fe3872e Replace DB environment variable with optional bundler groups 
See the changes to the changelog for more details
 2015-05-29 01:33:12 +02:00
Sandip Trivedi
36d6c5d2ba Remove unnecessary initializer and comments in Gemfile and add explicit rubyzip gem version in Gemfile with description 
closes #6001
 2015-05-28 11:24:30 +02:00
Sandip Trivedi
2ba2ef1b9c Replaces the zipzip gem with the rubyzip gem 2015-05-28 11:23:57 +02:00
Dennis Schubert
d34878df55 Merge branch 'stable' into develop 2015-05-28 01:26:53 +02:00
Benjamin Neff
5655eead7c make the logrotation configurable 
closes #5994
 2015-05-28 01:26:48 +02:00
Dennis Schubert
d4312fbaba Merge branch 'stable' into develop 2015-05-26 03:08:01 +02:00
Benjamin Neff
4f2ee11158 split eye output in 2 logfiles and forward stdout to terminal in dev mode 
closes #5989
 2015-05-26 03:06:42 +02:00
Dennis Schubert
aae11e07ae Merge branch 'stable' into develop 2015-05-25 04:23:33 +02:00
Benjamin Neff
b491ecac31 wrap the sidekiq logger to add the context info again 
closes #5988
 2015-05-25 04:23:28 +02:00
Dennis Schubert
f9f73f56db Merge branch 'stable' into develop 2015-05-25 04:18:46 +02:00
Jason Robinson
7c0e50c2c2 Introduce 'authorized' configuration option for services 
Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service.
This flag allows either all users, one user or no users to use the cross-posting service.

Clarifies the situation for #5923, #5260 and #5085.

closes #5985
 2015-05-25 04:18:38 +02:00
Dennis Schubert
70dc4fcab1 Merge branch 'stable' into develop 2015-05-22 02:53:55 +02:00
Benjamin Neff
be3b2852be use logging-logger for sidekiq 
closes #5975
 2015-05-22 02:53:50 +02:00
Benjamin Neff
ac96232d85 use logging gem for better logging with class name and log-level 2015-05-22 02:53:19 +02:00
Benjamin Neff
49f0fb6dcd replace silence_assets.rb with quiet_assets gem 2015-05-22 02:53:19 +02:00
Jonne Haß
ebe0c76040 Listen to unix socket in production by default 2015-05-21 17:23:36 +02:00
Jonne Haß
898e8d5912 Remove deprecated port setting 2015-05-19 11:07:03 +02:00
Dennis Schubert
6a1ec27b3c Merge branch 'stable' into develop 2015-05-19 02:58:41 +02:00
Steffen van Bergerem
ceec5084af Use case insensitive unconfirmed email 
closes #5967
 2015-05-19 02:58:37 +02:00
Dennis Schubert
00cb87ce11 Merge branch 'stable' into develop 2015-05-19 02:55:36 +02:00
Jonne Haß
4bde00177c replace foreman with eye 
closes #5966
 2015-05-19 02:55:31 +02:00
Jonne Haß
a21de8b190 Make listen directive for Unicorn configurable 2015-05-19 02:55:01 +02:00
Dennis Schubert
3ae370780c Merge branch 'stable' into develop 2015-05-16 03:42:18 +02:00
Akash Agrawall
8c7aa38aba Indicates in the setting that the email is not visibile to the other users #5315 2015-05-16 03:41:52 +02:00
Jonne Haß
b6cbb17d83 Merge branch 'stable' into develop 2015-05-12 14:20:09 +02:00
goobertron
2668c487e7 Remove dupe line from en.yml [ci skip] 
closes #5951
 2015-05-12 14:20:03 +02:00
Dennis Schubert
aac0a2582e Merge branch 'stable' into develop 2015-05-12 04:00:12 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags 
closes #5945
 2015-05-12 04:00:07 +02:00
Dennis Schubert
3f3148af2c Merge branch 'stable' into develop 2015-05-10 02:00:41 +02:00
Steffen van Bergerem
0c5443d543 Make js-routes use compact and camelcase function names 
closes #5941
 2015-05-10 02:00:30 +02:00
Steffen van Bergerem
1428369849 Mobile: Add button to follow/unfollow tags 2015-05-10 01:59:50 +02:00
Jonne Haß
ddf1b6ea8b Merge branch 'stable' into develop 2015-05-07 22:08:30 +02:00
Jonne Haß
f0d51e24b8 Fix invalid setting calls in config/unicorn.rb 
* .present? is an AS extension that isn't loaded at this point
* single_process_mode is defined in environment, not at the toplevel
 2015-05-07 22:07:22 +02:00
Dennis Schubert
b05d183f91 Merge branch 'stable' into develop 2015-05-07 04:10:28 +02:00
Steffen van Bergerem
06e6e1db78 Remove private post content of also commented mails 
merges #5931
 2015-05-07 04:10:21 +02:00
Dennis Schubert
642c4597e1 Merge branch 'stable' into develop 2015-05-07 04:03:57 +02:00
Jonne Haß
a7699c2a2c Update configurate and enable missing key exceptions 
closes #5934
 2015-05-07 04:03:43 +02:00
Jonne Haß
4612937787 Merge branch 'stable' into develop 2015-05-06 23:56:23 +02:00
Jonne Haß
166a152dc0 Merge branch 'master' into stable 2015-05-06 23:53:52 +02:00
Jonne Haß
51918a798a bump to 0.5.0.1 2015-05-06 23:52:40 +02:00
Dennis Schubert
d27061d5d6 Set captcha length correctly, fix #5932 2015-05-06 23:51:28 +02:00
Dennis Schubert
17fbbeea69 Merge branch 'stable' into develop 2015-05-04 23:43:58 +02:00
Jonne Haß
f1c75e6a54 Bump open_graph_reader 
It now returns the origin for a missing og:url
 2015-05-04 23:43:53 +02:00
Dennis Schubert
9db8cea504 Merge branch 'stable' into develop 2015-05-04 04:42:20 +02:00
efstrian
63be9d57b6 Issue #5884: Added link to diasporafoundation.org to invitation email (en) 2015-05-04 04:42:08 +02:00
Jonne Haß
4fad5041cf update changelog and version for 0.6.0.0 2015-05-04 00:47:36 +02:00
Jonne Haß
db08cec9c0 update changelog and version for 0.5.1.0 2015-05-04 00:41:55 +02:00
Jonne Haß
69842b84a4 Merge branch 'master' into develop 2015-05-03 15:48:42 +02:00
Jonne Haß
8e2278b80d Merge branch 'release/0.5.0.0-RC' into develop 2015-05-03 15:43:55 +02:00
Jonne Haß
260a10b2f2 updated 60 locale files [ci skip] 2015-05-03 15:43:35 +02:00
Jonne Haß
fe64db013b Merge pull request #5888 from szlend/5508-fix-post-presenter-autoreload 
Issue #5508: Remove post_presenter from initializers
 2015-04-30 13:06:21 +02:00
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Benjamin Neff
3c09756417 refactoring javascript and controller 
- move to contacts.js
- use json
- move to aspects_controller
- add route
- rewrite test
- fix css in chrome
 2015-04-28 01:57:43 +02:00
Simon Žlender
bec886109f Issue #5508: Remove post_presenter from initializers 2015-04-25 17:21:07 +02:00
Dennis Schubert
67a6c8be0c Merge pull request #5877 from SuperTux88/fix-notification-mails 
fix notification mails for limited posts
 2015-04-25 01:09:46 +02:00
Jonne Haß
0bad6dba88 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-22 20:58:54 +02:00
Jonne Haß
6e546ff2bf Trigger exports through a POST request 
GET requests don't get any CSRF protection by Rails,
thus these sensitive actions should be better protected.

Thanks to @tomekr for the report.
 2015-04-22 20:20:10 +02:00
Benjamin Neff
84c3814b94 fix notification mails for limited posts 2015-04-22 19:59:08 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect 
Use Bootstrap modal for new aspect form
 2015-04-20 22:34:51 +02:00
Jonne Haß
85c376e591 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-19 15:58:41 +02:00
goobertron
a75ec75ec7 Update aspect edits text, reorder posting section 
First iteration to update Help section

Changes from Fla
 2015-04-19 15:57:21 +02:00
Jonne Haß
b3575ab56f Merge branch 'release/0.5.0.0-RC' into develop 2015-04-14 15:42:33 +02:00
goobertron
a687a8dc01 Update help text for renaming an aspect 2015-04-14 15:40:58 +02:00
Steffen van Bergerem
895d38de21 Refactor available services settings 2015-04-08 18:43:35 +02:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Jonne Haß
4b841ef076 Merge pull request #5843 from margori/private_post_subject_content 
Limited post content excluded from subject of comment email
 2015-04-04 00:39:40 +02:00
Marcelo Briones
aa6b590b3c Limited post content excluded from subject of comment email 2015-04-03 16:37:17 -03:00
Steffen van Bergerem
07a344d051 Disable auto follow back on aspect deletion 2015-04-03 14:10:14 +02:00
Jonne Haß
179654071b Move default_url_options to application.rb 
Apparently the subclasses got loaded before the initializers
were run, thus not inheriting the config.
 2015-04-01 14:59:07 +02:00
Jonne Haß
0881810f4e Merge branch 'release/0.5.0.0-RC' into develop 2015-04-01 03:07:30 +02:00
Jonne Haß
9d4e7f3953 Merge pull request #5830 from svbergerem/fix-text-contact-page 
Contacts page: remove broken title from 'Start a conversation' button
 2015-04-01 02:54:18 +02:00
Steffen van Bergerem
fdf3817ee2 Update javascript styleguide 2015-04-01 01:24:11 +02:00
Steffen van Bergerem
7870f3b127 Contacts page: remove broken title from 'Start a conversation' button 2015-04-01 00:47:31 +02:00
Jason Robinson
c0b8f03225 bump to 0.5.0.0-RC 2015-03-30 17:49:15 +03:00
Jonne Haß
e274470d55 Replace default.html with a regular view 
So we can correctly reference the images
 2015-03-28 23:12:07 +01:00
Jonne Haß
331f4ed988 updated 80 locale files [ci skip] 2015-03-27 11:44:44 +01:00
Steffen van Bergerem
9069fd235d Add 'no contacts in this aspect yet' message 2015-03-27 03:20:42 +01:00
flaburgan
ef977a170f Replace Make Something text by the diaspora ball logo on registration page 
Add ball.svg to /graphics
 2015-03-26 00:32:41 +01:00
Jonne Haß
42977333c4 fix javascript pluaralization rules 2015-03-23 20:53:52 +01:00
Jonne Haß
d4d68b10cc update plural rules 2015-03-23 19:27:38 +01:00
Jonne Haß
cb1203d36e updated 105 locale files [ci skip] 2015-03-23 15:51:27 +01:00
Jonne Haß
241d12d824 Merge pull request #5798 from svbergerem/remove-centered-layout 
Remove layout 'centered_with_header_with_footer'
 2015-03-20 01:51:27 +01:00
Steffen van Bergerem
d9bf4a2fa6 Remove layout 'centered_with_header_with_footer' 2015-03-18 21:59:56 +01:00
Steffen van Bergerem
6d070c818c Use jshintrb and guard-jshintrb instead of jshint 2015-03-18 10:49:17 +01:00
Jonne Haß
256d7862b9 Merge pull request #5782 from svbergerem/reshared-poll 
Display reshared poll
 2015-03-15 20:45:51 +01:00
Steffen van Bergerem
81cd1753e4 Improve link to original post in reshared polls 2015-03-15 17:07:16 +01:00
Hincu Petru
9589cb2e0f disable poll voting for reshared post 2015-03-15 16:46:48 +01:00
Sayed
18a1958ef8 fix too long tag name #5737 2015-03-15 16:15:33 +02:00
Steffen van Bergerem
84a5992a42 Refactor css code, remove unused code 2015-03-13 01:41:14 +01:00
Jonne Haß
2c7b7bb0dc bump open_graph_reader 2015-03-11 21:59:02 +01:00
Steffen van Bergerem
4f4dfc7554 Fix missing assets bug 2015-03-11 19:18:05 +01:00
Jonne Haß
e7b92c15e2 Replace export_photos and export_users by export queue 2015-03-06 00:38:16 +01:00
Marcelo Briones
b154d87070 Exports user photos as zip file 2015-03-03 19:45:57 -03:00
Jonne Haß
dd45b79a98 Drop Youtube oembed HTTPS hack 
upstream ships it now that way
 2015-03-02 02:34:51 +01:00
Jonne Haß
c9729d66d6 Explicitly set log level for production environment 2015-03-02 01:34:50 +01:00
Steffen van Bergerem
e188782a9a Remove blueprint code 2015-03-02 00:04:57 +01:00
Jonne Haß
fb6d3db7c7 bump autoprefixer-rails 2015-02-28 02:36:14 +01:00
Jonne Haß
a0c22659d5 Monkey patch to prevent dumping limit on boolean fields 2015-02-27 17:00:41 +01:00
Jonne Haß
162303db37 Enable Rails 5 behavior for exceptions in after_commit callbacks 2015-02-27 16:58:39 +01:00
Jonne Haß
3a8302ff7f serve_static_assets was renamed to serve_static_files 2015-02-27 16:58:38 +01:00
Jonne Haß
e46a77ba19 Merge pull request #5706 from aka001/help_section 
Update the help section #5698
 2015-02-27 15:57:12 +01:00
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
Akash Agrawall
e85cb7b373 Help_section_update_keyboard_shortcut 2015-02-27 16:36:11 +05:30
Augier
168adae009 Adding help section for chat 2015-02-26 18:06:39 +01:00
Steffen van Bergerem
cdd1155bd2 JSHint: change values for bitwise and notypeof to the thoughtbot defaults [ci skip] 2015-02-22 13:42:02 +01:00
Jonne Haß
a19b91083e Merge pull request #5643 from aka001/5564_lock_account 
Lock account #5564
 2015-02-19 03:43:38 +01:00
Akash Agrawall
3bb5e78893 Lock account #5564 2015-02-19 05:45:04 +05:30
flaburgan
2b19b4bfc9 Remove #sign-up-text, change placeholder text to lower-case, fix tests 2015-02-19 00:07:41 +01:00
flaburgan
1c231f3171 refactoring of the public pages design 2015-02-18 22:45:46 +01:00
Faldrian
8f3c03edfa Added dropdown to add/remove people from/to aspects in mobile view 2015-02-15 22:08:15 +01:00
Steffen van Bergerem
c5468f072f JSHint: Add spyOn as a global variable 2015-02-14 19:44:00 +01:00
Augier
aa62266376 Added routing system to open a section in help 2015-02-14 18:05:40 +01:00
Jonne Haß
f980eba0a3 add a missing translation 2015-02-14 12:43:48 +01:00
Lukas Matt
a475d5fb62 Add the ability to link to remote user profile 
related to diaspora/jsxc#77
 2015-02-13 19:23:26 +01:00
Jonne Haß
dece3cf6b0 Merge pull request #5417 from svbergerem/notifications-fix-timeago 
Fix timeago for notifications, add 'no notifications yet' message
 2015-02-10 12:20:09 +01:00
Steffen van Bergerem
f27b9dbf79 JSHint disable maxlen and quotmark [ci skip] 2015-02-10 00:43:06 +01:00
Steffen van Bergerem
3312f97981 Fix timeago for notifications, add 'no notifications yet' message 2015-02-09 03:56:37 +01:00
Steffen van Bergerem
c9e46a09d8 Add files for houndci, stricter rules for JSHint 2015-02-09 00:03:51 +01:00
Steffen van Bergerem
2ec093a54c JSHint boss, evil, loopfunc and scripturl 2015-02-08 23:41:33 +01:00
Steffen van Bergerem
ab6732cac1 JSHint eqeqeq 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
5fa6b8253e JSHint unused and undefined variables 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
a9a480da0a JSHint semicolon errors 2015-02-08 23:41:31 +01:00
Steffen van Bergerem
6b0a5823e3 Add JSHint javascript linter 2015-02-08 23:41:31 +01:00
Jonne Haß
b991ffe455 Merge pull request #5624 from dimaursu/emoji 
Add collation and config check
 2015-02-08 00:04:46 +01:00
Jonne Haß
604d2b7a39 Merge pull request #5634 from svbergerem/remove-photo-export 
Remove photo export from settings
 2015-02-07 21:10:33 +01:00
Jonne Haß
02071fcf51 updated 95 locale files [ci skip] 2015-02-07 20:33:43 +01:00
Steffen van Bergerem
7e5f5964e9 Remove photo export from settings 2015-02-07 14:59:18 +01:00
Steffen van Bergerem
8b33b9eb18 Merge pull request #5602 from Faldrian/more-shortcuts 
Add shortcuts for reshare, expand Post and open first link in a post

Conflicts:
	config/locales/diaspora/en.yml
 2015-02-07 14:41:56 +01:00
Dumitru Ursu
0829e6f394 Add collation and config check 2015-02-06 00:49:07 +02:00
goobertron
42cd2337be Amend all text strings in en locales to use sentence case 
Adapt cukes to work with new capitalisation rules
 2015-01-31 17:44:57 +00:00
Faldrian
099974ddef Add shortcuts for reshare, expand Post and open first link in a post 2015-01-28 16:19:18 +01:00
Marco Colli
eccab62e32 Allow user to enable / disable notifications for a post from stream #5350 2015-01-25 18:40:47 +01:00
Faldrian
31c39a59d1 Added post moderation buttons in SPV 2015-01-25 05:11:59 +01:00
Jonne Haß
9eaa92068f Merge pull request #5464 from SansPseudoFix/statistics_design 
[Feature] Statistics page
 2015-01-24 23:57:40 +01:00
SansPseudoFix
dc44485230 Feature : Statistics design 2015-01-24 22:34:41 +01:00
Jonne Haß
a7d652c7c9 Merge pull request #5530 from dimaursu/emoji 
Convert MySQL fields to 4 byte unicode
 2015-01-21 02:34:53 +01:00
James Kiesel
7bbd9138de Fix bad email formatting 2015-01-20 16:51:08 +13:00
Dumitru Ursu
dda5f71124 Add warning about encoding change 
Add warning about MySQL collation

Fix database index length

This allows new databases to be created with utf8mb4, on MySQL. The maximum
column size is 767 bytes. Each character is 4 bytes long -> 767 / 4 = 191
characters for the column.
 2015-01-19 02:19:39 +02:00
Dumitru Ursu
b0ef4509a6 Change the adapter encoding to utf8mb4 2015-01-19 02:18:19 +02:00
Marcelo Briones
63eca447d0 Strip EXIF data as user preference 2015-01-18 10:28:28 -03:00
Jason Robinson
5466362cc4 Add missing export_user queue to sidekiq config 2015-01-17 19:17:55 +02:00
Jason Robinson
9282a4ea8f Refactor mobile javascript to get rid of console errors. 
Fixes also mobile bookmarklet services.
 2015-01-17 15:50:06 +02:00
James Kiesel
1c69dd7752 Add contacts/posts, and GZipping JSON exporter output 2015-01-15 00:20:19 +13:00
Steffen van Bergerem
026773194a Replace pagedown by markdown-it 2015-01-10 18:56:20 +01:00
Dumitru Ursu
4ba1032f42 Add autoprefixer 2015-01-07 13:02:53 +02:00
Jonne Haß
f20020f06b Merge pull request #5473 from svbergerem/contacts-backbonejs 
Port contacts page to backbonejs
 2015-01-06 14:38:55 +01:00
Jonne Haß
e94e9add1a Merge pull request #5452 from Flaburgan/allow-non-hosted-paypal-buttons 
Add currency setting to paypal donation and allow unhosted button setting

Conflicts:
	Changelog.md
 2015-01-06 14:32:57 +01:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
Marcelo Briones
fe6052865c Remove limited content from email notifications 2014-12-28 22:15:47 -03:00
Flaburgan
b444cdf1ea Add currency and allow unhosted button to paypal donation 2014-12-28 19:50:45 +01:00
margori
27a1886834 Changes delete conversation button tooltip to 'hide' or 'delete' 2014-12-19 18:26:43 -03:00
Jonne Haß
3000d86d57 Merge pull request #5475 from svbergerem/tag-page-improve-wording 
Improve wording for tagged people on tag page
 2014-12-17 16:46:09 +01:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Steffen van Bergerem
a5068259bb Improve wording for tagged people on tag page 2014-12-15 18:08:53 +01:00
Dennis Schubert
cc0c19b482 Merge pull request #5462 from jhass/open_graph_reader 
Bye opengraph_parser, hi open_graph_reader
 2014-12-09 04:42:20 +01:00
Jonne Haß
6836af89ad Correctly implement OpenGraph tags 
Just defining og:site_name indicates that we support the
OpenGraph protocol, but then we didn't set the required
properties.
 2014-12-08 02:25:09 +01:00
Jonne Haß
74a6f42501 Bye opengraph_parser, hi open_graph_reader 
opengraph_parser is basically unmainted, issues are ignored
or deliberately closed without fixing. It pollutes the global
namespace and has no verification of correctness.

The opengraph gem has basically the same issues, not really maintained,
unreleased patches on master since over a year, not really smart either.

So I created my own version and while at it, why not strive try to be
complete and robust, although it's still a work in progress.

This also improves general URL detection by parsing them
from the message after stripping markdown.

An additional dependency was added to support
fetching sites that require cookies to work at all.
For the same reason Faraday's default redirect limit was
bumped.
 2014-12-08 02:01:31 +01:00
Dennis Schubert
339111867e Merge pull request #5443 from jhass/spring 
Replace spork with spring, update & use binstubs
 2014-12-04 00:38:30 +01:00
Jonne Haß
a580171e32 Replace spork with spring, update & use binstubs 
Spring is the recommended application preloader for rails
 2014-12-01 08:06:07 +01:00
Jonne Haß
c5bc495f3f move sidekiq configuration from initializer to sidekiq.yml 2014-12-01 02:18:28 +01:00
Steffen van Bergerem
f6fbbbb5f6 Move tag prefill to Backbone, add tests 2014-11-30 17:14:05 +01:00
taro-k
b01026f9b8 pre-fill tag page form with the tag #4234 2014-11-30 14:15:45 +01:00
Adrián Chaves Fernández (Gallaecio)
1e240a6462 Updated the Galician (gl) translation 2014-11-30 02:00:52 +01:00
Jonne Haß
2ab16d473c Merge pull request #5410 from svbergerem/configurable-source-url 
Make source code url configurable

Conflicts:
	config/diaspora.yml.example
 2014-11-29 23:46:45 +01:00
Jonne Haß
ff04310158 Merge pull request #5426 from axilleas/diaspora_yml 
Improve diaspora.yml comments
 2014-11-29 17:55:24 +01:00
Achilleas Pipinellis
10453e53c2 Refactor diaspora.yml.example [skip ci]. 
- Fix typos and punctuation
- Add double '#' for comments where missed
- Add newlines where needed
 2014-11-29 18:40:11 +02:00
Steffen van Bergerem
55f881da08 Make source code url configurable 2014-11-29 16:36:17 +01:00
Laurent PERON
9661d00ec8 issue #5430 : message added 2014-11-28 10:31:47 +01:00
Jonne Haß
137e60ca51 Merge pull request #5400 from Faldrian/5003-fix-more-button-mobile 
Fix for "more" link on mobile view
 2014-11-22 19:06:31 +01:00
Jonne Haß
827b68fe63 Improve wording on mail configuration section [ci skip] 2014-11-20 20:19:56 +01:00
Jonne Haß
91c734e4fc Avoid mixed content warning through oEmbed content 
- Switch dailymotion oEmbed endpoint to https
- Accept Mixcloud https URLs
- Accept dailymotion https URLs
 2014-11-19 15:48:12 +01:00
Faldrian
4dbf42d970 added different behaviour depending on existence of posts 2014-11-16 15:06:08 +01:00
Faldrian
21806a2c9b mobile more-link only if there may be a next page; added message for end of stream 2014-11-16 01:43:55 +01:00
Lukas Matt
556190b154 Add locales for chat privilege function 2014-11-13 11:32:34 +01:00
Lukas Matt
b54fb649b0 Add vines README file for cert instructions 2014-11-13 11:31:55 +01:00
Lukas Matt
94318ca27a Modify diaspora config file and add defaults 2014-11-13 11:31:12 +01:00
Lukas Matt
24e1732256 Implement token authentication 
* create a new token on a new session
* delete the current token on session exit
 2014-11-13 11:27:56 +01:00
Lukas Matt
4d14e7d3ba Add jsxc to assets list 2014-11-13 11:22:22 +01:00
Lukas Matt
38a238eb36 Set chat-flag for every aspect manually 
On default none is permitted to chat with you.
You have to set extra privilege for an aspect.
 2014-11-13 11:21:21 +01:00
Jonne Haß
7e46502bf9 Merge pull request #5353 from goobertron/ac_removal_mail 
Reword account removal email notification
 2014-11-09 18:58:19 +01:00
Dennis Schubert
6808150920 Method calling convention and doc improvements 
... and a stealth-commit of an already introduced bug prevention system.
;)
 2014-11-09 07:20:30 -08:00
Dennis Schubert
df4063fd45 Documentation improvements and changelog entry 
I just assume camo is cool enough to get an own section.
 2014-11-09 06:51:17 +01:00
Dennis Schubert
92cd4e6b78 Use camo for Markdown images 
just a quick proof of concept
 2014-11-08 05:14:18 +01:00
Dennis Schubert
9024d1a9b7 Add Camo configs 2014-11-08 05:14:18 +01:00
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01:00
Jonne Haß
3c808142fb let default sidekiq config actually process the maintenance queue 2014-10-22 23:23:14 +02:00
goobertron
4b7761e52a Clarify explanation of account deleteion process 2014-10-20 20:15:38 +01:00
goobertron
797f7eae8d Reword account removal email notification 2014-10-17 14:49:25 +01:00
Jason Robinson
69c3566958 Maintenance feature to remove old users 
Add Sidetiq webview to the Sidekiq monitoring panel

Add rake task maintenance:queue_users_for_removal
This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq

Add extra safety when checking for user removal due to inactivity.
Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed.

Add initializer for maintenance job.
Add warning about mail being disabled if remove_old_users maintenance is enabled.
 2014-10-16 22:53:08 +03:00
Jonne Haß
720ec1c64a make nds and en_valspeak available 2014-10-12 15:20:20 +02:00
Jonne Haß
061dfab00b updated 83 locale files [ci skip] 2014-10-12 15:20:20 +02:00
Sandip Trivedi
d7e8e2ce2c Replaced jquery.textchange.js vendored asset with a bower package #5194 2014-10-06 18:54:50 -04:00
Florian Staudacher
4f87a47d0a Merge pull request #4657 from svbergerem/bootstrap-people-view 
Redesign profile page and port to Bootstrap
 2014-10-06 15:09:08 +02:00
Jonne Haß
eac3f042a4 Reset dynamic configuration after each example in the testsuite 2014-10-04 00:59:03 +02:00
Brandon
805e476c34 Fixed typo 
From "Seams" to "Seems"
 2014-10-01 06:41:25 -04:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Florian Staudacher
c7b4b77ce8 Merge pull request #5209 from jhass/federation_improvements 
Federation improvements
 2014-09-27 16:18:37 +02:00
Jonne Haß
2d2217b677 Monkey patch Sidekiq logger 
Sidekiq 3.0 initialized the logger early before we had a chance
to set the logfile. Then we set a new logfile causing the old
logger to be closed. Since the default logger points to stdout,
it got closed causing all kinds of issues.
 2014-09-20 03:01:43 +02:00
Florian Staudacher
1f724dd123 * add a (hash)tag helper for handlebars 
* re-add stream on profile page
* more controller refactoring
 2014-09-15 01:37:23 +02:00
Florian Staudacher
2572fb77fc * refactored text direction detector into helper (also for handlebars) 
* added handlebars helper for markdown formatting
* finished port of profile sidebar view to handlebars template
* people_controller refactoring
 2014-09-15 01:37:23 +02:00
Florian Staudacher
0092c9c483 * create a handlebars view for the profile header 
* unblock the user via ajax
 2014-09-15 01:37:23 +02:00
Florian Staudacher
fba3092c61 * cleanup people_controller#show, add people_controller#stream for json 
* introduce new presenters and extend the functionality of the BasePresenter
* add a handlebars template for the profile sidebar, render it everytime we need to update
* introduce a 'aspect_membership:update' global event
 2014-09-15 01:37:23 +02:00
Jonne Haß
9c88fde821 Switch Faraday adapter to typhoeus 
It uses curl which has less problems connecting
to a missconfigured IPv6 host (falls back to v4)
 2014-09-07 10:47:47 +02:00
Jonne Haß
aa09f0cbb1 Merge branch 'release/0.4.1.0' into develop 2014-09-03 23:38:27 +02:00
Jonne Haß
e03f7f738b make es-CO available 2014-09-03 23:38:20 +02:00
Jonne Haß
b424b94660 updated 45 locale files [ci skip] 2014-09-03 23:14:23 +02:00
Jonne Haß
5bbf8cd341 Merge branch 'release/0.4.1.0' into develop 2014-09-02 14:27:07 +02:00
Steffen van Bergerem
a627f65ef9 Correct default rails environment 2014-09-02 14:25:51 +02:00
Steffen van Bergerem
854dcf04db Display new conversation form on conversations/index 2014-08-31 18:02:37 +02:00
Jonne Haß
f1ab434b18 Merge pull request #5153 from svbergerem/redesign-contacts-page 
Redesign contacts page
 2014-08-27 10:01:41 +02:00
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
Steffen van Bergerem
f1408a7a09 Add contacts search and port aspect membership save/destroy to backbone 2014-08-26 21:41:11 +02:00
Steffen van Bergerem
9587961883 Display all contacts in the contact list 2014-08-26 21:41:02 +02:00
jaideng123
1de67281f4 Simplified range check 2014-08-26 14:04:28 -05:00
jaideng123
f53001577e Increase max length of simple_captcha to 12 2014-08-26 13:24:00 -05:00
Jonne Haß
541d5580e0 Fix loading issues in rails_admin 
Properly declare Admin module and explicitly list models to be
display in rails_admin
 2014-08-26 02:57:47 +02:00
Jonne Haß
cb6c79a885 Merge pull request #5151 from khall/issue_5090 
Fix for issue 5090
 2014-08-26 01:14:45 +02:00
Jonne Haß
8de29bc28d bump faraday and faraday_middleware. closes #4950 2014-08-25 19:16:55 +02:00
khall
a9fd16db3e Fix for issue 5090: Changing error message wording and providing more information to user when status message is too long. 2014-08-24 13:28:57 -07:00
Jonne Haß
2619beb157 Merge pull request #4481 from diaspora/rails4 
Port to Rails 4
 2014-08-24 13:42:31 +02:00
Jonne Haß
a1e547f8d7 Merge pull request #5105 from goobertron/jquery_default 
Change default for jQuery CDN to false
 2014-08-24 13:36:57 +02:00
Jonne Haß
5c60f10022 start new development cycle 2014-08-24 13:28:02 +02:00
Jonne Haß
527fb559e5 Bump version to 0.4.1.0 2014-08-24 13:17:29 +02:00
Jonne Haß
d6d65cd0fd apply rails 4 todos and fix specs after rebase 2014-08-23 16:47:57 +02:00
Jonne Haß
397606bc44 turn parameter wrapping for AR::B#to_json back on 2014-08-23 16:38:57 +02:00
Jonne Haß
d75632401b make everything boot again 2014-08-23 16:34:00 +02:00
Jonne Haß
59d60ff947 remove strong_parameters initializer 2014-08-23 16:34:00 +02:00
Jonne Haß
ec877e3784 Merge pull request #4978 from jhass/bump_acts_as_taggable_on 
Bump acts-as-taggable-on
 2014-08-18 12:20:19 +02:00
Jonne Haß
ae24495c7d Merge pull request #5127 from Raven24/hpetru-2875-ignore-user-posts 
Remove ignored peoples posts without refresh (II)
 2014-08-18 11:35:56 +02:00
Jonne Haß
ec02f54613 Merge pull request #5122 from jaideng123/5113-mark-as-read-by-filter 
Added Mark all in filter as read feature
 2014-08-18 11:30:18 +02:00
jaideng123
406397988b Made wording more clear, refactored read_all 2014-08-17 11:16:30 -05:00
jaideng123
6456a441fe Modified behavior of mark all as read button 2014-08-17 10:12:23 -05:00
Jason Robinson
e58f0b2ad4 Terms of service and privacy policy feature. 
If enabled, terms of service link will be shown in sign up page.
 2014-08-17 17:44:44 +03:00
Florian Staudacher
4fd9bae056 refactor global event broker and user blocking from stream posts 2014-08-17 14:05:56 +02:00
Steffen van Bergerem
022bc1007d Remove unused code 2014-08-16 11:47:31 +02:00
op48
66fcfcfcbc Ignoring validation for last poll answer input 
last input field is only deleted if there are more than three input fields and the last one is empty

poll is validated only if the last input is empty, and the first three have been filled

Removed duplicate remove last answer.

Dont need to check that the last value is populated as we are ignoring last value

Fixing poll step

Placeholder text edited

Fixed translations for poll answer placeholder text

Removed numbers on publisher option

Removed numbers in placeholder for poll answers
 2014-08-13 13:40:14 +01:00
goobertron
93a2b36405 Change default for jQuery CDN to false. 2014-08-05 23:32:45 +01:00
Jonne Haß
3f21593111 Merge pull request #5088 from goobertron/defaults 
Clarify explanations and defaults in diaspora.yml.example
 2014-08-05 21:52:09 +02:00
Faldrian
d52737664b removed non-english translations 2014-08-03 12:55:43 +02:00
Faldrian
6be6d6d504 corrected english translation 2014-08-02 00:34:02 +02:00
Faldrian
a2a37742e4 added keyboard shortcut help topic 2014-08-01 22:13:55 +02:00
MrFrety
686a8776a5 Minor edit: Plural s 2014-08-01 17:13:38 +02:00
goobertron
18a9e15022 Revert so defaults are now placed in commented out settings 2014-07-31 12:05:06 +01:00
goobertron
a4140499c1 Removed stats hub address, other minor tweaks 2014-07-31 11:53:35 +01:00
goobertron
49be5b82fe Clarify explanations and defaults in diaspora.yml.example 2014-07-31 11:42:18 +01:00
Adrián Chaves Fernández (Gallaecio)
125a60f9f5 Updated the Galician (gl) translation 2014-07-27 09:33:50 +02:00
theatre-x
d348f59d5d Fixed a typo 
From "gurantee" to "guarantee".
 2014-07-20 03:40:54 -04:00
arlogn
2394c3df39 flexible font-size for sign_in podname huge text 2014-07-06 19:18:21 +02:00
Florian Staudacher
13b716a449 allow admins to close user accounts from the backend 
* thanks to @maxwell for the initial work on this

port admin pages to bootstrap
* improve user view on admin search page
* add 'close account' link to each user in the search results
* keep the same blue color for the admin menu

some refactoring of the routes and the admin code
* try to be more RESTful (possibly)
* use a 'UserSearch' model for search parameters and querying

add changelog entry
 2014-07-01 23:33:15 +02:00
Maxwell Salzberg
cc53e1762b A podmin can now disable a spam account from the interface. 2014-07-01 17:51:39 +02:00
Pablo Cuadrado
45d04a44ea added title_header key for the Help header, only for EN lang so far 2014-07-01 06:19:29 -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ß
d3ac1dbf90 updated 77 locale files [ci skip] 2014-06-22 15:08:40 +02:00
Jonne Haß
72d1ed8f7d bump acts-as-taggable-on 2014-06-01 18:42:51 +02:00
Jason Robinson
ad0982f35e Remove custom bookmarklet error message. 
Flash error is shown on bookmarklet post error. On error, return post_something message to form
 2014-06-01 15:37:54 +03:00
Jason Robinson
6fd4894997 Add error flash message to publisher on error from server 2014-06-01 13:21:45 +03:00
Jonne Haß
1e09814b13 Enable Rails autoloading in rake tasks 
Then environment task disables, eager loading breaks with Devise
and requiring all needed files would be a mess
 2014-05-26 23:58:31 +02:00
Jonne Haß
bdaa32e70d updated 83 locale files [ci skip] 2014-05-17 11:52:31 +02:00
Lukas Matt
6d6ebd297e Do not try to render posts/comments which are not present 
refs diaspora/diaspora#4959
 2014-05-16 09:48:14 -04:00
Lukas Matt
7ef802127e Added confirm-dialog to report-delete-button 
* changed button description
* replaced links with buttons
 2014-05-15 07:23:44 -04:00
Lukas Matt
1a0c9f5983 Make report-type translatable 2014-05-15 07:23:43 -04:00
Lukas Matt
26d0c81dae Added the ability to disable report-email-notification 
Podmin can see a extra checkbox in Settings > Account
for disabling report-email-notification
 2014-05-15 07:23:43 -04:00
Lukas Matt
ed96ddac98 Display status when the user send a report 2014-05-15 07:23:43 -04:00
Lukas Matt
1748d3b940 It is now possible to report comments 
* Renamed PostReport to Report
* Added report button to SPV
* Updated rspec

refs diaspora/diaspora#4732
refs diaspora/diaspora#4710
refs diaspora/diaspora#4711
refs diaspora/diaspora#4517
 2014-05-15 07:23:43 -04:00
Oliver Azevedo Barnes
aec0c700b3 Add account_deleter.rb to load_libraries initializer 2014-05-07 14:36:18 -05:00
Florian Staudacher
0d51bba959 port bookmarklet to Backbone.js, use gon for params (fixes #4931) 2014-04-19 17:41:21 +02:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer 
Introduce message renderer
 2014-04-13 15:00:46 +03: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
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
Hincu Petru
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +00:00
Mehmet Atif Ergun
a3fd746f15 Fix tr 
The translation 'türk' is ethnicity / nationality. change to language, türkçe.
 2014-04-03 20:31:00 -04:00
Jonne Haß
6ba6ecf3f2 updated 138 locale files [ci skip] 2014-04-03 20:12:30 +02: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
4174b88987 percentage result round + minor language fix 2014-03-31 18:14:08 +02:00
Jannik Streek
9c24365fde changed poll result + some minor text improvements 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
18a43295b7 poll form completed 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
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ß
98057885ac use uuids for guid generation 2014-03-30 15:38:18 +02:00
Sharif Olorin
fc394c3981 Patch grammar in admin interface 2014-03-25 02:36:10 +11: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
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
flaburgan
027650e856 Add handle indication on search page, improve design 2014-03-13 23:01:42 +01:00
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