Florian Staudacher
|
bf82fc17fe
|
fix oembed onclick behavior + specs
|
2012-10-03 19:05:17 +02:00 |
|
Jonne Haß
|
2f9dbdbd86
|
use self instead of AppConfig to query redis_url inside AppConfig
|
2012-09-18 15:52:57 +02:00 |
|
Jonne Haß
|
6c1a1ec6d2
|
it's enviroNment
|
2012-09-15 18:52:12 +02:00 |
|
Jonne Haß
|
9e264b5258
|
hotfix typo, thanks david
|
2012-09-15 18:28:43 +02:00 |
|
Jonne Haß
|
48dcccf7b3
|
Unify redis initialization
REDISTOGO_URL is now deprecated in favor of REDIS_URL which is supported by the redis gem too.
|
2012-09-15 18:23:22 +02:00 |
|
Jonne Haß
|
f1631084d3
|
Merge pull request #3579 from movilla/css_modification_counter_tw_fb_tmblr
css modification on the number of characters twiter, facebook and tumblr...
|
2012-09-14 08:28:58 -07:00 |
|
movilla
|
426fe1ab7d
|
css modification on the number of characters twiter, facebook and tumblr -.counter-
|
2012-09-14 16:45:03 +02:00 |
|
Jonne Haß
|
4bada36bf1
|
do not redirect admin to his profile upon sign in
|
2012-09-14 15:01:19 +02:00 |
|
Jonne Haß
|
3dbbbbe979
|
bump jasmine and handlebars_assets, postfix all handlebars templates with _tpl to avoid name clashes
|
2012-09-12 21:22:34 +02:00 |
|
Jonne Haß
|
142e38e78b
|
update devise
|
2012-09-12 13:29:57 +02:00 |
|
Jonne Haß
|
2de0213d6f
|
Revert "Removed a couple missed "new_styles" assets."
This reverts commit e323d6134e.
|
2012-09-12 12:55:57 +02:00 |
|
Jonne Haß
|
2b729059c9
|
was too long awake last commit, here are the files back we still need
|
2012-09-12 12:55:57 +02:00 |
|
Hans Fase
|
e323d6134e
|
Removed a couple missed "new_styles" assets.
|
2012-09-12 04:05:33 -04:00 |
|
Jonne Haß
|
7ec2f8f419
|
finish beta striping
A lot of cleanup is still needed, refactoring the CSS to be consistent, removing all sorts of unused stuff etc
|
2012-09-12 07:51:19 +02:00 |
|
Jonne Haß
|
ab0ad630df
|
strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep
|
2012-09-12 05:48:12 +02:00 |
|
Jonne Haß
|
ffde639f4d
|
Merge branch 'betastrip' of git://github.com/DeadSuperHero/diaspora
|
2012-09-12 04:55:10 +02:00 |
|
Sean Tilley
|
49ea8c8563
|
Strip Beta Features
|
2012-09-11 21:52:53 -05:00 |
|
movilla
|
10eb26ad2d
|
With mobile click "show" in #nsfw-posts links to top of page Fix: #3564
|
2012-09-11 16:42:55 +02:00 |
|
Florian Staudacher
|
04a17fd508
|
Merge pull request #3561 from movilla/NSFW_mobile_will_come_back
NSFW mobile come back
|
2012-09-10 13:08:51 -07:00 |
|
movilla
|
a4a483af90
|
NSFW mobile come back
|
2012-09-10 20:48:34 +02:00 |
|
Sean Tilley
|
3deff9327a
|
Merge pull request #3557 from movilla/web_mobile_login_second
New web mobile login (Jonne suggestion) [ci skip]
|
2012-09-08 12:02:15 -07:00 |
|
movilla
|
c6d24c61f9
|
404 page set for mobile
|
2012-09-08 19:43:10 +02:00 |
|
movilla
|
a564cbff9d
|
New_login_mobile_web_
|
2012-09-08 15:30:59 +02:00 |
|
Jeremy Huffman
|
c8f8f6741a
|
let profile tag entry grow to size of input box
use auto so line-breaks work better
|
2012-09-07 23:24:41 -04:00 |
|
Jonne Haß
|
edc9d75df7
|
remove deprecation warning about outdated render call
|
2012-09-07 01:55:53 +02:00 |
|
Jonne Haß
|
81442f0f2a
|
Erb::Util.h now escapes ' which it didn't before
this is what 3.2.8 actually fixes to prevent XSS iirc
We're including the raw message in the atom feed so
we should test for it
|
2012-09-06 21:12:49 +02:00 |
|
Florian Staudacher
|
9f27eba174
|
Merge pull request #3539 from movilla/404_blank_page_mobile
Fix #3428 blank page 404 on mobile
|
2012-09-06 10:05:09 -07:00 |
|
movilla
|
b0ecc57631
|
Fix uncomfortable overflow mobile post
|
2012-09-05 16:51:27 +02:00 |
|
movilla
|
c0c568365a
|
Fix blank page 404 on mobile
|
2012-09-04 00:09:45 +02:00 |
|
Florian Staudacher
|
45223fd634
|
Merge pull request #3520 from movilla/new_mobile_resgistrations_
New mobile page registrations, add an error message to registrations page, friendlier design, add placeholders and ().upcase
|
2012-08-31 01:17:20 -07:00 |
|
Maxwell Salzberg
|
8b7934006e
|
Merge pull request #3491 from fermionic/issue-3420-remote-comments-dont-delete
Give relayable retractions a chance to propagate locally before deleting the target
|
2012-08-30 13:04:59 -07:00 |
|
Sean Tilley
|
3775deb03f
|
Merge pull request #3525 from movilla/big_block_login_
Issue #3523: The text 'Gebruikersnaam' (unsername in Dutch) overlay the inputfield. [ci skip]
|
2012-08-30 10:13:44 -07:00 |
|
movilla
|
6a32bdd570
|
Issue #3523: Overflow text username in Duych - maybe several language-_
|
2012-08-30 16:03:35 +02:00 |
|
movilla
|
94525f5e45
|
Issue #3523: Overflow text username in Duych - maybe several language-
|
2012-08-30 15:55:54 +02:00 |
|
movilla
|
6c6be3e22a
|
New mobile_web registrations
|
2012-08-29 23:09:52 +02:00 |
|
Maxwell Salzberg
|
c3f073b520
|
Merge pull request #3511 from movilla/placeholder_friendly_mobile_search
Add placeholder search mobile[ci skip]
|
2012-08-26 23:26:50 -07:00 |
|
movilla
|
b1815c8e9a
|
Add placeholder search mobile
|
2012-08-25 03:45:02 +02:00 |
|
Daniel Grippi
|
b8f7d025d5
|
update landing page
|
2012-08-24 13:45:05 -07:00 |
|
Maxwell Salzberg
|
ac9af24209
|
Merge pull request #3505 from movilla/add_header_mobile_icons
Add icon to search & contacts via mobile
|
2012-08-22 10:40:02 -07:00 |
|
Maxwell Salzberg
|
4c9326eaf9
|
fix stupid sign up form
|
2012-08-21 15:42:07 -07:00 |
|
movilla
|
75402bdfa0
|
Add icons search & contacts mobile
|
2012-08-21 16:50:37 +02:00 |
|
movilla
|
e41ef3caa5
|
Small changes in mobile_style
|
2012-08-20 22:40:52 +02:00 |
|
Maxwell Salzberg
|
2b2e5f1739
|
Merge pull request #3501 from movilla/private_conversation_new_0
Added private conversation for mobile - #1397
|
2012-08-20 10:52:07 -07:00 |
|
movilla
|
9913f40a38
|
Added private conversation for mobile
|
2012-08-20 16:33:05 +02:00 |
|
Maxwell Salzberg
|
35937b24b7
|
dont beta0fiy users. going all in
|
2012-08-19 23:11:06 -07:00 |
|
Maxwell Salzberg
|
54a6ac0c6f
|
add poduptime asset
|
2012-08-19 17:34:33 -07:00 |
|
Maxwell Salzberg
|
329a37ef9a
|
Merge pull request #3493 from movilla/conversation_mobile
Add file mobile conversation
|
2012-08-14 11:08:41 -07:00 |
|
movilla
|
783edaa327
|
Fix issue #3473 Wrong profile icon size in tag stream
|
2012-08-12 23:23:16 +02:00 |
|
movilla
|
9931f39ce0
|
add mobile conversation
|
2012-08-12 05:01:42 +02:00 |
|
Maxwell Salzberg
|
f065ba624b
|
Merge pull request #3492 from movilla/footer_mobile
add padding-top footer mobile [ci skip]
|
2012-08-09 11:43:22 -07:00 |
|