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

1108 commits

Author SHA1 Message Date
Steffen van Bergerem
5ab09f0659 Merge pull request #6086 from Flaburgan/add-services-mobile 
Add Services and Privacy settings page to mobile
 2015-06-18 22:52:44 +02:00
Jonne Haß
93281d283f Merge branch 'stable' into develop 2015-06-17 12:40:27 +02:00
Pablo Cuadrado
c050c606c2 this was causing an empty element to be created 
closes #6111
 2015-06-17 12:40:22 +02:00
Steffen van Bergerem
ae0209b49b Merge branch 'stable' into develop 2015-06-16 23:43:32 +02:00
Jonne Haß
3a527d01da Remove top margin for first heading in a post 
That is, if it's the first element in the post

closes #6110
 2015-06-16 23:43:14 +02:00
Jonne Haß
e57609a4d6 Merge branch 'stable' into develop 2015-06-16 21:41:13 +02:00
Jonne Haß
4b2a43b005 Merge branch 'master' into stable 2015-06-16 21:40:18 +02:00
Jonne Haß
532f78b5a1 Update rails to 4.2.2, rack to 1.6.2 and jquery-rails to 4.0.4 
This fixes CVE-2015-3226, CVE-2015-3227, CVE-2015-1840 and CVE-2015-3225
 2015-06-16 21:33:16 +02:00
Jonne Haß
f4eb411c45 Merge pull request #6106 from svbergerem/remove-faceboxes 
Remove all faceboxes
 2015-06-15 16:37:45 +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
Steffen van Bergerem
ab60644aa0 Merge pull request #6087 from Flaburgan/improve-mobile-conversation-design 
Improve mobile conversation design
 2015-06-15 13:26:49 +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
Jonne Haß
c83650f023 Merge branch 'stable' into develop 2015-06-10 13:33:37 +02:00
Steffen van Bergerem
034fc5b183 Update markdown-it 
closes #6091
 2015-06-10 13:33:33 +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
Dennis Schubert
828ae5994d Merge branch 'stable' into develop 2015-06-09 05:49:34 +02:00
Dennis Schubert
1aa802c07c Merge branch 'release/0.5.1.0-RC' into stable 2015-06-09 05:48:53 +02:00
Dennis Schubert
2837e58903 Remove listen note from the readme 
this is not included in 0.5.1.0.

[ci skip]
 2015-06-09 05:48:29 +02:00
Jonne Haß
72bb85eeba Merge branch 'stable' into develop 2015-06-08 16:59:31 +02:00
Steffen van Bergerem
5516926b74 Update perfect-scrollbar 
closes #6085
 2015-06-08 16:59:27 +02:00
Dennis Schubert
a5eb7d5d1e Merge branch 'stable' into develop 2015-06-08 04:33:30 +02:00
Dennis Schubert
b80785e06e Update Changelog for the upcoming 0.5.2.0 2015-06-08 04:32:29 +02:00
Dennis Schubert
80db18805c Merge branch 'stable' into develop 2015-06-08 04:26:43 +02:00
Dennis Schubert
ebd12430ea Add note regarding production.server.listen changes 
[ci skip]
 2015-06-08 04:26:13 +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
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
Jonne Haß
1c834d49d8 Merge branch 'stable' into develop 2015-06-07 21:14:51 +02:00
Benjamin Neff
735d692ac0 fix selected week on weekly stats page 
closes #6079
 2015-06-07 21:14:47 +02:00
Jonne Haß
bb9a15ceac Merge pull request #6033 from ATSE-TheBeginners/4297-color-themes 
Issue #4297: Color themes
 2015-06-07 21:11:33 +02: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
Steffen van Bergerem
0a0c3f48f2 Merge pull request #6057 from AugierLe42e/drawer-fix 
Fixed variable drawer width
 2015-06-05 00:21:36 +02:00
Jonne Haß
432f99e001 Merge pull request #6055 from jhass/bootstrap3 
Port to Bootstrap3 (rebased)
 2015-06-04 19:40:55 +02:00
Dennis Schubert
b41007fae7 Merge branch 'stable' into develop 2015-06-04 04:18:34 +02:00
Benjamin Neff
27b4a44e4a replace Rails.logger with logging-logger 
closes #6041
 2015-06-04 04:17:15 +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
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
Dennis Schubert
ffc3cb711f Merge branch 'stable' into develop 2015-06-02 02:35:21 +02:00
Benjamin Neff
b8a6af2742 add db migration to cleanup default avatar image-urls 
closes #6014
 2015-06-02 02:34:32 +02:00
Jonne Haß
b722a75a44 Merge branch 'stable' into develop 2015-06-02 00:44:56 +02:00
Benjamin Neff
a7fa3eabcb Disable autocorrect/autocapitalize for the username 
and cleanup the code so it follows the code guidelines

closes #5955

closes #6028
 2015-06-02 00:44:47 +02:00
Dennis Schubert
70da822d69 Merge branch 'stable' into develop 2015-06-01 04:55:32 +02:00
Steffen van Bergerem
35e75b3c64 Atom feed: set post title length to 50 and use configured pod name in the feed title 
closes #6020
 2015-06-01 04:55:27 +02:00
Jonne Haß
c196ef11bb Merge branch 'stable' into develop 2015-05-31 20:40:18 +02:00
theworldbright
45a5e3d1c5 Change markdown-content hr style #5987 
The <hr> tag in the markdown-content was #eee,
and thus almost invisible. It has been changed to
$border-gray (currently #ddd) to be consistent
with the other <hr> tags.

Adjust markdown-content hr style further

The hr tag is now centered at 85% width. It also
adds a default vertical margin that is equivalent
to the 0.8em the paragraph tags provide.

Refactor scss for markdown-content hr

Closes #6016
 2015-05-31 20:39:55 +02:00
Dennis Schubert
7401808e3f Merge branch 'stable' into develop 2015-05-31 01:49:43 +02:00
Benjamin Neff
76ca4fdc70 use image_url for the logo in mails 
closes #6013
 2015-05-31 01:49:38 +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
Dennis Schubert
807b4f72bd Merge pull request #6003 from jhass/remove_db_hack 
Replace DB environment variable with optional bundler groups
 2015-05-30 03:04:33 +02:00
Jonne Haß
146f7eea52 Merge branch 'stable' into develop 2015-05-29 11:42:03 +02:00
Sandip Trivedi
b026a2afe8 Replaces facebox vendored asset with rails gem #5194 
closes #6005
 2015-05-29 11:41:57 +02:00
Jonne Haß
6581c580f8 Merge branch 'stable' into develop 2015-05-29 11:39:36 +02:00
Benjamin Neff
604ffb445a optimized sprites 
- move mobile icons to mobile-folder, so they aren't included in the
  icons-sprite
- move logos to branding/logos, and create a logos-sprite without the
  big other branding-images
- delete duplicate images

closes #6004
 2015-05-29 11:39:30 +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
Jonne Haß
351f54d74f Merge branch 'stable' into develop 2015-05-28 11:24:34 +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
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
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
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
Dennis Schubert
4093a1bdd3 Add Changelog entry for #5974 2015-05-22 03:11:55 +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
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
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
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