goobertron
|
1dfde65556
|
Alter link behaviour of OG previews
|
2014-03-26 19:24:06 +00: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ß
|
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 |
|
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ß
|
766c6f0ac5
|
Merge pull request #4678 from svbergerem/port-publisher-bootstrap
Port publisher and bookmarklet to bootstrap
|
2014-03-10 18:43:16 +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 |
|
Florian Staudacher
|
7fbf508165
|
Merge pull request #4831 from MrZYX/fix_plaintext_mentions
Fix plaintext mode for mentionable
|
2014-03-09 15:09:31 +01:00 |
|
Jonne Haß
|
bd24cb71a4
|
Fix plaintext mode for mentionable
Also slight refactors to it.
|
2014-03-09 14:02:15 +01:00 |
|
Jonne Haß
|
4fce682635
|
Merge pull request #4834 from Faldrian/atomfeedtohtml
atom-feed content changed to html, use better post-title extractor
|
2014-03-09 01:13:38 +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 |
|
Jonne Haß
|
c3c2129e95
|
Merge pull request #4827 from Flaburgan/fix-aspect-renaming
Fix aspect renaming after a regression caused by jquery upgrade
|
2014-03-08 12:49:52 +01:00 |
|
flaburgan
|
2c4dc830fc
|
Fix aspect renaming after a regression caused by jquery upgrade, close #4822
|
2014-03-06 00:04:48 +01:00 |
|
Jonne Haß
|
f12546bb78
|
Merge pull request #4823 from Flaburgan/fix-avatar-mobile-notification
Fix avatar position in mobile notification
|
2014-03-04 00:41:44 +01:00 |
|
flaburgan
|
4cc8f1f76c
|
Fix avatar position in mobile notification
|
2014-03-03 23:21:31 +01:00 |
|
Jonne Haß
|
d26ca74623
|
Merge pull request #4805 from Flaburgan/refactor-mobile-css
Fix drawer in mobile version
|
2014-02-27 13:13: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 |
|
Jonne Haß
|
a1c222dd23
|
Merge pull request #4681 from diaspora/upgrade_to_jquery_10
Upgrade to jquery 10
|
2014-02-24 10:29:08 +01:00 |
|
Florian Staudacher
|
a2aff720a2
|
clear locale on each spec run, fix indentation
|
2014-02-23 17:13:01 +01:00 |
|
Florian Staudacher
|
1f98e1c639
|
cleanup 'getting started' cukes a bit
|
2014-02-23 16:48:48 +01:00 |
|