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

6985 commits

Author SHA1 Message Date
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ß
b207077405 Merge pull request #4859 from hpetru/4848-aspect-memberships-in-notification-dropdown 
Fixed jQuery evenets in notifications-badge
 2014-03-31 13:58:11 +02:00
Hincu Petru
b43e56485d Fixed jquery event listener from notifications-badge.js 2014-03-31 09:52:07 +00: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
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
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
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
Steffen van Bergerem
cd241ee94d Hovercards! Everywhere! 2014-03-23 01:15:26 +01:00
Steffen van Bergerem
d9857a3a10 Add separator between days, don't display grey zero 2014-03-20 00:23:38 +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
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
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
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
Steffen van Bergerem
5d44a70e62 Fix different button sizes in new publisher 2014-03-11 17:32:07 +01:00
Steffen van Bergerem
0241d9c7db use fixture 2014-03-10 17:21:54 +01:00
Steffen van Bergerem
6fc6474e98 Refactor publisher 2014-03-10 15:15:40 +01:00
Steffen van Bergerem
1b85d9d032 Use a button instead of input to submit, use smaller photos 2014-03-10 15:15:40 +01:00
Steffen van Bergerem
0cc3b10b1f port publisher and bookmarklet to bootstrap 2014-03-10 15:15:40 +01:00
Faldrian
da0b305514 atom-feed content changed to html, use better post-title extractor 
Valid atom feed. Also these features are partially included:
- http://activitystrea.ms/specs/atom/1.0/#activity.verb
- http://portablecontacts.net/draft-spec.html#anchor16
 2014-03-09 00:13:32 +01:00
flaburgan
2c4dc830fc Fix aspect renaming after a regression caused by jquery upgrade, close #4822 2014-03-06 00:04:48 +01:00
flaburgan
4cc8f1f76c Fix avatar position in mobile notification 2014-03-03 23:21:31 +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
Florian Staudacher
a2aff720a2 clear locale on each spec run, fix indentation 2014-02-23 17:13:01 +01:00
Florian Staudacher
dc1c156175 try to appease CI 2014-02-23 16:48:48 +01:00
Florian Staudacher
b0502ef07e don't depend on the order of events (focus has two variants in jQuery) 2014-02-23 16:48:48 +01:00
Florian Staudacher
e3b22ed95c fix likes spec 2014-02-23 16:48:47 +01:00
Florian Staudacher
b27edcb2d1 fix search specs 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
f0ae80b82f add browser detection 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
97ede99c0f #toggle was removed 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
4042e50289 Removes client_side_validations 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
1c09b75cc2 remove comment, for the record, it was an arbitrary number picked due to performance reasons 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
9fc70a03a9 remove unused variable 2014-02-23 16:48:47 +01:00