Steffen van Bergerem
|
d40cbd0b2b
|
Remove unnecessary 'on the home page' steps
|
2015-03-16 14:36:35 +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
|
81cd1753e4
|
Improve link to original post in reshared polls
|
2015-03-15 17:07:16 +01:00 |
|
Jonne Haß
|
6b217c32f2
|
Shorten index for tweet_id too in mysql utf8mb4 migration
|
2015-03-15 16:59:50 +01:00 |
|
Hincu Petru
|
9589cb2e0f
|
disable poll voting for reshared post
|
2015-03-15 16:46:48 +01:00 |
|
Jonne Haß
|
414cfbdae0
|
Array#to_h is new in Ruby 2.1, we still suppport 2.0
|
2015-03-15 15:59:06 +01:00 |
|
Sayed
|
18a1958ef8
|
fix too long tag name #5737
|
2015-03-15 16:15:33 +02: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 |
|
Augier
|
322ee30005
|
Tests with Jasmine
|
2015-03-15 14:52:49 +01:00 |
|
Augier
|
f4534ec412
|
Refactor notification badge view (again)
|
2015-03-15 11:48:06 +01:00 |
|
Augier
|
673661b798
|
Ported searchbar
|
2015-03-15 11:48:06 +01:00 |
|
Augier
|
2a9fddf7a0
|
Port notifications to backbone part. 2
|
2015-03-15 11:48:06 +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
|
caf7470e8e
|
Various style fixes
|
2015-03-15 01:58:29 +01:00 |
|
Jonne Haß
|
faecbc12df
|
Merge pull request #5777 from svbergerem/improve-readablity-participants-count
Conversations: Add rounded corners to participants count and improve readability
|
2015-03-14 18:26:02 +01:00 |
|
Steffen van Bergerem
|
ca087d6b26
|
Conversations: Add rounded corners to participants count and improve readability
|
2015-03-14 18:16:21 +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 |
|
goobertron
|
2b6ca180ce
|
Add tests for liking and unliking posts
|
2015-03-14 14:50:35 +00:00 |
|
Christophe
|
e2a591249a
|
Replace JQuery slide with transition
Conflicts:
app/assets/javascripts/inbox.js
app/assets/stylesheets/conversations.css.scss
|
2015-03-14 14:30:59 +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 |
|
Augier
|
0887137262
|
Add a notification subscribtion to the single post view
|
2015-03-13 23:27:49 +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 |
|
Giniouxe
|
efcff444fd
|
Refactor registrations #5670 - Partial form
|
2015-03-13 16:16:45 +01:00 |
|
Jonne Haß
|
2c2b47eae2
|
Merge pull request #5769 from svbergerem/remove-unused-css
Remove unused css and reduce blockquote font-size
|
2015-03-13 10:44:44 +01:00 |
|
Steffen van Bergerem
|
6dc18ac317
|
Reduce blockquote font-size
|
2015-03-13 01:41:14 +01:00 |
|
Steffen van Bergerem
|
84a5992a42
|
Refactor css code, remove unused code
|
2015-03-13 01:41:14 +01:00 |
|
Steffen van Bergerem
|
992c75da55
|
Merge pull request #5767 from SansPseudoFix/overflow-button-tag-too-long
Change overflow-x to overflow for long tag button
|
2015-03-13 01:19:11 +01:00 |
|
Jonne Haß
|
e6da51d916
|
Merge pull request #5766 from svbergerem/fix-mobile-notifications
Fix mobile notifications
|
2015-03-12 23:58:29 +01:00 |
|
SansPseudoFix
|
8dd8daf37e
|
Change overflow-x to overflow for long tag button
|
2015-03-12 23:46:15 +01:00 |
|
Steffen van Bergerem
|
1ff644c13e
|
Fix mobile notifications
|
2015-03-12 22:45:04 +01:00 |
|
Jonne Haß
|
cc585805ad
|
Merge pull request #5762 from svbergerem/entypo-controls
Use entypo for control icons
|
2015-03-12 19:29:40 +01:00 |
|
Jonne Haß
|
b757703fb1
|
Merge pull request #5763 from svbergerem/use-handlebars-helpers
Use handlebars helpers wherever possible
|
2015-03-12 19:28:42 +01:00 |
|
Steffen van Bergerem
|
af9d6ddab3
|
Use handlebars helpers wherever possible
|
2015-03-12 16:20:32 +01:00 |
|
Steffen van Bergerem
|
0715107735
|
Remove stream frame template
|
2015-03-12 14:43:20 +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 |
|
Marcelo Briones
|
7be56849d9
|
DRY on avatars
|
2015-03-12 09:52:36 -03:00 |
|
goobertron
|
b04a2638a5
|
Add box shadow and radius to avatars
|
2015-03-12 09:52:36 -03:00 |
|
Steffen van Bergerem
|
cb30ffc368
|
Use entypo for post control icons
|
2015-03-12 13:08:23 +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 |
|
SansPseudoFix
|
26ad537a18
|
fix tag button overflow
fix tag button overflow
modified: app/assets/stylesheets/tag.scss
modified: app/assets/templates/tag_following_action_tpl.jst.hbs
|
2015-03-12 00:28:31 +01:00 |
|
Steffen van Bergerem
|
fb8db2f556
|
Merge pull request #5759 from jhass/bump_open_graph_reader
bump open_graph_reader
|
2015-03-11 23:35:52 +01:00 |
|
Jonne Haß
|
2c7b7bb0dc
|
bump open_graph_reader
|
2015-03-11 21:59:02 +01:00 |
|
Jonne Haß
|
6dfc77f385
|
Merge pull request #5758 from svbergerem/fix-missing-assets
Fix missing assets bug
|
2015-03-11 20:36:28 +01:00 |
|
Steffen van Bergerem
|
4f4dfc7554
|
Fix missing assets bug
|
2015-03-11 19:18:05 +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 |
|