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

1783 commits

Author SHA1 Message Date
Ilyaaaaaaaaaaaaa Zhitomirskiy
7fd7fa968c fixed the email from header issues and backfilled few tests 2011-08-22 17:38:40 -07:00
MrZYX
f8a030d761 updated locales 2011-08-22 23:16:30 +02:00
MrZYX
87cd09a936 fix string concat 2011-08-22 23:09:51 +02:00
Dan Hansen
4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	spec/javascripts/stream-spec.js
 2011-08-21 20:57:01 -05:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Andrej Kacian
b772b8354d Fixed misplaced translations for no tags on own profile 2011-08-22 01:55:36 +02:00
Gonzalo Rodriguez
4ccb5f778a Missing js for contacts page. Aspect renaming wasn't working. 2011-08-21 20:31:16 -03:00
MrZYX
1b5698c1f5 updated locales 2011-08-21 17:09:16 +02:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
 2011-08-20 14:40:56 -05:00
Gonzalo Rodriguez
f1cf81772b Closes #1386. On conversations, disable Reply button once pressed 2011-08-20 15:51:39 -03:00
Maxwell Salzberg
bb5ada6533 create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
fe78a69161 combine invitation emails 2011-08-19 12:15:11 -07:00
MrZYX
f2e25c5fc5 updated locales 2011-08-19 20:39:26 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962 Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 
This reverts commit a407f12463.
 2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463 Revert "Merge branch 'issue1586-aspectdropdown-when-posting'" 
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
 2011-08-18 16:16:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
Gonzalo Rodriguez
2d54d9a97e Validate presence of message text on conversations. Closes #1329. 2011-08-17 23:52:31 -03:00
MrZYX
1da481d362 updated locales 2011-08-17 21:26:59 +02:00
Raphael Sofaer
f2e079f532 Revert "Move the include of splunklogging into the appconfig check" 
This reverts commit 25752e9f93.
 2011-08-16 15:04:51 -07:00
Raphael Sofaer
cc3eeac98e Merge the aspect dropdown in the publisher with master, some things are still broken 2011-08-16 14:59:53 -07:00
Raphael Sofaer
25752e9f93 Move the include of splunklogging into the appconfig check 2011-08-16 12:26:57 -07:00
MrZYX
1e53261606 updated locales 2011-08-16 19:43:57 +02:00
danielgrippi
32ae21a213 removed user invite counter, as it was already depricated 2011-08-15 15:15:43 -07:00
MrZYX
78aa6d0943 updated locales 2011-08-15 14:01:36 +02:00
MrZYX
a9312daf69 fixed syntax error in ml.yml 2011-08-15 13:50:05 +02:00
Anish A
e7f1c3d251 malayalam localization stage 3. diaspora completed 2011-08-15 14:03:17 +05:30
Anish A
2cea39672e malayalam localization stage 2. javascript completed 2011-08-15 14:03:17 +05:30
Anish A
a3ac384aa5 malayalam localization restarted. devise.ml.yml completed 2011-08-15 14:03:17 +05:30
MrZYX
7e59193e2c updated locales 2011-08-13 23:54:14 +02:00
Raphael Sofaer
f60ce932b1 Localize string 2011-08-13 09:44:40 -07:00
danielgrippi
a8d37fb3fc Move Facebook inviter view into the contacts layout, rather than a facebox 2011-08-12 17:05:01 -07:00
Raphael Sofaer
3831c13a4a Move the app/models/jobs folder to match the name of the module 2011-08-12 15:56:26 -07:00
danielgrippi
7e901d0220 remove shapado 2011-08-12 11:12:30 -07:00
MrZYX
6e0630c43f updated locales 2011-08-11 22:21:32 +02:00
Raphael Sofaer
0b00616b8c Create appConfig option for following diasporahq 2011-08-11 12:01:14 -07:00
Raphael Sofaer
a2043671ce Move comment email subject line code into models 2011-08-11 10:46:15 -07:00
Dan Hansen
2e9040e227 merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less 2011-08-10 23:57:33 -07:00
danielgrippi
db645e8da8 merged publics/show and posts/show 2011-08-10 18:07:38 -07:00
Raphael Sofaer
350a4b4f6d Fix 500 on invitations new on unknown facebook user... bad solution, maybe we should just delete the offending invitations? 2011-08-10 16:42:08 -07:00
Raphael Sofaer
f30df2c88d Fix invitation email subject 2011-08-10 12:10:02 -07:00
Maxwell Salzberg
2d6a69cdc8 fix for 500s in liked emails for reshares and activity streams photos 2011-08-10 10:25:43 -07:00
Maxwell Salzberg
d22e5e7598 make some getting started text slightly cleaner 2011-08-10 09:38:54 -07:00
Sarah Mei
0b02653f44 Merge pull request #1694 from ticho/tag-list-has-unfollow-icon 
Add a "unfollow" icon to each tag in followed tags listing
 2011-08-09 21:44:21 -07:00
Maxwell Salzberg
7b1ff4cd7b more mobile site compatability. edit profile now is a switch hitter, adding flash to the signup form 2011-08-09 18:02:50 -07:00
Andrej Kacian
2a970145c8 Added icon to directly unfollow a tag to listing of followed tags. 2011-08-09 22:45:06 +02:00
danielgrippi
aac72b12e7 added hoptoad support, API key read from application.yml 2011-08-09 10:46:15 -07:00
Raphael Sofaer
46d6bbff5a Remove stray comma. 2011-08-08 19:02:07 -07:00
MrZYX
f370769fe7 updated locales 2011-08-09 03:19:28 +02:00
MrZYX
d3c73502cd Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-08-07 22:56:52 +02:00
MrZYX
b412f379e0 updated locales 2011-08-07 22:56:44 +02:00