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

3458 commits

Author SHA1 Message Date
MrZYX
dce54f3d40 fixed #947 2011-03-19 15:05:45 +01:00
MrZYX
a05c9b0010 fixed a translation, keep up the new format in en.yml, set pagination labels in application controller 2011-03-19 14:04:11 +01:00
Raphael Sofaer
42a361dcce Don't redirect ajax requests to getting_started. Fix a possible source of errors and backfill a couple tests 2011-03-18 21:07:31 -07:00
danielgrippi
3db11cf38d PostsController#index -> TagsController#show 2011-03-18 20:57:39 -07:00
maxwell
8f9f24f383 fix for photo urls before they are processed 2011-03-18 19:00:24 -07:00
maxwell
5aa969559c add processed to post, which is set to default false for photos 2011-03-18 18:51:53 -07:00
maxwell
91a96adb4b fix syntax error 2011-03-18 18:15:57 -07:00
maxwell
358fdb9521 return the right url for gifs 2011-03-18 18:12:20 -07:00
Raphael Sofaer
e2f78a8b8c Protect against pre-existing post_visibilities, log them so we can find out where they are coming from.' 2011-03-18 14:52:27 -07:00
maxwell
300f592a64 do not process gifs, just let them be. 2011-03-17 22:43:18 -07:00
maxwell
93f7f28b07 if you search for a hash (with a '#') it will just take you to that hash page 2011-03-17 19:16:29 -07:00
maxwell
924dc13adc profile tagging now federates #FO #REAL 2011-03-17 18:05:49 -07:00
zhitomirskiyi
379f242a1f removed the mention_popup class inless in profile 2011-03-17 16:29:04 -07:00
maxwell
562c0d40ac profile tags now federate 2011-03-17 16:28:17 -07:00
Raphael Sofaer
e5f9876256 Don't socket the unsocketable, for real this time 2011-03-17 15:51:19 -07:00
Raphael Sofaer
a993c48060 Revert "Don't socket the unsocketable" 
This reverts commit bf53ad9f58.
 2011-03-17 15:50:43 -07:00
Raphael Sofaer
bf53ad9f58 Don't socket the unsocketable 2011-03-17 15:50:07 -07:00
maxwell
b2c0cfb173 remove stray br in stream_element 2011-03-17 15:24:00 -07:00
Raphael Sofaer
bef06d18d8 Move notifying iteration into resque job 2011-03-17 15:19:26 -07:00
zhitomirskiyi
43fc2c4d63 fixed the style on the share with list element 2011-03-17 15:19:12 -07:00
zhitomirskiyi
6cc085d64e addded slideToggle 2011-03-17 14:32:07 -07:00
zhitomirskiyi
2b6165d8ea wip 2011-03-17 14:32:07 -07:00
zhitomirskiyi
433db9fc8b wip, still need to auto hide, and expand on click the contact setting, styling, also would be nice to cache the friend list, and maybe on login queue up a job to refresh it 2011-03-17 14:32:06 -07:00
maxwell
37fefc5bc9 take out gif exception for processing 2011-03-17 14:16:08 -07:00
maxwell
1de52d3ba2 fixed failing cucumber 2011-03-17 13:59:53 -07:00
maxwell
14ff1e0143 ms dg improved styling, fixed delete 2011-03-17 13:59:53 -07:00
maxwell
61bffb50d6 remove puts from photoscontroller 2011-03-17 13:59:53 -07:00
maxwell
82a79c95fe wrote a test for the callback, need to make it pass... 2011-03-17 13:59:53 -07:00
maxwell
58282b91cb move processing to photo callback 2011-03-17 13:59:53 -07:00
maxwell
7ba90a5a98 stuff works 2011-03-17 13:59:53 -07:00
maxwell
bca184eaf3 photos are now successfully delayed 2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f there is a job to process photos and it is called from the controller 2011-03-17 13:59:53 -07:00
maxwell
516b620148 gif and delayed processing wip 2011-03-17 13:59:53 -07:00
Raphael Sofaer
52691920f7 Change 406 to 422 2011-03-17 13:13:47 -07:00
Raphael Sofaer
d2cdc20e2b Finish receive local batch job 2011-03-17 12:56:23 -07:00
Raphael Sofaer
72523cc7f9 SocketsController now takes a user object or a user id, so that we only instantiate the user if we need to 2011-03-17 12:56:23 -07:00
danielgrippi
f0df6deed3 added job and spec for BatchLocalReceive. wip 2011-03-17 12:56:23 -07:00
MrZYX
149b1832fd added newline to stream element partial, otherwise timeago & comment won't display if aspect badge is too big 2011-03-17 20:51:08 +01:00
zhitomirskiyi
574a3b45b1 made it flash the sm on the profile page 2011-03-17 11:54:13 -07:00
maxwell
eed32f70be add a missing space for notifications with less than 4 people 2011-03-17 10:50:11 -07:00
MrZYX
78eebc8920 fixed #935 2011-03-17 16:59:02 +01:00
MrZYX
a78710690a moar translations 2011-03-17 15:11:24 +01:00
zhitomirskiyi
6a33ae7795 fixed the css, added a space 2011-03-16 19:20:24 -07:00
zhitomirskiyi
b0ec5a0b2e moved the fixture to the right place 2011-03-16 18:10:50 -07:00
danielgrippi
e9c094fc2f add styling on tag header 2011-03-16 17:53:25 -07:00
danielgrippi
55ac4c8054 show tags under names in people partials 2011-03-16 17:46:09 -07:00
danielgrippi
a85b5bb70f add a people count on tag page 2011-03-16 17:27:27 -07:00
zhitomirskiyi
abbf949fe1 publishing from a person profile page wip 
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
 2011-03-16 16:35:30 -07:00
MrZYX
e7b4d4e494 the build was failing for a reason 2011-03-16 15:40:56 +01:00
danielgrippi
20b5ca7570 added tag helper text on profile, edit on hover 2011-03-15 22:10:20 -07:00
Raphael Sofaer
7636fec270 Fix select in postscontroller 2011-03-15 18:36:27 -07:00
danielgrippi
68479481cf made websockets far less dumb. don't render partials for people not connected. 2011-03-15 18:21:09 -07:00
danielgrippi
9115a8f1f5 Only show searchable people in postscontroller 2011-03-15 16:22:17 -07:00
danielgrippi
8c7ad9a0a3 Remove unused receive local job 2011-03-15 16:13:09 -07:00
danielgrippi
4943531013 Add stream class to side_stream 2011-03-15 15:20:02 -07:00
danielgrippi
67de069469 Inline the person partial on posts index 2011-03-15 15:13:43 -07:00
danielgrippi
be42ccfa16 Be less glib 2011-03-15 15:03:20 -07:00
MrZYX
4e4e4d763a fixed translations 2011-03-15 21:58:15 +01:00
danielgrippi
c608c70ca7 tagging profiles complete 2011-03-15 13:21:36 -07:00
danielgrippi
1988e195fb a user can put tags in their profile and they show up on the person/show page. 2011-03-15 13:21:36 -07:00
danielgrippi
20f5105e5d breaking out Diaspora::Taggable wip 2011-03-15 13:21:36 -07:00
MrZYX
73f852c6c2 fixed video embedding in comments 2011-03-15 17:48:28 +01:00
MrZYX
21d0fcf47a fixed some 500 on mobile site 2011-03-15 17:02:04 +01:00
MrZYX
cf66e3aebb fixed test in invitation email 2011-03-15 16:25:47 +01:00
Ritchie Wilson
81661d61fc changes the 'You are not sharing with...' button to static text instead of inserting the persons name 2011-03-15 10:00:15 -04:00
maxwell
2e72fc09c6 made 3+ plus collapse in notifications index 2011-03-14 18:09:51 -07:00
Raphael Sofaer
1666843aa9 Fix 500 in publicsController 2011-03-14 16:48:07 -07:00
maxwell
b14ac9606f fix typo, puts in a test, and made the emails types a constant in UserPreferences 2011-03-14 12:21:30 -07:00
Raphael Sofaer
1b0445563e Specs passing with text 2011-03-14 11:39:31 -07:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
maxwell
adbd23ec50 more tests for mailing. the bug was i think we have to restart the resque workers 2011-03-14 11:32:59 -07:00
maxwell
28fc093a01 fix bug in user edit mailer view 2011-03-14 11:32:59 -07:00
maxwell
d91fda656c Revert "js hack to see bigger version of photo thumbnails in the stream without being abnoxious" 
This reverts commit ab997e2d21.
 2011-03-14 09:51:06 -07:00
MrZYX
2a5d41cc82 fixed translations for comments 2011-03-13 21:16:43 +01:00
Kiran Soumya
7c3a173010 Bug Fix for #913 with Rspec and Cucumber test cases, for a scenario, where a user is mentioned on a post and when that user closes his account, then his contacts cannot see their homepages due to this post 2011-03-12 11:08:40 +05:30
MrZYX
ed8d4db3a8 some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones 2011-03-12 03:27:28 +01:00
maxwell
e52d14f1e9 attempting to fix bug #913 2011-03-11 17:43:55 -08:00
maxwell
ab997e2d21 js hack to see bigger version of photo thumbnails in the stream without being abnoxious 2011-03-11 17:16:43 -08:00
maxwell
50d9d76562 update translations for email settings, and missing translation for aspect#new 2011-03-11 16:02:24 -08:00
maxwell
d825eeaaa0 updated to listen to disable mail 2011-03-11 15:43:40 -08:00
maxwell
52b970098b add specs for updating email settings in the controller, and user#mail 2011-03-11 15:43:29 -08:00
maxwell
e9a843b095 email prefs are now saved. need more tests and use it in user#mail 2011-03-11 15:42:53 -08:00
Raphael Sofaer
9f368bf82f Change person show page to created_at ordering, since you're looking at that person's content 2011-03-11 10:15:17 -08:00
Raphael Sofaer
fbfd46a506 change peoplecontroller order, fix grammar in public default 2011-03-11 10:12:37 -08:00
MrZYX
879672576f fixed #919 2011-03-11 19:11:03 +01:00
MrZYX
e3c5e7ba05 person -> author in app/views/comments/_comment.mobile.haml 2011-03-11 16:20:05 +01:00
MrZYX
e4be5db881 there can be no reason to not set the locale 2011-03-11 15:37:33 +01:00
Michael Nutt
c7362707b3 fix js error; stream ajax success handler should expect json 2011-03-11 00:31:43 -05:00
maxwell
ffa6b9879f added default development page so it doesnt look so terrible 2011-03-10 20:31:39 -08:00
danielgrippi
54130b49b7 Revert "fix a few invalid html tags" 
This reverts commit 004d9b5028.
 2011-03-10 19:42:37 -08:00
danielgrippi
9ad96726de just use tag search for now 2011-03-10 19:42:24 -08:00
Michael Nutt
004d9b5028 fix a few invalid html tags 2011-03-10 22:18:40 -05:00
Dan Hansen
490a2c6a9e remove extra protocol in the link 2011-03-10 21:16:45 -06:00
Raphael Sofaer
35903514f5 remove wasteful join 2011-03-10 18:53:23 -08:00
Raphael Sofaer
b86098055e Add tag search on public page 2011-03-10 18:37:45 -08:00
Raphael Sofaer
c35f143b29 always link to hashtag. 2011-03-10 18:37:45 -08:00
Raphael Sofaer
ea98b1ca81 Tags now link to meaningless query in PostsController 2011-03-10 18:37:45 -08:00
Raphael Sofaer
f19857cc40 Simplify regex madness 2011-03-10 18:37:45 -08:00
Raphael Sofaer
c1bcfef90c TAGS ARE SO COOL 2011-03-10 18:37:45 -08:00
Dan Hansen
c9545920f8 title on landing page 2011-03-10 18:40:54 -06:00