flaburgan
a02b0519c9
Fix "more picture" indication (+n) on mobile by adding a link on the indication
2013-11-16 02:06:45 -08:00
Jonne Haß
859cd83e38
Merge pull request #4583 from Flaburgan/refactor-mobile-header
...
Refactor mobile header, close #4579
Conflicts:
Changelog.md
2013-11-10 23:55:55 +01:00
flaburgan
0f2773053e
refactor mobile header, close #4579
2013-11-09 23:21:32 -08:00
Fabian Rodriguez
7b861ecfac
Merge pull request #4582 from diaspora/fix_4534
...
getting started page mobile error 500. Fix #4534
2013-11-09 15:13:59 -08:00
movilla
1fcd675b3e
getting started page mobile error 500. Fix #4534
2013-11-09 19:25:32 -02:00
Fabian Rodriguez
146044bd36
Merge pull request #4578 from taratatach/force-comments-sort-order-in-mobile-spv
...
force comments sort order in mobile spv
2013-11-07 18:16:52 -08:00
Fabian Rodriguez
fdfe50b581
Merge pull request #4567 from Flaburgan/refactor-modify-aspect-facebox
...
Refactor modify aspect facebox
2013-11-07 17:53:43 -08:00
Erwan Guyader
0afdb134f8
force comments sort order in mobile spv
2013-11-07 17:19:23 -08:00
flaburgan
bee2c63762
Change icon when adding, fix #4568
2013-11-07 12:55:50 -08:00
flaburgan
3df0fdc09b
Improve the management of the contacts visibility settings in an aspect
2013-11-07 12:55:35 -08:00
Jonne Haß
3251fce3d6
Merge pull request #4580 from svbergerem/refactor-publisher
...
Refactor publisher css
2013-11-07 11:26:29 -08:00
Steffen van Bergerem
d5c3079623
refactor publisher css
2013-11-07 17:12:35 +01:00
Fabian Rodriguez
665f9735d9
Merge pull request #4569 from Flaburgan/reorder-menu
...
Put the stream first in the left menu
2013-11-04 17:50:26 -08:00
flaburgan
47645dd985
Put the stream first in the left menu
2013-11-04 17:46:45 -08:00
Jonne Haß
76c75af373
Merge pull request #4556 from Raven24/conversations
...
refactor conversation message creation
2013-10-21 03:46:57 -07:00
Florian Staudacher
1c4ad0986c
refactor message creation (conversations)
2013-10-20 22:46:53 +02:00
Jonne Haß
ada6594755
Merge pull request #4551 from Raven24/conversations
...
refactor conversations_controller#create
2013-10-11 01:14:01 -07:00
Florian Staudacher
830747a11e
refactor conversations_controller#create
2013-10-10 21:42:46 +02:00
Florian Staudacher
a75a5088ef
Merge pull request #4387 from MrZYX/refactor_twitter
...
refactor twitter service model
2013-09-30 09:13:14 -07:00
Jonne Haß
eea9467846
refactor twitter service model
2013-09-30 10:13:14 +02:00
Jonne Haß
4bc28f2285
Merge pull request #4547 from Raven24/conversations
...
refactor conversations_controller a bit
2013-09-30 01:11:33 -07:00
Florian Staudacher
260d86d501
refactor ConversationsController, move query builing to User model
2013-09-30 01:44:57 +02:00
Dennis Schubert
6e62a99732
Merge pull request #4542 from Raven24/empty_publishing
...
avoid publishing empty posts
2013-09-25 13:49:52 -07:00
Florian Staudacher
e614562470
avoid publishing empty posts ( fixes #4401 )
...
invalidate empty posts when created by a local user
add changelog entry
2013-09-24 21:57:22 +02:00
Jonne Haß
5aa13adfb1
Do not fail when environment.sidekiq.retry is set to false, closes #4545
2013-09-24 13:59:07 +02:00
Jonne Haß
1da6664712
updated 44 locale files [ci skip]
2013-09-24 13:46:59 +02:00
Jonne Haß
41733eab72
Merge pull request #4543 from Flaburgan/regression-404
...
Fix regression in 404.html
2013-09-23 03:19:57 -07:00
Jonne Haß
981fbc6a85
Merge pull request #4544 from ssrihari/fix-green-color-regression
...
Removing the conflicting green in colors
2013-09-23 03:19:05 -07:00
Srihari Sriraman
c379fb351e
Removing the conflicting green in colors
...
- This was a regression from pull request #4541
- Moved the red color to the section above to separate it from the rgb
colors that aren't used
2013-09-23 09:48:45 +05:30
flaburgan
635f83b240
Fix regression in 404.html
2013-09-22 20:29:35 -07:00
Jonne Haß
141fc814ba
Merge pull request #4541 from ssrihari/merge-variables-to-colors
...
Moving colors in variables.scss to colors.scss
2013-09-22 04:31:10 -07:00
Srihari Sriraman
91d9d5aea5
Removing the comment regarding the source of the lines
...
MrZyk pointed out that this information is preserved in git.
2013-09-22 15:31:27 +05:30
Srihari Sriraman
034361154f
Moving colors in variables.scss to colors.scss
...
- Fixed the conflicting red color
- Currently using the darker red
2013-09-22 14:40:56 +05:30
Florian Staudacher
39810e6196
decode URLs before processing them ( fixes #4507 )
2013-09-21 15:23:30 +02:00
Jonne Haß
134c7faf45
Merge pull request #4540 from Flaburgan/remove-last-post-link
...
Remove last post link
2013-09-21 03:10:25 -07:00
flaburgan
02ef9e08f6
Remove the (now useless) last post link from the user profile.
2013-09-20 17:37:34 -07:00
Jonne Haß
d4504589c9
add translation for connect to wordpress
2013-09-20 18:54:13 +02:00
Jonne Haß
a2b6740fed
pluralize admins.user_search.you_currently
2013-09-20 13:21:33 +02:00
Fabian Rodriguez
abc06686ce
Merge pull request #4523 from Flaburgan:improve-getting-started
...
Conflicts:
Changelog.md
2013-09-19 19:37:54 -03:00
Jonne Haß
363103cdaf
Make sure there always was a call to Diaspora.I18n.loadLocale before running a jasmine spec
2013-09-20 00:21:16 +02:00
Jonne Haß
ad20a8487b
bump ruby-oembed
2013-09-19 23:39:13 +02:00
Jonne Haß
68da48f0d6
Merge pull request #4079 from Flaburgan/patch-3
...
Fix #4078 by refactoring 404.html
2013-09-19 14:34:34 -07:00
Jonne Haß
2296489704
Merge pull request #4532 from Flaburgan/add-help-link
...
Add help link
2013-09-19 14:33:39 -07:00
Jonne Haß
ac13e79225
Merge pull request #4529 from Flaburgan/fix-timeago-color
...
Change .timeago color and align notification, fix #4502
2013-09-19 23:32:32 +02:00
Jonne Haß
e6be888707
Merge pull request #4522 from fubik/transparent_background
...
Add a white background to images displayed in the lightbox
Conflicts:
Changelog.md
2013-09-19 23:27:57 +02:00
Jonne Haß
540d233052
Merge branch 'PallaviTS-fix-commenting' into develop
2013-09-19 23:23:16 +02:00
Florian Staudacher
96f80c8cab
cleanup jasmine tests
...
and added changelog entry for bugfix #4005
2013-09-19 23:22:49 +02:00
PallaviTS
5caa46cc83
fixing commenting
...
Added jamisne tests for comments
Added 2 jasmine tests for fixing commenting
Bugfix: #4005 added changelog entry
2013-09-19 23:22:48 +02:00
flaburgan
126e7bdc9c
Refactor getting_started page, test if facebook is available, fix #4520
2013-09-18 22:06:47 -07:00
Antoine D
48dcea0746
Fix #4078 by refactoring 404.html
...
I moved 404 to the assets to avoid loading font and images from joindiaspora.
#- Can I move the design to a 404-style.css file which will be in the public repository too ?
#- This pull request proposes to insert the two font files and the cat image, do you agree ? Depend of amazon seems really bad for me.
2013-09-18 15:55:46 -07:00
