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

4016 commits

Author SHA1 Message Date
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +02:00
Steffen van Bergerem
92a3dd53f0 Replace jquery.autoresize with autosize 2015-06-14 20:03:15 +02:00
fla
7f6609d17b Remove old service keys in statistics.json 2015-06-13 11:03:47 +02:00
Steffen van Bergerem
18a8211cc3 Add img-responsive to image class 2015-06-12 00:01:56 +02:00
Dennis Schubert
8a4ec1d4c6 Merge branch 'stable' into develop 2015-06-08 04:18:38 +02:00
Benjamin Neff
d42b5c128e update photos when received over public path 
closes #6082
 2015-06-08 04:18:31 +02:00
Benjamin Neff
e16b9af7e6 make public and private receiver work similar ... 2015-06-08 04:15:17 +02:00
Dennis Schubert
ad52eaf6d7 Merge branch 'stable' into develop 2015-06-08 04:09:57 +02:00
Benjamin Neff
97153ad08b update tests for new twitter client 
closes #6083
 2015-06-08 04:08:46 +02:00
Dennis Schubert
0c6ca1d235 Merge branch 'stable' into develop 2015-06-08 00:58:20 +02:00
Benjamin Neff
aa2297a8c0 retry receive share-visibility when failed while receiving parallel 
refactoring:
- remove unused return-values (were used for caching, which was removed again)
- remove transaction (doesn't help here, added in 2615126)

closes #6068
 2015-06-08 00:58:00 +02:00
Dennis Schubert
e0420d733a Merge branch 'stable' into develop 2015-06-08 00:49:55 +02:00
Benjamin Neff
010afa1019 refactor: iterate over visiblities 
closes #6060
 2015-06-08 00:45:16 +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ß
7bfa0f857c Merge branch 'stable' into develop 2015-06-06 15:23:44 +02:00
Jonne Haß
6c71d9f257 Only strip text direction markers around hashtags for now 
Fixes #6067
 2015-06-06 15:23:12 +02:00
Jonne Haß
8df9cb9cd2 Merge branch 'stable' into develop 2015-06-05 09:40:39 +02:00
Benjamin Neff
214ce1cf6e change path to uma.jpg to /assets 
closes #6064
 2015-06-05 09:40:34 +02:00
Steffen van Bergerem
700df9af23 Fix jasmine tests 
Fix notifications jasmine tests
 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f64eb9ff41 Fix hound remarks 2015-06-04 18:05:44 +02:00
theworldbright
98f11b944a Fix styleguide violations 
Fix hound remark 12

Remove unnecessary explicit div tag

Rename el_**** to ****El (hound remark 2 and 3)

Only find and replace operations were done with
this commit

Fix hound remark 4 and 8

Fix hound remark 6

Fix hound remark 7

Fix hound remark 9

Fix hound remark 10 and 11

Fix hound remark 13

Fix hound remark 1

Change single quotes to double quotes

Change single quotes to double in publisher view

Fix camelCase and missing {} in publisher view

Change single quotes to double in bookmarklet view

Use dot notation for serializedForm in publisher

Change single quotes to double in bookmarklet spec

Change single quotes to double in publisher spec

Fix missing {} in publisher views

Use ruby 1.9 hash syntax in invite_link

Fix indentation in publisher view
 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f5bb4a4557 Refactor button colors 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
Jonne Haß
3850118e4e Merge branch 'stable' into develop 2015-06-02 12:14:42 +02:00
Steffen van Bergerem
1b77258d0e Set default for post title truncation to 70 characters 
closes #6022
 2015-06-02 12:14:35 +02:00
Dennis Schubert
ffc3cb711f Merge branch 'stable' into develop 2015-06-02 02:35:21 +02:00
Benjamin Neff
03dbb75dd5 don't save default avatars to the database 2015-06-02 02:32:01 +02:00
Dennis Schubert
8c4bcd8bd3 Merge branch 'stable' into develop 2015-05-31 01:47:09 +02:00
Steffen van Bergerem
fdad348898 Fix tag rendering in emails 
closes #6009
 2015-05-31 01:47:05 +02:00
Dennis Schubert
b2dbdb3706 Merge branch 'stable' into develop 2015-05-30 03:08:30 +02:00
Jonne Haß
ac52cef546 Only return the current_users participation for post interactions 
closes #6007
 2015-05-30 03:08:25 +02:00
Jonne Haß
351f54d74f Merge branch 'stable' into develop 2015-05-28 11:24:34 +02:00
Sandip Trivedi
2ba2ef1b9c Replaces the zipzip gem with the rubyzip gem 2015-05-28 11:23:57 +02:00
Dennis Schubert
44919233c0 Merge branch 'stable' into develop 2015-05-28 01:34:28 +02:00
Benjamin Neff
21ae93e658 handle when the diaspora xml parser returns nil 
closes #5991
 2015-05-28 01:34:24 +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
Jonne Haß
3e35ef0b63 Merge branch 'stable' into develop 2015-05-24 11:16:09 +02:00
Benjamin Neff
986ad0df14 fix validation for status-message when the author is missing 
closes #5986
 2015-05-24 11:16:05 +02:00
Dennis Schubert
2ca0a17ee0 Merge branch 'stable' into develop 2015-05-24 02:30:08 +02:00
Benjamin Neff
8531b160a6 gracefully handle when a like is already deleted again 
closes #5983
 2015-05-24 02:30:02 +02:00
Dennis Schubert
ba9b947173 Merge branch 'stable' into develop 2015-05-23 01:24:14 +02:00
Benjamin Neff
68f7208ff5 use id from preloaded gon.post to fix broken liking with guid 
closes #5978
 2015-05-23 01:24:09 +02:00
Jonne Haß
5a3b62d801 Merge branch 'stable' into develop 2015-05-19 10:42:44 +02:00
Benjamin Neff
9a4a7255e7 remove unused older and newer methods for posts 
last renamed in 8386179f16

closes #5970
 2015-05-19 10:42:39 +02:00
Dennis Schubert
2549f44b7c Merge branch 'stable' into develop 2015-05-19 03:00:56 +02:00
Benjamin Neff
289753e068 add "original post deleted" message on single post view 
closes #5968
 2015-05-19 03:00:51 +02:00
Benjamin Neff
267a1df3c4 fix root_diaspora_id when root was deleted 2015-05-19 02:59:31 +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
3446cb2f3f Merge branch 'stable' into develop 2015-05-18 03:31:17 +02:00
Benjamin Neff
a396a246ee remove unused hasPhotos and hasText functions 
- added in a836b06d3e
- removed in 49ea8c8563

closes #5969
 2015-05-18 03:31:11 +02:00
Dennis Schubert
944c57f874 Merge branch 'stable' into develop 2015-05-18 03:23:43 +02:00
Benjamin Neff
7cccb6594f remove security hax comment 2015-05-18 03:23:15 +02:00
Jonne Haß
13b69f81d1 Merge branch 'stable' into develop 2015-05-16 13:54:05 +02:00
Benjamin Neff
d74e20a790 fetch public posts when someone starts sharing with you 
closes #5960
 2015-05-16 13:54:01 +02:00
Jonne Haß
ca33e984d3 Merge branch 'stable' into develop 2015-05-16 12:48:41 +02:00
Benjamin Neff
30cc330747 fix empty searchable in hcard, parse empty as false 
closes #5962
 2015-05-16 12:48:33 +02:00
Dennis Schubert
42a408045e Merge branch 'stable' into develop 2015-05-16 03:44:35 +02:00
Benjamin Neff
c01fdb6e1c fix the url for the public-posts json 
closes #5958
 2015-05-16 03:44:31 +02:00
Dennis Schubert
84dc40326a Merge branch 'stable' into develop 2015-05-16 03:36:30 +02:00
Jason Robinson
aec2467e98 Fix inactive user removal not respecting configuration for daily limits 
It seems ActiveRecord ignores .limit() if .find_each() is used to iterate the query (http://stackoverflow.com/a/6680541/1489738). Using .each() instead. Added a test.

closes #5953
 2015-05-16 03:36:25 +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
Dennis Schubert
5477c7df96 Merge branch 'stable' into develop 2015-05-10 01:59:21 +02:00
Steffen van Bergerem
59e57c013b Update jasmine-ajax 
closes #5937
 2015-05-10 01:59:17 +02:00
Dennis Schubert
300376a854 Merge branch 'stable' into develop 2015-05-09 23:49:05 +02:00
Steffen van Bergerem
05ec235ea3 Pass along current_user in ContactPresenter#full_hash_with_person 
closes #5936
 2015-05-09 23:48:59 +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
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
Dennis Schubert
d27061d5d6 Set captcha length correctly, fix #5932 2015-05-06 23:51:28 +02:00
Florian Staudacher
5c012e7871 limit the parameter length for the GET request to the bookmarklet to ~2000 chars 2015-05-05 18:25:01 +02:00
Jonne Haß
4a7c358be9 Merge branch 'stable' into develop 2015-05-05 01:39:52 +02:00
Steffen van Bergerem
399fdb2c7d Check request.format :mobile in home controller 2015-05-05 01:39:48 +02:00
Jonne Haß
3fadcfa568 Merge branch 'stable' into develop 2015-05-04 15:14:41 +02:00
Jonne Haß
bb14128052 bump ruby-oembed 2015-05-04 14:22:57 +02:00
Jonne Haß
971a3dd021 Merge branch 'stable' into develop 2015-05-04 04:04:48 +02:00
Steffen van Bergerem
0cffa00004 Add syntax highlighting for markdown content 2015-05-04 04:04:34 +02:00
Jonne Haß
234e205602 Merge branch 'stable' into develop 2015-05-04 03:38:44 +02:00
Steffen van Bergerem
a22127bfb1 Add ctrl+enter shortcut for conversations 2015-05-04 03:38:42 +02:00
Jonne Haß
f257658e46 Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"" 
This reverts commit 2c7848e3cb.
 2015-05-04 00:43:41 +02:00
Jonne Haß
2c7848e3cb Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations" 
This reverts commit 096fa2ddbb, reversing
changes made to f7d1105148.
 2015-05-04 00:36:27 +02:00
Jonne Haß
2382f9eb24 Merge pull request #5896 from Raven24/fix-db-seeds 
fix minor errors in db:seed task
 2015-04-30 13:09:54 +02:00
Jonne Haß
78ea2c8204 Merge pull request #5878 from Flaburgan/chrome-frame 
Fix the IE version number extractor to work without space between MSIE and the version number
 2015-04-30 13:04:29 +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
Florian Staudacher
913d3484a6 fix minor errors in spec helper scripts, remove db/seeeds.rb 2015-04-28 01:02:27 +02:00
Simon Wörner
cee4f1c3cd fixed aspect sorting, added minimal jquery ui, added test 2015-04-26 01:57:00 +02:00
Dennis Schubert
c95dd68545 Merge pull request #5883 from SuperTux88/fix-camo-on-contacts-page 
use camo for medium and small avatars
 2015-04-25 01:26:28 +02:00
Dennis Schubert
b06a699dd6 Merge pull request #5879 from SuperTux88/encode-urls 
encode unencoded urls and normalize IDN urls
 2015-04-25 01:11:42 +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
Benjamin Neff
344b198900 use camo for medium and small avatars 2015-04-24 03:10:48 +02:00
Benjamin Neff
a863f3ebb2 encode unencoded urls and normalize IDN urls 2015-04-23 00:24:53 +02:00
Flaburgan
2b2c39eef3 Fix the IE version number extractor to work without space between MSIE and the version number, close #5858 2015-04-22 22:09:22 +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
Jonne Haß
0a70e51f74 Add a token the filename for exported user data 
Also redirect to it for download, for Amazon S3
compatibility.

Prior to this patch an attacker could obtain an
users export by guessing the filename with a high
chance of success. Fully authenticating the
download request is a lot harder due to our diverse
deployment scenarios.

This brings the used method in line with the photo
export feature.

Thanks to @tomekr for the report.
 2015-04-22 20:19:17 +02:00
Benjamin Neff
84c3814b94 fix notification mails for limited posts 2015-04-22 19:59:08 +02:00
Steffen van Bergerem
8e2103e69b Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 22:26:22 +02:00
Benjamin Neff
6cbb959700 add mumble protocol to linkify 
also use double-quotes in the whole file
 2015-04-21 21:16:55 +02:00
Jonne Haß
c8f990359d Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:50:27 +02:00
Steffen van Bergerem
a14713b985 Update markdown-it, disable fuzzy links 2015-04-21 20:50:16 +02:00
Jonne Haß
37ec00f80b Merge pull request #5854 from svbergerem/remove-managing-services-standalone 
Remove 'manage services' link in standalone mode
 2015-04-20 22:36:11 +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
Marcelo Briones
6636a89118 Add participation counter 2015-04-11 14:41:17 -03:00
Steffen van Bergerem
b885b8583d Remove 'manage services' link in standalone mode 2015-04-08 12:49:05 +02:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Steffen van Bergerem
a6b9c6c057 Return 406 on people/guid/contacts, format json 2015-04-04 03:48:44 +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
Steffen van Bergerem
1701bc30d0 Don't add mentions and reshares to all streams 2015-04-01 16:51:08 +02:00
Jonne Haß
548b0d8161 Rescue correct constant in Workers::ReceiveLocalBatch 
Fixes #5834
 2015-04-01 04:01:40 +02:00
Steffen van Bergerem
adf9bcf8e8 Update markdown-it 2015-03-26 00:07:25 +01:00
Jonne Haß
65a738e604 bump rspec-rails 2015-03-25 02:33:56 +01:00
Jonne Haß
61461db913 fix jasmine spec for correct reshare behavior 2015-03-24 17:20:33 +01:00
Jonne Haß
73b6c75278 On reshare insert the reshare built from the response 
Also make sure comments_count and the like is always set in the
response.
 2015-03-23 23:02:23 +01:00
Jonne Haß
644fc46dee Merge pull request #5792 from MothOnMars/4020-role-specs 
added specs and validations for Role model
 2015-03-20 01:54:04 +01:00
Steffen van Bergerem
d9bf4a2fa6 Remove layout 'centered_with_header_with_footer' 2015-03-18 21:59:56 +01:00
Martha
d4f1a5dbe8 added specs and validations for Role model 
- added shoulda-matchers gem for one-line specs
- added FactoryGirl syntax methods
 2015-03-18 09:16:15 -07:00
Steffen van Bergerem
a161e4d3a7 Uncomment jasmine tests 2015-03-18 00:01:22 +01:00
Jonne Haß
256d7862b9 Merge pull request #5782 from svbergerem/reshared-poll 
Display reshared poll
 2015-03-15 20:45:51 +01:00
Jonne Haß
5ea90016b3 Merge pull request #5783 from visualsayed/5737-too-long-tag-name 
5737 too long tag name
 2015-03-15 18:06:53 +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
Augier
322ee30005 Tests with Jasmine 2015-03-15 14:52:49 +01:00
Augier
f4534ec412 Refactor notification badge view (again) 2015-03-15 11:48:06 +01:00
Augier
673661b798 Ported searchbar 2015-03-15 11:48:06 +01:00
Augier
2a9fddf7a0 Port notifications to backbone part. 2 2015-03-15 11:48:06 +01:00
Steffen van Bergerem
2328f64d56 Merge pull request #5580 from MothOnMars/5549-password-reset-error 
display specific error messages for password change (issue #5549)
 2015-03-14 03:25:08 +01:00
Martha
985141c0e8 display specific error messages for password change (issue #5549) 2015-03-13 11:35:21 -07:00
Steffen van Bergerem
1ff644c13e Fix mobile notifications 2015-03-12 22:45:04 +01:00
Steffen van Bergerem
52c2a73d83 Merge pull request #5707 from AugierLe42e/port-notifications-backbone 
[WIP] Port of notifications.js and notification-badge.js to Backbone part.1
 2015-03-11 17:05:14 +01:00
Steffen van Bergerem
f5bf53a004 Refactor vendor javascript 2015-03-11 15:51:08 +01:00
Augier
95f4675ddf Port of notifications to Backbone 2015-03-11 02:11:05 +01:00
Jonne Haß
8ab6f31e0a Merge pull request #5751 from svbergerem/fix-photo-count-profile 
Fix photo count in the profile view
 2015-03-10 17:45:12 +01:00
Steffen van Bergerem
d2222a97e5 Fix photo count in the profile view 2015-03-10 11:38:49 +01:00
Steffen van Bergerem
1b2b10877a Fix services char counter 2015-03-09 21:18:10 +01:00
Steffen van Bergerem
73d04b706e Use entypo icons for left navbar 2015-03-09 17:57:50 +01:00
Steffen van Bergerem
3298373a7f Add missing http:// to urls 2015-03-09 01:42:40 +01:00
Jonne Haß
f525f9e34d Merge pull request #5730 from Flaburgan/strip-markdown-from-title 
Strip markdown from the heading of a post
 2015-03-06 23:43:13 +01:00
Steffen van Bergerem
2a52f65160 Bump markdown-it 2015-03-06 20:40:06 +01:00
flaburgan
5dc8642a99 Strip markdown from the heading of a post. Impact notifications, email subjects, SPV <title>, the Atom feed... 2015-03-04 19:30:00 +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
Steffen van Bergerem
e188782a9a Remove blueprint code 2015-03-02 00:04:57 +01:00
Steffen van Bergerem
c838389b67 Fix invitations and tests 2015-03-02 00:04:56 +01:00
Jonne Haß
987281270a bump ruby-oembed 2015-02-28 02:36:13 +01:00
Jonne Haß
678033fa23 replace deprecated stub syntax in export user spec 2015-02-27 17:00:42 +01:00
Jonne Haß
7a741c6dce Ensure deliveries are cleared after each example 2015-02-27 17:00:41 +01:00
Jonne Haß
3a90386303 deliver needs to be called on the return value of the mailer call 2015-02-27 16:58:39 +01:00
Jonne Haß
d295b5d5b5 ActiveRecord::Base::reflection returns strings now 2015-02-27 16:58:39 +01:00
Jonne Haß
9530f00bd6 Don't use a too large invalid id 2015-02-27 16:58:39 +01:00
Jonne Haß
1ec3f5caa6 Don't pass a model instance where an id is expected 2015-02-27 16:58:39 +01:00
Jonne Haß
290aded7f6 ActionMailer deliver -> deliver_now 2015-02-27 16:58:39 +01:00
Jonne Haß
ed44689670 Fix a spec for LikesController 2015-02-27 16:36:45 +01:00
Jonne Haß
99ea156e1c Refactor User.total_users into a scope 2015-02-27 16:30:51 +01:00
Jonne Haß
6432bbe67b fix 2015-02-27 16:29:49 +01:00
Jonne Haß
93c9ad6eba Fix participations controller spec 2015-02-27 16:27:55 +01:00
Jonne Haß
95053ccbf2 Merge pull request #5351 from MarcBurt/5041-Total-user-statistic-shouldnt-include-closed-accounts 
5041 total user statistic shouldnt include closed accounts
 2015-02-27 16:02:35 +01:00
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
Augier
168adae009 Adding help section for chat 2015-02-26 18:06:39 +01:00
PIOTR KLOSINSKI
b8be76be3c changed reshare function, so it adds the object to the stream 
tests for reshares

Changelog.md update

fixing a style issue

removed unnecessary semicolon
 2015-02-23 15:44:31 +01:00
zachrab
f695b5d3e7 Set disable_mail to true 
Add #clear_account! disable mail spec

Add migration for disabling mail for all closed accounts

Change migration to use #update_all for disable_mail attribute

Add #clear_account! false fields spec
 2015-02-19 16:45:39 -08:00
Akash Agrawall
3bb5e78893 Lock account #5564 2015-02-19 05:45:04 +05:30
Jonne Haß
6a5a407e49 Strip Unicode format characters prior post processing 2015-02-17 23:29:05 +01:00
Steffen van Bergerem
eb7e2eac9d Update jasmine-ajax 2015-02-17 04:03:42 +01:00
Steffen van Bergerem
9c22ed6aef Add year to notifications page 2015-02-16 18:02:50 +01:00
Steffen van Bergerem
9373d5bd20 Fix jasmine tests for new help routes 2015-02-14 19:38:00 +01:00
Augier
aa62266376 Added routing system to open a section in help 2015-02-14 18:05:40 +01:00
Jonne Haß
84cfaa1cfb Merge pull request #5659 from Zauberstuhl/link_to_remote_profile 
Add the ability to link remote user profiles
 2015-02-13 20:35:14 +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ß
b910adc52b Merge pull request #5663 from svbergerem/pending-specs 
Green pending specs for evil query spec tag stream
 2015-02-13 13:46:08 +01:00
Steffen van Bergerem
55cb2dd30a Green pending specs for evil query spec tag stream 2015-02-13 12:30:53 +01:00
Steffen van Bergerem
d09e8a3758 Bump markdown-it-sanitizer 2015-02-13 02:58:31 +01:00
Jonne Haß
3c58cbeaee Merge pull request #5646 from svbergerem/fix-conversation-scrolling 
Conversations: fix badge count and automatic scrolling
 2015-02-11 14:19:48 +01:00
Steffen van Bergerem
7112cb112b Add hovercards for mentions 2015-02-11 00:46:00 +01:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +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
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
Marc Burt
9f5131b6ec Fixed #5041 with new User method to find total accounts excluding closed and invitations 2015-02-08 13:49:12 +00:00
Steffen van Bergerem
c1d714d2c7 Remove unused files, fix syntax in jasmine tests 2015-02-07 21:17:51 +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
Sam Radhakrishnan
a12c0d83c0 Fixed Bug #5593. Added length validation to location in profile model with maximum length 255. 2015-02-02 19:42:53 +05:30
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
Augier
55d258c5ac Fix registrations displaying 2015-01-30 18:00:22 +01: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