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

285 commits

Author SHA1 Message Date
Raphael
7ca124c002 Refactor views to not be so dumb. 2010-11-27 21:27:27 -05:00
danielvincent
a932547d12 minimizing some queries in the views. only select aspect names and ids in application controller. 2010-11-27 01:05:55 -05:00
Sarah Mei
abae16472d pagination works on aspects#show 2010-11-26 13:09:05 -08:00
Raphael
6e14018abb Fixing http referer 2010-11-25 19:50:14 -05:00
zhitomirskiyi
037f822287 removed the puts 2010-11-25 19:37:05 -05:00
zhitomirskiyi
421078bd0b if you create an aspect from the aspect manage page it redirects back there 2010-11-25 19:37:05 -05:00
zhitomirskiyi
a2d3a940a6 removed the puts 2010-11-25 16:20:09 -08:00
zhitomirskiyi
16d023e800 if you create an aspect from the aspect manage page it redirects back there 2010-11-25 16:18:39 -08:00
maxwell
0965b45f23 fixing getting started 2 2010-11-22 18:28:04 -08:00
danielvincent
d16a4601c2 contact list on aspect#show is ajaxy 2010-11-21 16:30:46 -08:00
danielvincent
b3ec4d10c2 user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion. 2010-11-21 16:30:45 -08:00
maxwell
769c0e1055 DG MS trying to finish statusmessage refactor 2010-11-21 16:13:01 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
maxwell
7fb751b00c making photo uploader work better 2010-11-21 16:11:55 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
danielvincent
85e2316280 Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect 2010-11-11 19:41:12 -08:00
Raphael
7f7697c11d Merge remote branch 'traction/441-failed-aspect-creation-redirect' 2010-10-31 23:22:10 -07:00
danielvincent
b08c4fb84e removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts) 2010-10-31 12:34:26 -07:00
Gabriel Gilder
bdb77ff282 redirecting to :back instead of manage page on failed aspect creation +spec 2010-10-28 21:01:53 -07:00
danielvincent
a0d83e28a1 copy in manage page by clicking 'add a new friend' for now 2010-10-28 11:28:58 -07:00
danielvincent
6626b00961 fix on aspect#show in @friends_not_in_aspect 2010-10-28 11:11:05 -07:00
danielvincent
1d5b7a87f1 Merge branch 'master' into getting-started 2010-10-27 18:14:08 -07:00
danielvincent
db1a753add major hack on getting_started#2 with aspect javascript. reload the page on ajax success on new aspect creation just to get it working. 2010-10-27 18:08:55 -07:00
danielvincent
05c5e770ee removed real name from signup process. 2010-10-27 16:25:22 -07:00
danielvincent
4ec11691cd user has a getting_started flag, set true by default. aspect#index checks to see if getting_started flag is set. 2010-10-27 10:36:13 -07:00
zhitomirskiyi
63c740fce7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-27 09:53:50 -07:00
Raphael
49c09b9c8c Remove unused clean_hash 2010-10-26 19:16:16 -07:00
zhitomirskiyi
fa484e95e4 MS IZ refactored querying 2010-10-26 17:05:38 -07:00
danielvincent
7f1d87f424 fixed pagination bug on aspect#show (re: #445) 2010-10-26 12:57:43 -07:00
zhitomirskiyi
e776389d19 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-26 11:19:50 -07:00
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
ilya
c27f05ed42 Initial refactor done, need to stop mapping user.friends to people so much 2010-10-22 18:11:04 -07:00
Raphael
fe1a6bce20 Attr-accessible on aspects, check whether built user is persisted 2010-10-21 12:49:50 -07:00
ilya
bec1842bed redirects to the right place 2010-10-20 17:40:58 -07:00
ilya
6fa82490c9 remove friend from aspect box, with js call to remove the person from the aspect 2010-10-20 17:34:52 -07:00
ilya
554adeae69 MS IZ; querying through for person not in aspect is tested 2010-10-20 16:39:37 -07:00
ilya
6bee872039 moved the add people into a partial 2010-10-20 15:42:03 -07:00
ilya
62700387ad MS IZ added an add to aspect form on the request partial 2010-10-20 15:30:30 -07:00
ilya
94a7a3c6ad IZ MS; deleted move_friends removed 2010-10-20 14:26:45 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
Sarah Mei
b007ba1487 Fixed cucumber features. Backfilled tests for AspectsController#create. 2010-10-19 22:57:55 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
ilya
9727b356e1 the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
danielvincent
12bdd1712d share on facebook checkbox instead of broadcast button 2010-10-15 13:56:49 -07:00
danielvincent
9162a4a168 DG MS; 404 show pages for objects that don't exist for given user 2010-10-11 11:32:20 -07:00
maxwell
d7521cb288 MS trying to not use MiniFB to post since it is barfing 2010-10-08 14:49:09 -07:00
maxwell
b6b192da01 MS DG trying to move around fb url 2010-10-08 14:25:39 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
Raphael
0859d8ebfe Merge remote branch 'jeffry/master' 2010-10-07 11:45:39 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
maxwell
0fb091ebbc MS pretty sure we dont need to get the oauth path every time we load the public aspect... 2010-10-06 18:38:37 -07:00
danielvincent
4a8a21b95f public fix 2010-10-05 16:28:01 -07:00
Jeffry Degrande
132eec2c63 Merge branch 'upstream' 
Conflicts:
	app/controllers/aspects_controller.rb
 2010-09-29 02:11:20 -03:00
Jeffry Degrande
046dbf063b fix i18n => I18n 2010-09-29 01:49:35 -03:00
ilya
7852c346f2 mode the visible posts api more general and moved to it on the public controller 2010-09-27 18:31:37 -07:00
ilya
c2b84fd9c6 added a public key to post 2010-09-27 16:59:54 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
 2010-09-27 15:39:50 -07:00
Stephen Caudill
43fa70f90b Label error notification as such. 2010-09-26 16:10:13 -04:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Stephen Caudill
fd69f0201f User creates an aspect 2010-09-26 12:05:39 -04:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
ilya
eaea26e58d the public aspect is now set in application controller 2010-09-23 19:33:33 -07:00
ilya
48c212c1ab made a public view, copied the fb publisher there 2010-09-23 12:18:26 -07:00
Raphael
2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
 2010-09-22 21:32:03 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -07:00
danielvincent
af9cda52af DG IZ; always query through the current_user in the controllers. 2010-09-20 13:18:11 -07:00
danielvincent
b097f93bf5 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 11:39:17 -07:00
danielvincent
fe306b37ab DG IZ; mass-assignment quick-fix in controllers 2010-09-20 11:30:27 -07:00
Ariel Zavala
6501974f30 added more translations missing on views 2010-09-21 01:43:54 +08:00
Ariel Zavala
f95cebcb8b Added translations to new requests view and aspects controller 2010-09-17 16:38:50 -04:00
Ariel Zavala
375f4f6808 added more translations missing on views 2010-09-17 10:43:59 -04:00
maxwell
e668071ea5 README.md 2010-09-16 18:48:18 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
maxwell
0d37f065dc MS RS fixed a small group adding bug 2010-09-14 15:13:55 -07:00
Daniel Vincent Grippi
da8ec589b7 RS, DG; display the correct tab on manage, change edit to manage 2010-09-14 10:05:59 -07:00
maxwell
15651a7bb6 IZ MS group manage page can now add friends to groups 2010-09-13 18:10:07 -07:00
Daniel Vincent Grippi
26e4e088d7 flash messages are now being set. 2010-09-13 15:44:26 -07:00
Raphael
ff348eb944 Add flashes back in to aspect and albums 2010-09-13 15:20:57 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
9837340eb2 Rename files from group to aspect 2010-09-13 10:43:15 -07:00
Renamed from app/controllers/groups_controller.rb (Browse further)