Sean Tilley
|
7dfa6299ec
|
Merge branch 'reshares_count_stream' of https://github.com/movilla/diaspora into movilla-reshares_count_stream
Conflicts:
Changelog.md
|
2012-11-07 21:04:52 -06:00 |
|
Braulio Martinez
|
36c7c00550
|
Remove unused posts#new action from Backbone
|
2012-11-07 23:15:38 -02:00 |
|
movilla
|
5a2b22ff0c
|
reshares_count come back!
|
2012-11-06 21:05:48 +01:00 |
|
Jonne Haß
|
a78cacb799
|
Merge pull request #3687 from movilla/add_icon_mobile_my_activity
Add My Activity icon mobile. Close #3680
|
2012-11-06 09:02:46 -08:00 |
|
movilla
|
e943a1cab6
|
Fix overflow button in mobile reset password
|
2012-10-31 23:31:24 +01:00 |
|
movilla
|
880b16f530
|
Add My Activity icon mobile
|
2012-10-29 12:14:19 +01:00 |
|
movilla
|
c9b58c9ff6
|
Add My Activity icon mobile
|
2012-10-26 22:47:43 +02:00 |
|
Sean Tilley
|
4b372cfca9
|
Merge pull request #3669 from DeadSuperHero/feature/remove-alpha-logo
Remove Alpha logo from branding [ci skip]
|
2012-10-19 11:49:38 -07:00 |
|
Sean Tilley
|
e2a2767a74
|
remove alpha from branding
|
2012-10-19 13:47:27 -05:00 |
|
Florian Staudacher
|
2694c930a5
|
Merge pull request #3645 from Raven24/fix-link-regex
simplify link regex and fix #3553
|
2012-10-19 02:24:24 -07:00 |
|
Jonne Haß
|
107b7b1cba
|
let closelabel.png and loading.gif respect the asset host
|
2012-10-16 16:56:08 +02:00 |
|
movilla
|
ebd1b28b2d
|
Fix problem javascript with read-unread notifications on notifications popup
|
2012-10-13 15:16:06 +02:00 |
|
Fabián Rodríguez
|
40f5314184
|
adds password_confirmation field to registration page
|
2012-10-11 19:45:52 -02:00 |
|
Florian Staudacher
|
ded69477ba
|
replace the monstrous link regex with a slightly less complicated one,
based on the one from the markdown parser, fixes #3553
adding a list of urls for testing the regex in the specs
|
2012-10-11 23:39:44 +02:00 |
|
Jonne Haß
|
8febcfac9c
|
Merge pull request #3635 from movilla/fix_checkbox_select_profiles
Edit Profile issue with misaligned elements - Fix #3599
|
2012-10-08 06:51:04 -07:00 |
|
movilla
|
509aa3116d
|
Edit Profile issue with misaligned elements - Fix 3599
|
2012-10-08 15:25:17 +02:00 |
|
Florian Staudacher
|
a9bec8a4ee
|
Merge branch 'hotfix/oembed-selector' into develop
fix for the click event handler on oembed-ed content
|
2012-10-03 19:12:48 +02:00 |
|
Florian Staudacher
|
bf82fc17fe
|
fix oembed onclick behavior + specs
|
2012-10-03 19:05:17 +02:00 |
|
movilla
|
aa8c89a0e4
|
css error in post-viewer after update bootstrap
|
2012-09-29 15:19:39 +02:00 |
|
Jonne Haß
|
0a1be1400d
|
Merge pull request #3603 from movilla/translation_ignore_user_popup
traslation popup ignore user => /stream
|
2012-09-22 13:47:34 -07:00 |
|
movilla
|
812fce7181
|
traslation popup ignore user /stream
|
2012-09-22 22:07:17 +02:00 |
|
Jonne Haß
|
3e44808cb2
|
Merge pull request #3587 from movilla/image_profile_post
images disappeared user profiles in the publication (/post/) for not having class in css
|
2012-09-17 15:43:00 -07:00 |
|
movilla
|
bacb99cd18
|
images disappeared user profiles in the publication (/ post) for not having class in css
|
2012-09-17 23:41:46 +02:00 |
|
Jonne Haß
|
42f97db42e
|
Merge branch 'select_aspects_dropdown_list' of git://github.com/movilla/diaspora into develop
|
2012-09-17 21:36:36 +02:00 |
|
Florian Staudacher
|
8193978fd2
|
in 'standalone' mode, the close button is hidden
... publisher is embedded into something, that has its own close button
|
2012-09-17 20:46:33 +02:00 |
|
Florian Staudacher
|
1002fe088d
|
split up the various parts of the publisher,
should probably rather be backbone-subviews ... ?
|
2012-09-16 17:38:58 +02:00 |
|
movilla
|
ae0ac1c72d
|
css change when you choose aspects before posting -dropdown list-
|
2012-09-16 17:37:27 +02:00 |
|
Florian Staudacher
|
948b84eca1
|
WIP backbone-ify publisher, get rid of weird old POJsO
|
2012-09-16 14:35:59 +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ß
|
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ß
|
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
|
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 |
|
movilla
|
b0ecc57631
|
Fix uncomfortable overflow mobile post
|
2012-09-05 16:51:27 +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 |
|
movilla
|
6c6be3e22a
|
New mobile_web registrations
|
2012-08-29 23:09:52 +02:00 |
|
Daniel Grippi
|
b8f7d025d5
|
update landing page
|
2012-08-24 13:45:05 -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 |
|