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

14400 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
549c45e06f No need anymore to update bundler on travis 2014-03-31 00:02:22 +02:00
Jonne Haß
5b4ab32c08 Merge pull request #4884 from MrZYX/stabilize_cukes 
Stabilize cukes II
 2014-03-30 23:09:22 +02:00
Jonne Haß
24a3a42e90 Merge pull request #4880 from svbergerem/hovercard-bootstrap-style-fixes 
Improve hovercard style on Bootstrap pages
 2014-03-30 22:34:31 +02:00
Jason Robinson
3fd938f7e7 Add warning to script/server if curl does not support AsyncDNS 2014-03-30 22:55:13 +03:00
Jonne Haß
7ef5595e52 Try silly things to make mentions_from_profile_page.feature:38 more stable 2014-03-30 20:54:05 +02:00
Jonne Haß
bc46ee437c Stabilze aspect_navigation.feature:18 
... again
 2014-03-30 20:18:58 +02:00
Jonne Haß
98057885ac use uuids for guid generation 2014-03-30 15:38:18 +02:00
Jonne Haß
07aec2a630 Merge branch 'hpetru-4864-ui-bug-when-tag-is-long' into develop 2014-03-30 13:39:32 +02:00
Hincu Petru
699f327762 Long tags are no longer cut off in the post streams 
Fixed in streams
 2014-03-30 13:37:31 +02:00
Jonne Haß
3a91061d4f Merge pull request #4708 from goobertron/opengraph_link_fix 
Opengraph link fix (issue #4492)
 2014-03-30 11:15:29 +02:00
goobertron
57d796be1d Fix indentation 2014-03-28 15:21:22 +00:00
Steffen van Bergerem
1fc38278bb Improve hovercard style on Bootstrap pages 2014-03-28 14:00:16 +01:00
goobertron
1dfde65556 Alter link behaviour of OG previews 2014-03-26 19:24:06 +00:00
Dennis Schubert
dfa41997df Merge pull request #4855 from MrZYX/drop_rvmrc 
Replace .rvmrc by .ruby-version
 2014-03-25 23:58:05 +01:00
Jonne Haß
3f5838a75f Merge pull request #4876 from fractalcat/wip-interface-fixes 
Patch grammar in admin interface
 2014-03-24 17:04:12 +01:00
Sharif Olorin
fc394c3981 Patch grammar in admin interface 2014-03-25 02:36:10 +11:00
Jonne Haß
1b70f6fe09 Replace .rvmrc by .ruby-version 
Also relax the requirement. The .ruby-version represents
merely a recomendation for the Ruby version. The incompability
issues in the Ruby world are far less currently, than they were
when we introduced strict version enforcement. Thus strict
enforcement is no longer appropiate. Same holds for RubyGems.

This implicity also removes the recomendation on using RVM.
The .ruby-version file is supported by all major Ruby version
managers. Gemsets are no longer a needed feature since Bundler
handles multiple concurrrently installed Gems just well.
 2014-03-24 15:33:29 +01:00
Jonne Haß
ab15bad53f Merge pull request #4858 from hincupetru/4514-clicking-show-more-comments-empties-textarea 
Save textarea value before rendering comments when clicked 'show more....'
 2014-03-24 14:56:45 +01:00
Jonne Haß
b0a4d5d439 Merge pull request #4870 from svbergerem/activate-hovercards 
Activate hovercards in SPV and conversations
 2014-03-23 11:36:56 +01:00
Steffen van Bergerem
cd241ee94d Hovercards! Everywhere! 2014-03-23 01:15:26 +01:00
Jonne Haß
029520a351 Merge pull request #4867 from svbergerem/polish-notifications-view 
Add separator between days, don't display grey zero
 2014-03-20 00:25:54 +01:00
Steffen van Bergerem
d9857a3a10 Add separator between days, don't display grey zero 2014-03-20 00:23:38 +01:00
Jonne Haß
23a91eb63f Merge pull request #4814 from svbergerem/notifications-bootstrap-port 
[WIP] Port notifications to Bootstrap and add filters, port hovercards
 2014-03-19 21:57:50 +01:00
Steffen van Bergerem
4fc9c6416e Port notifications to Bootstrap 2014-03-19 18:45:52 +01:00
Steffen van Bergerem
eabdc7390c Port aspect membership dropdown and hovercards 2014-03-19 17:54:22 +01:00
Steffen van Bergerem
f217a5bc11 Add filters to notifications controller 2014-03-19 17:54:22 +01:00
Hincu Petru
1cef3e42ce I save textarea value before rendering comments when clicked 'show more..' 2014-03-19 12:36:04 +00:00
Jonne Haß
835608f06f Merge pull request #4856 from hincupetru/3692-hashtags-inside-markdown-link 
Check if the hashtag is a link in function .hashtagify
 2014-03-16 14:39:20 +01:00
Hincu Petru
694dc7d80b Check if the hashtag is a link in function .hashtagify 2014-03-16 11:59:49 +00:00
Jonne Haß
cfca0e88f1 Revert "Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link" 
This reverts commit 06ab498620, reversing
changes made to 3c4d8d95d3.

Conflicts:
	Changelog.md
 2014-03-15 21:08:54 +01:00
Jonne Haß
f2fedea3db Merge pull request #4853 from hincupetru/4693-notifications-hovercard-avatars-misaligned 
Fixed "hovercard avatars misaligned in notifications drop-down"
 2014-03-15 19:15:08 +01:00
Jonne Haß
06ab498620 Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link 
Solved problem with hashtags inside markdown links
 2014-03-15 19:12:37 +01:00
Jonne Haß
3c4d8d95d3 Merge pull request #4794 from Flaburgan/improve-search-page 
Add handle indication on search page, improve design
 2014-03-15 19:09:42 +01:00
Jonne Haß
d4e046ecbc Merge pull request #4787 from hincupetru/4726-infinite-photo-stream 
Added limit by max_time to photos#index for prevent "infinite photo stream"
 2014-03-15 19:07:48 +01:00
Jonne Haß
8280556a47 Introduce message renderer 
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
 2014-03-15 17:16:17 +01:00
Hincu Petru
638744b914 Fixed #4693 2014-03-15 15:25:18 +00:00
Hincu Petru
7c4d783d51 Check if the hashtag is a link in function .hashtagify 2014-03-14 15:49:41 +00:00
flaburgan
027650e856 Add handle indication on search page, improve design 2014-03-13 23:01:42 +01:00
Jason Robinson
8f67e1eb17 Merge pull request #4845 from Flaburgan/fix-mention-publisher 
Fix publisher broken after jquery upgrade
 2014-03-13 21:41:47 +02:00
Hincu Petru
e0b23b2dc4 Fixed #4726 infinite photo stream 2014-03-12 22:22:24 +00:00
flaburgan
1250973267 Fix publisher broken after jquery upgrade 2014-03-12 18:41:38 +01:00
Jonne Haß
11603f5496 Merge pull request #4843 from svbergerem/4228-hovercards-same-pod 
Show hovercards in the notification drop-down for users on the same pod

Conflicts:
	Changelog.md
 2014-03-11 21:50:33 +01:00
Jonne Haß
3fae96697a Merge branch 'MatrixCrawler-4638-Atom-Feed-Error' into develop 2014-03-11 21:27:39 +01:00
MatrixCrawler
3273028ed2 Fix atom feed for reshares of deleted posts. 
Propose for fix #4638

Added Changelog line

Added Specs for testing if the reshared origin post is deleted and therefore not shown in the atom feed
 2014-03-11 21:27:08 +01:00
Steffen van Bergerem
aefcfc7b30 Show hovercards in the notification drop-down for users on the same pod 2014-03-11 20:44:28 +01:00
Jonne Haß
65d7961424 Merge pull request #4844 from svbergerem/new-publisher-fix-button-height 
Fix different button sizes in new publisher
 2014-03-11 18:10:28 +01:00
Steffen van Bergerem
5d44a70e62 Fix different button sizes in new publisher 2014-03-11 17:32:07 +01:00
Jonne Haß
e2801d337c Merge pull request #4842 from seanbrant/patch-1 
Fixes typos
 2014-03-11 00:39:13 +01:00
Sean Brant
9efccb797c Fixes typos 2014-03-10 18:27:16 -05:00
Jonne Haß
766c6f0ac5 Merge pull request #4678 from svbergerem/port-publisher-bootstrap 
Port publisher and bookmarklet to bootstrap
 2014-03-10 18:43:16 +01:00