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

3134 commits

Author SHA1 Message Date
MrZYX
4328f72bfb fixed piwik 2011-02-09 19:37:05 +01:00
Nicolas Berens
60b08b9b08 Merge remote branch 'upstream/master' 2011-02-09 06:56:07 +01:00
zhitomirskiyi
41d21c78ef mend 2011-02-08 18:53:18 -08:00
zhitomirskiyi
6be63b88f0 added the pending request to the finder 2011-02-08 18:53:18 -08:00
danielvincent
80117d8ab6 added piwik and ga options to mobile layout 2011-02-08 17:39:41 -08:00
zhitomirskiyi
eecf1d5d82 fixed cucumber, localization, and css 2011-02-08 17:14:37 -08:00
zhitomirskiyi
4e96d11cd0 Revert "refactored local person person friend finder functionality to use the partial" 
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.

Conflicts:

	app/views/services/_remote_friend.html.haml
	app/views/users/getting_started/_step_3.html.haml

refactored invitations, added them to the last page

fixed styling on adding an aspect to the aspect list

added a facebook for person edit aspect memberships

touched up and simplified sign-up flow

fix styling on step 3
 2011-02-08 16:40:33 -08:00
zhitomirskiyi
d147da1b4a invitation text 
setting the invites

added requests to the fb hash

finder has options

remove the requester from the list

typo

making a block

another typo

remove the if statement for the notifications

checking on the right field

translations and correct indenting

fixed stuff added

added a temp puts

added a temp puts

now actually referencing the service

not double nesting

remove stream element

updated remote friends to old style

removed it from the h1 block

putting the stream element back
 2011-02-08 16:40:32 -08:00
zhitomirskiyi
df4ebb286d accept invitation feature passing 
wip, added a form to add aspect to the contact list

added files

typo

render the partial

remote friend

specifying the provider for the route

refactored local person person friend finder functionality to use the partial

typo

trying to use the stream
 2011-02-08 16:40:28 -08:00
zhitomirskiyi
a398184081 WIP 2011-02-08 16:35:33 -08:00
zhitomirskiyi
7241177421 translating the warning about removing the person from the last aspect 2011-02-08 15:44:12 -08:00
zhitomirskiyi
a06ba9105b uniqueness of aspect name through user non case sensitive 2011-02-08 14:52:47 -08:00
maxwell
a649d18cd7 add tests to see if timestamps are updated on recevie...they are not 2011-02-08 14:07:25 -08:00
Nicolas Berens
024ecc1752 Fixed small layout glitch 2011-02-08 17:11:09 +01:00
MrZYX
6e0e46435e localize dates 2011-02-08 16:26:56 +01:00
danielvincent
151999c582 reference the right thing in mobile views 2011-02-06 23:49:22 -08:00
danielvincent
01cfeb65b2 fixed build 2011-02-06 23:42:01 -08:00
danielvincent
bf20e5a9e8 remove some js assets from mobile 2011-02-06 23:09:04 -08:00
danielvincent
42993de739 added back to comments; avatar. 2011-02-06 09:26:24 -08:00
zhitomirskiyi
c2d26e21c3 added a mobile invitation acceptance view, skipping getting started for now 2011-02-05 20:19:47 -08:00
zhitomirskiyi
e3170504b8 using blank instead of checking for nil, since mongo import make these bank 2011-02-05 16:53:14 -08:00
zhitomirskiyi
80da5917fa gave more space to the already invited span 2011-02-05 15:56:08 -08:00
zhitomirskiyi
78c30b847e added files 2011-02-05 15:01:04 -08:00
zhitomirskiyi
83a9e916e4 resending of invitation in resque and works 2011-02-05 15:01:04 -08:00
zhitomirskiyi
da6e16b3a4 WIP 2011-02-05 15:01:04 -08:00
maxwell
ce010c24ec update jquery mobile to a3 2011-02-03 20:41:38 -08:00
maxwell
ee02a073cd toggle mobile site, when mobile device 2011-02-03 18:43:56 -08:00
maxwell
1ed737c3b9 make aspects a link, and remove a big db query from the view 2011-02-03 16:15:51 -08:00
zhitomirskiyi
41bb7a8564 blank instead of nil 2011-02-03 15:16:00 -08:00
zhitomirskiyi
d905021252 comment emails have text 2011-02-03 13:07:26 -08:00
danielvincent
8269e4b300 touched up photo show and status message show pages 2011-02-03 13:05:25 -08:00
Raphael
636242283b Fix cucumber features 2011-02-02 18:49:45 -08:00
Raphael
3114672989 Merge branch 'master' of github.com:diaspora/diaspora 2011-02-02 18:13:03 -08:00
Sarah Mei
e7cf5fc841 Fix/expand cucumber feature for new user signup. 
Replace "wait for aspects page"-type steps with general wait for step.
 2011-02-02 17:17:00 -08:00
Raphael
8a2e0eef7c No semicolons in names 2011-02-02 16:57:04 -08:00
Raphael
cd8d9989cf Refactor publisher JS, use hidden field for submitting 2011-02-02 14:27:14 -08:00
maxwell
34a0abe0c8 fix 500 on mobile notifications page 2011-02-02 13:14:34 -08:00
Raphael
3fb6b0e072 Fix saved state cucumber feature 2011-02-02 11:52:56 -08:00
danielvincent
693ad112ba stream element sockets in non-mobile 2011-02-02 11:29:37 -08:00
Dan Hansen
82db655a56 make the markup between _comment and _stream_element more consistent, fix embedder in comments 2011-02-02 12:55:16 -06:00
maxwell
67ed035f21 make notifications updated_at rather than created at 2011-02-01 21:45:36 -08:00
zhitomirskiyi
34e5ba99bc removed the image or default 2011-02-01 18:11:02 -08:00
zhitomirskiyi
21e3c2ae73 Merge branch 'open-aspects' 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/home_controller.rb
	app/helpers/application_helper.rb
	db/migrate/20110201013408_add_open_aspects_to_user.rb
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/home_controller_spec.rb
 2011-02-01 17:32:08 -08:00
zhitomirskiyi
59f1bff046 storing it as a boolean in the aspect 2011-02-01 17:25:15 -08:00
zhitomirskiyi
7f026e8271 now updating the open aspects in js 2011-02-01 16:58:33 -08:00
Raphael
bbe47fbb55 Correct limit on search autocomplete 2011-02-01 14:35:14 -08:00
MrZYX
423cd7807b Merge branch 'master' of github.com:diaspora/diaspora 2011-02-01 22:45:28 +01:00
MrZYX
7ca8391739 Javascript I18n: fallback to DEFAULT_LANGUAGE for missing keys 2011-02-01 22:45:02 +01:00
Raphael
cfd6639f4d Revert "Merge branch 'open-aspects'" 
This reverts commit 181bd823c4, reversing
changes made to 2c3ed2ab73.
 2011-02-01 13:15:20 -08:00
zhitomirskiyi
bc058332d3 commented on post email now includes the comment 2011-02-01 12:54:05 -08:00
zhitomirskiyi
27f1231479 Merge branch 'master' of github.com:diaspora/diaspora 2011-02-01 12:11:49 -08:00
zhitomirskiyi
181bd823c4 Merge branch 'open-aspects' 2011-02-01 12:10:12 -08:00
zhitomirskiyi
55403d9bea the saved aspects works properly now 2011-02-01 12:07:18 -08:00
Raphael
7d18e2bcd8 Finish autocomplete 2011-02-01 11:56:56 -08:00
Raphael
518642d0d7 Move image_url defaulting logic into profile 2011-02-01 11:56:56 -08:00
Raphael
7be232e33e autocomplete wip 2011-02-01 11:56:56 -08:00
Raphael
9080649180 Starting work on an autocomplete feature 2011-02-01 11:56:56 -08:00
Dan Hansen
cdb5cf37e7 show publisher if it was closed when you select another aspect 2011-02-01 00:40:11 -06:00
maxwell
7bb7bb396a Revert "persists open aspects across logins also fixed the status message controller spec broken in master" 
This reverts commit 9e7f03236e.
 2011-01-31 21:41:05 -08:00
zhitomirskiyi
9e7f03236e persists open aspects across logins also fixed the status message controller spec broken in master 2011-01-31 18:37:20 -08:00
zhitomirskiyi
789ff679a9 persists open aspects across logins also fixed the status message controller spec broken in master 2011-01-31 18:31:41 -08:00
Raphael
c56eaadfa0 Make person profile a little bit aware of an incoming request 2011-01-31 15:47:01 -08:00
Raphael
e3a5102624 incoming request on person show should just link to share_with 2011-01-31 15:28:43 -08:00
Raphael
906de27922 Make notifications/read_all non-ajax, link back to index page 2011-01-31 15:28:43 -08:00
zhitomirskiyi
a6c1b5bf59 mark notification as read on the status message show page 2011-01-31 15:26:20 -08:00
zhitomirskiyi
7a667abc73 unread true on notification receive 2011-01-31 15:09:01 -08:00
zhitomirskiyi
d6ab633e2c Merge branch 'notification-migration' 2011-01-31 14:41:15 -08:00
MrZYX
391a9b0de5 translate contacts in _header.haml 2011-01-31 19:48:36 +01:00
zhitomirskiyi
ac50a0119a spec for not raising on already existant actor 2011-01-31 10:23:26 -08:00
zhitomirskiyi
cfef9a747e all green 2011-01-30 20:10:34 -08:00
zhitomirskiyi
a4988a28b4 WIP 2011-01-30 10:00:03 -08:00
zhitomirskiyi
17dde3a7b9 farther along towards getting the specs to pass 2011-01-29 23:58:48 -08:00
zhitomirskiyi
17a2c9e311 moving over some code migration successful 2011-01-29 23:34:11 -08:00
maxwell
348ae0b61d small hack to add some feedback when links are tapped on the mobile site. 2011-01-29 18:42:50 -08:00
maxwell
5267365b4f move js strings to application helper 2011-01-29 13:54:28 -08:00
Dan Hansen
b89a59ca55 update timeago usages 2011-01-29 13:30:32 -08:00
Dan Hansen
0831ad6e40 move i18n.loadLocale to the application template, remove localize controller & helper, renamed localize to get_javascript_strings_for and added it to the application helper 2011-01-29 13:29:54 -08:00
Dan Hansen
3078156dbb javascript i18n wip 2011-01-29 13:28:43 -08:00
zhitomirskiyi
9d4d0cecdb wip 2011-01-28 22:39:29 -08:00
zhitomirskiyi
f48d7a0826 wip 2011-01-28 22:37:38 -08:00
danielvincent
e3f4ae1cc7 fixed button styling 2011-01-28 17:42:04 -08:00
Raphael
d545900759 Delete comments of a deleted person, until we implement tombstoning 2011-01-28 17:34:32 -08:00
zhitomirskiyi
9d091bbf6a facebook invitations actually work 2011-01-28 17:22:18 -08:00
Raphael
07850c7cb2 fix fb finder, flesh out test 2011-01-28 17:13:20 -08:00
Raphael
8151f3b540 correct partial name 2011-01-28 16:54:30 -08:00
Raphael
7339e46bfb Moving remote friend view out to a partial 2011-01-28 16:42:43 -08:00
zhitomirskiyi
a8ac403e30 share with action for people who are already on diaspora 2011-01-28 16:37:11 -08:00
Raphael
605e70f095 Do application side join to retrieve contacts for fb finder, rather than n query 2011-01-28 16:26:52 -08:00
danielvincent
ae8686ef25 add which_action_and_user to application_controller 2011-01-28 16:15:50 -08:00
Raphael
2dfb9f9618 remove unused method 2011-01-28 15:18:22 -08:00
zhitomirskiyi
3b68fc3e9a the friend finder is respecting of searchable 2011-01-28 13:45:58 -08:00
Raphael
ca76572eae Include profile in services finder 2011-01-28 12:49:30 -08:00
Raphael
dde8fd65e5 Fix build 2011-01-28 12:18:56 -08:00
Raphael
767e58bf94 Correct email picture url 2011-01-28 11:43:15 -08:00
zhitomirskiyi
ced2c18da1 remove caching the footer due to localization issues 2011-01-27 14:17:50 -08:00
zhitomirskiyi
f5ad03f5d9 added visiblity for new aspect on getting started 2011-01-27 13:58:59 -08:00
zhitomirskiyi
897786bce4 able to send email invites if the pod is not fb connected 2011-01-27 13:53:53 -08:00
maxwell
0913389698 fix the null person ID bug in profile 2011-01-27 13:44:37 -08:00
zhitomirskiyi
3ebda174fb make aspect list visible option on new_aspect pane 2011-01-27 13:41:23 -08:00
zhitomirskiyi
dcf6469ded visible contacts option on aspect edit pane 2011-01-27 13:41:22 -08:00