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
85087123f0
remove travis hax ... works on here ... I hope on travis too
...
closes #5964
2015-05-18 03:23:39 +02:00
Jonne Haß
15d7b019f1
Merge branch 'stable' into develop
2015-05-17 13:58:00 +02:00
Steffen van Bergerem
6bec3d67ed
Update markdown-it-sanitizer and markdown-it-for-inline
...
closes #5965
2015-05-17 13:57:54 +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
3ae370780c
Merge branch 'stable' into develop
2015-05-16 03:42:18 +02:00
Steffen van Bergerem
716952dc0d
Put 'email not visible' text into popover/tooltip
...
closes #5956
2015-05-16 03:42:14 +02:00
Dennis Schubert
1f084c28a8
Merge branch 'stable' into develop
2015-05-16 03:40:24 +02:00
Jason Robinson
ce16a122fc
Fix missing localization of inactive user removal warning emails.
...
Fixes #5950
2015-05-16 03:40:06 +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
Jonne Haß
890029b19e
Merge branch 'stable' into develop
2015-05-10 14:26:26 +02:00
Dennis Schubert
1a4e3cef48
Mute ActiveRecord::RecordInvalid due to ignores
...
closes #5943
2015-05-10 14:26:21 +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
Jonne Haß
59e77675ce
Merge branch 'stable' into develop
2015-05-10 00:10:19 +02:00
Dennis Schubert
6273c2959a
Rescue from private objects sent to the public api
...
closes #5938
2015-05-10 00:10:12 +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
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
Jonne Haß
bd17c528e1
Merge branch 'stable' into develop
2015-05-05 18:02:26 +02:00
Rich
2ce0e8045b
Change <subtitle> branding on atom feeds
...
Minor consistency change ( from Diaspora to diaspora* )
closes #5929
2015-05-05 18:02:14 +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
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ß
2570d88cc3
Merge pull request #5904 from Raven24/JesseWeinstein-patch-1
...
prefill bookmarklet with markdown-formatted content
2015-05-04 04:10:03 +02:00
Jonne Haß
f2e26dfafc
Merge branch 'stable' into develop
2015-05-04 04:07:10 +02:00
Jonne Haß
19fd36b1ce
add changelog entry for #5908 [ci skip]
2015-05-04 04:06:55 +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ß
8172eee43c
Merge branch 'stable' into develop
2015-05-04 03:31:34 +02:00
Steffen van Bergerem
1fc31cc313
Fix close account for mobile view
...
and use Bootstrap modal for desktop close account
2015-05-04 03:31:28 +02:00
Jonne Haß
a365d802c7
Recommend Ruby 2.2, drop Ruby 2.0 support
...
As per https://www.loomio.org/d/VuwvXWU7/ruby-versions?proposal=DM8zidhc
2015-05-04 00:58:38 +02:00
Jonne Haß
4fad5041cf
update changelog and version for 0.6.0.0
2015-05-04 00:47:36 +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ß
db08cec9c0
update changelog and version for 0.5.1.0
2015-05-04 00:41:55 +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ß
5371c3876f
Merge pull request #5907 from pravi/add-x-permissions-to-scripts
...
add execution permission to scripts
2015-05-02 15:14:51 +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ß
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
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
Jonne Haß
59e8fc93a2
Merge pull request #5559 from SWW13/aspect_sort
...
Readd aspect sorting
2015-04-30 13:02:24 +02:00
Steffen van Bergerem
31bbfe8eab
Merge pull request #5887 from szlend/5874-fix-bold-links
...
Issue #5874 Fix styled links
2015-04-30 11:05:24 +02:00
Jonne Haß
288b83bd8d
Merge pull request #5891 from mrbrdo/3824_environment_sanity_check
...
fix script/server sanity checks
2015-04-25 19:09:43 +02:00
Jonne Haß
cfa4567d26
Merge pull request #5886 from artoartnik/develop
...
Fix unconventional image asset inclusion in css asset
2015-04-25 17:40:45 +02:00
Jonne Haß
e50dfea875
Merge pull request #5885 from mrbrdo/server-script-fix
...
fix broken output of script/server
2015-04-25 16:31:08 +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
Benjamin Neff
84c3814b94
fix notification mails for limited posts
2015-04-22 19:59:08 +02:00
Jonne Haß
61c890f274
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-21 22:02:28 +02:00
Steffen van Bergerem
6bb5e0a29b
Only render hovercard if the mouse is still on the username
2015-04-21 22:02:18 +02:00
Jonne Haß
9a9cf6f6a5
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-21 20:48:41 +02:00
Steffen van Bergerem
2d3c0680ea
Fix uppercase registration/login labels and btn style
2015-04-21 20:48:30 +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
Jonne Haß
3a8724bf0b
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-19 16:22:34 +02:00
Jonne Haß
fa7a7c5d59
Merge pull request #5865 from SuperTux88/fix-mysql_to_unicode_mb4-migration
...
use "CONVERT TO" to change the encoding for the table and all character columns
2015-04-19 16:21:35 +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ß
f11a6b5417
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-15 15:41:41 +02:00
Praveen Arimbrathodiyil
2613896cfd
fix for #5862 , check for compiled assets
2015-04-15 15:39:19 +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
Jonne Haß
096fa2ddbb
Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations
2015-04-11 20:42:34 +02:00
Dennis Schubert
cfc98d9a2a
Merge branch 'hotfix/0.4.1.3' into release/0.5.0.0-RC
2015-04-11 20:15:10 +02:00
Dennis Schubert
f7d1105148
Merge branch 'hotfix/0.4.1.3' into develop
2015-04-11 20:12:13 +02:00
Dennis Schubert
9fc00d0814
Bump Redcarpet to fix OSVDB-120415
2015-04-11 19:51:18 +02:00
Jonne Haß
4812dc7a23
Merge pull request #5849 from svbergerem/406-on-people-contacts-json
...
Return 406 on people/guid/contacts, format json
2015-04-06 12:49:46 +02:00
Jonne Haß
f4ed086ae0
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-06 12:30:11 +02:00
Steffen van Bergerem
e6cc20d686
Add link to custom splash page wiki examples
2015-04-06 12:26:28 +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
Jonne Haß
cc5bd16eb4
Merge pull request #5848 from svbergerem/migrate-only-sharing
...
Fix only sharing flag for contacts that are receiving
2015-04-04 00:16:37 +02:00
Jonne Haß
b90dc790e5
Merge pull request #5846 from svbergerem/fix-destroying-auto-follow-back-aspect
...
Disable auto follow back on aspect deletion
2015-04-04 00:13:24 +02:00
Jonne Haß
2dd4bf0acf
Merge pull request #5838 from svbergerem/check-stream-before-adding-posts
...
Don't add mentions and reshares to all streams
2015-04-01 18:27:06 +02:00
Jason Robinson
c0b8f03225
bump to 0.5.0.0-RC
2015-03-30 17:49:15 +03:00
Steffen van Bergerem
c9457ffd86
Add missing .container to admin pages, add note to changelog
2015-03-26 23:51:41 +01:00
Steffen van Bergerem
b69239ed2f
Merge pull request #5791 from SansPseudoFix/5745-Conversation-pagination-design-is-broken
...
Fix for 5745 - conversation pagination design is broken
2015-03-26 20:05:24 +01:00
Jonne Haß
2eaa5a4d3b
Merge pull request #5816 from svbergerem/remove-footer-stream-pages
...
Remove footer from stream and profile pages
2015-03-26 17:30:13 +01:00
Steffen van Bergerem
f3cbaddac4
Merge pull request #5743 from Flaburgan/change-make-something
...
Replace Make Something text by the diaspora ball logo on registration page
2015-03-26 01:10:58 +01:00
Steffen van Bergerem
50c187537d
Merge pull request #5721 from sam09/fixissue5626
...
Added margin top to lists. Fixes issue #5626
2015-03-22 00:38:51 +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
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
Jonne Haß
5115582c55
Merge pull request #5790 from visualsayed/5693-reshare-count-broken-on-mobile-stream
...
fix missing reshares count on mobile stream #5693
2015-03-17 21:27:44 +01:00
Jonne Haß
e4a79fb77b
Merge pull request #5786 from svbergerem/refactor-sidebar-css
...
Refactor and improve sidebar css
2015-03-16 12:14:34 +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
c3bf9dd831
Merge pull request #5761 from AugierLe42e/port-notifications-backbone-part2
...
Port notifications to backbone part. 2
2015-03-15 15:10:47 +01:00
Jonne Haß
25e80fddc8
Merge pull request #5781 from svbergerem/various-style-fixes
...
Various style fixes
2015-03-15 04:20:47 +01:00
Steffen van Bergerem
194fc3ea71
Merge pull request #5776 from lislis/rewrite-conversation-hover-in-css
...
Rewrite hover effect on conversations with multiple participants in css
Conflicts:
Changelog.md
2015-03-14 17:36:00 +01:00
Steffen van Bergerem
2e071a185c
Merge pull request #5741 from goobertron/add_likes_tests
...
Add tests for liking and unliking posts
2015-03-14 17:10:58 +01:00
Lisa Passing
a11322fd5d
make css nicer
...
update Changelog
remove weird merge thing
think of the padding and margin
2015-03-14 17:00:14 +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
Steffen van Bergerem
d7d9891293
Merge pull request #5722 from AugierLe42e/add-notif-unsubscribe-single-post-view
...
Add a notification subscribtion to the single post view
2015-03-14 00:52:03 +01:00
Martha
985141c0e8
display specific error messages for password change (issue #5549 )
2015-03-13 11:35:21 -07:00
Steffen van Bergerem
fb8bc7b99e
Merge pull request #5764 from giniouxe/#5670-refactor-registration
...
Refactor registrations #5670 - Partial form
2015-03-13 18:31:40 +01:00
Steffen van Bergerem
4f960fd34a
Merge pull request #5733 from margori/avatar_shadow
...
Avatar aspect update and DRY
2015-03-12 14:28:16 +01:00
Steffen van Bergerem
e99fe86ca0
Merge pull request #5752 from SansPseudoFix/fix-tag-button-overflow
...
fix tag button overflow
2015-03-12 10:43:56 +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
Jonne Haß
a0bcc8c335
Merge pull request #5754 from svbergerem/fix-invitations-mobile
...
Fix mobile sign up with invitation
2015-03-11 12:41:45 +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
e5584e400e
Update Changelog for #5731 [ci skip]
2015-03-10 16:45:04 +01:00
Steffen van Bergerem
9d6fc0a671
Merge pull request #5744 from Flaburgan/conversation-design
...
Fix conversaton publisher trailing border
2015-03-08 22:49:44 +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
Jonne Haß
abc4203840
Merge pull request #5685 from margori/1802_export_photos
...
Export user photos
2015-03-04 01:45:51 +01:00
Selman Ercan
35fe6bda68
Issue #5631 . Made top and left coordinates of hovercards match those of their parents.
...
Added line to changelog for bug fix of issue #5631 .
Processing the 'mouseleave' event only if we've left both the parent and the hovercard.
Fixed indentation.
Replaced issue id with pull request id and fixed indentation.
2015-03-02 09:41:29 +01:00
Jonne Haß
66f8503740
Merge pull request #5715 from svbergerem/bootstrap-port-streams
...
Port stream views to Bootstrap
2015-03-02 01:00:10 +01:00
Jonne Haß
8dd313efc6
Merge pull request #5711 from svbergerem/update-markdown-it-plugins
...
Update markdown-it-diaspora-mention and markdown-it-sanitizer
2015-02-28 12:42:05 +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ß
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
Jonne Haß
39c50b231f
Merge pull request #5665 from AugierLe42e/chat-help-section-bis-repetita
...
Adding help section for chat
2015-02-26 22:20:57 +01:00
Jonne Haß
3a0857b4bf
Merge pull request #5699 from WebDevFromScratch/5690-update-stream-on-reshare
...
5690 update stream on reshare
2015-02-23 16:37:54 +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
Jonne Haß
9ad26604b7
Merge pull request #5640 from zachrab/5625-disable-mail-to-deleted-user
...
Fixes issue #5625
2015-02-20 02:29:51 +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
flaburgan
44649e9167
Unify not connected pages
2015-02-18 22:45:46 +01:00
Steffen van Bergerem
b4ab31d6f9
Merge pull request #5680 from jhass/strip_formatting_chars
...
Strip Unicode format characters prior post processing
2015-02-18 03:26:50 +01:00
Steffen van Bergerem
c03eb0c191
Merge pull request #5675 from SansPseudoFix/5586-fix-overflow-code-mobile
...
fix code overflow in mobile comments #5586
2015-02-17 13:09:56 +01:00
Jonne Haß
278ca84ec2
Merge pull request #5676 from svbergerem/notifications-add-year
...
Add year to notifications page
2015-02-16 18:44:48 +01:00
Jonne Haß
34ad598cff
Merge pull request #5594 from Faldrian/4055-add_contacts_mobile
...
4055 add contacts mobile
2015-02-15 23:12:18 +01:00
Faldrian
8f3c03edfa
Added dropdown to add/remove people from/to aspects in mobile view
2015-02-15 22:08:15 +01:00
Jonne Haß
e801c859a8
Merge pull request #5671 from giniouxe/5662-privacy-button-text
...
Issue #5662 Fix text on change button
2015-02-15 20:38:52 +01:00
Jonne Haß
9dbf6b82a8
Merge pull request #5655 from svbergerem/contacts-page-add-invitations
...
Add invitation link to contacts page
2015-02-15 16:00:20 +01:00
Jonne Haß
e05ae411eb
Merge pull request #5667 from svbergerem/help-section-routing
...
Add routes for help sections
2015-02-14 22:19:37 +01:00
Steffen van Bergerem
f37a018b0e
Merge pull request #5521 from arlogn/profile-photos-as-thumbnails
...
profile photos as thumbnails
2015-02-14 02:55:57 +01:00
goobertron
5cad9b3c6c
Ahem!
2015-02-11 20:30:09 +00: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
Jonne Haß
97a5e24edc
update changelog for #5652 [ci skip]
2015-02-11 14:12:02 +01:00
Jonne Haß
ab2e4781f8
Merge pull request #5639 from aka001/5373_technical_limitation
...
Technical limitations of how old one can be on D* #5373
2015-02-09 02:28:15 +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
Jonne Haß
b991ffe455
Merge pull request #5624 from dimaursu/emoji
...
Add collation and config check
2015-02-08 00:04:46 +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