nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12505 commits 4 branches 0 tags 121 MiB
Commit graph

6220 commits

Author SHA1 Message Date
Jonne Haß
e70e48d6ca some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
Florian Staudacher
9d391d5885 Merge pull request #3597 from devendram/diaspora-refactoring-1 
refactored user model (using scope instead of class methods) + rspec tests
for daily, monthly, yearly activities
 2012-09-23 09:36:35 -07: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
Devendra
a2fa083c3e added rspec tests and refactored user model to use scope, for daily, monthly, and yearly actives 2012-09-22 01:56:34 +05:30
Sean Tilley
48049d9b49 Merge pull request #3590 from movilla/reshares_mobile_2_the_revenge_absolute_root 
reshare mobile doesnt show the original author - absolute_root - Fix: #3368 [ci skip]
 2012-09-19 20:54:18 -07:00
movilla
dc0b2d9e58 reshare mobile doesnt show the original author - absolute_root - Fix: 3368 2012-09-19 07:30:03 +02:00
Jonne Haß
8674f5aea2 Merge branch 'hotfix/redis_url' into develop 2012-09-18 15:55:32 +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ß
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
452de1b866 fix remaining cukes and some cleanup 2012-09-17 20:35:38 +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ß
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