Commit graph

8258 commits

Author SHA1 Message Date
Raphael Sofaer
69619f9ba2 Rescue from duplicate key errors in AspectMembershipsController 2011-08-09 12:50:24 -07:00
Raphael Sofaer
7f5f696642 Don't let googlebot 500 us on the public post page 2011-08-09 12:26:10 -07:00
Raphael Sofaer
23ea0ed462 Keep robots out of the user pages 2011-08-09 11:50:26 -07:00
Raphael Sofaer
840901c0a8 Allow logging with blocks so that hoptoad works. 2011-08-09 11:43:34 -07:00
Maxwell Salzberg
a4e6a019a7 make the scroll to top a bit more subtle 2011-08-09 11:33:47 -07:00
danielgrippi
aac72b12e7 added hoptoad support, API key read from application.yml 2011-08-09 10:46:15 -07:00
Maxwell Salzberg
215fdf6550 update gemfile.lock to account for new diaspora-client gem that doesnt throw warnings 2011-08-09 10:37:34 -07:00
danielgrippi
a78fa96e99 don't display a reshare link if the original post has been deleted 2011-08-09 10:26:21 -07:00
MrZYX
e11de0c7d0 update i18n-inflector and i18n-inflector-rails, this makes them usable with ruby 1.8.7 again 2011-08-09 17:00:33 +02:00
Maxwell Salzberg
72b734e3e8 scroll to top like a boss 2011-08-09 01:04:54 -07:00
Maxwell Salzberg
e845bcf8e7 fix batch inviter 2011-08-08 19:18:25 -07:00
Maxwell Salzberg
f1a64c46f4 fixing the inviter 2011-08-08 19:07:38 -07:00
Maxwell Salzberg
43bd8b6860 typo in the settings 2011-08-08 19:07:38 -07:00
Raphael Sofaer
97660e8f49 Fix some typos in the batch invitation email 2011-08-08 19:02:07 -07:00
Raphael Sofaer
46d6bbff5a Remove stray comma. 2011-08-08 19:02:07 -07:00
Maxwell Salzberg
ee08d3cd5c fix inviter a touch 2011-08-08 18:50:59 -07:00
MrZYX
f370769fe7 updated locales 2011-08-09 03:19:28 +02:00
Raphael Sofaer
f02b1dd3a2 Adjust and tweak batch invitation email. It might need a few more tables 2011-08-08 17:56:20 -07:00
Maxwell Salzberg
77cb93be24 fix up the inviter sidebar 2011-08-08 17:53:04 -07:00
Maxwell Salzberg
5bd9e7c53d update email copy 2011-08-08 16:35:34 -07:00
Raphael Sofaer
3f9954d18b Enable single-transaction mode in the backup script... that was a pretty dumb oversight. 2011-08-08 15:49:17 -07:00
Raphael Sofaer
3631178579 Add times to output of backup script, so we can correlate it with db slowdowns. 2011-08-08 14:58:10 -07:00
Raphael Sofaer
62d52f7db5 Nice tar in the mysql backup script as well 2011-08-08 14:48:35 -07:00
Raphael Sofaer
d517ce90fa Nice mysqldump in the backup script. 2011-08-08 14:47:22 -07:00
Raphael Sofaer
f385eef851 Fix like socketing 2011-08-08 11:54:32 -07:00
Sarah Mei
ccf843b486 Merge pull request #1745 from ticho/unread-message-count-css-fix
Correctly space unread and total message counts in conversations list
2011-08-07 20:40:53 -07: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
Sarah Mei
6c512cbfa9 Chubbies is now a little TOO good at shutting itself off. Also: processes are hard. >.< 2011-08-06 19:22:09 -07:00
Andrej Kacian
6b64d7f55a Correctly space unread and total message counts in conversations list 2011-08-07 04:06:26 +02:00
Sarah Mei
1ccfaedd08 Chubbies actually shuts itself down now, so both builds should now be able to be green at the same time. FWIW, @ variables in class methods are class variables and therefore persist across tests. 2011-08-06 18:19:17 -07:00
Sarah Mei
ffb6b18ce8 Merge pull request #1731 from ticho/1587-publisher-globe-icon-tooltip
More descriptive and context-aware tooltip for the globe icon in publisher.
2011-08-06 16:03:48 -07:00
Andrej Kacian
e5b6850556 Fix the test 2011-08-07 00:44:37 +02:00
Andrej Kacian
4efff1cd77 Use Tipsy functions to update the onscreen tooltip instead of mouseover() 2011-08-07 00:44:02 +02:00
Andrej Kacian
6cf42fb8ba Better stab at the jasmine test. 2011-08-06 23:37:21 +02:00
Andrej Kacian
2716316dac Add jasmine test for #1587 fix. 2011-08-06 23:37:21 +02:00
Andrej Kacian
077d8fd2fe Fixes #1587 by changing globe icon tooltip when switching between public and limited post in publisher. 2011-08-06 23:37:21 +02:00
Sarah Mei
a62325be23 Fix references to facebox in jasmine specs. 2011-08-06 14:36:12 -07:00
Raphael Sofaer
201574c53a Check for nil before building ServiceUser objects 2011-08-06 14:02:27 -07:00
Raphael Sofaer
1a72be544f Instantiate one fewer string in the rtl code 2011-08-06 12:58:27 -07:00
Raphael Sofaer
5768d3188a Don't instantiate objects where constants can be used. 2011-08-06 12:58:27 -07:00
Sarah Mei
66bb686f4b Handle the case where the pod doesn't have the diasporahq user. 2011-08-06 12:48:23 -07:00
Sarah Mei
421bfe6d8f Handle the case in which the pod owner has not set up featured users. 2011-08-06 12:47:46 -07:00
Sarah Mei
ac063ed938 Show stack traces in cucumber. How did this get turned off? Did we used to have a separate cucumber environment? 2011-08-06 12:46:15 -07:00
Jordi Mallach
afd08a7b94 Aspects are... intuitive. 2011-08-06 18:06:33 +02:00
Jordi Mallach
a622a5b1ee Updated Catalan translation to 5eadc7d. 2011-08-06 18:02:44 +02:00
MrZYX
e9f4495b53 add english pirate so we get people to actually do it 2011-08-06 16:59:19 +02:00
MrZYX
2a0ca46949 updated locales 2011-08-06 16:56:39 +02:00
Raphael Sofaer
e3d0cfedd7 Use 'Welcome' from i18n 2011-08-05 23:09:00 -07:00
Raphael Sofaer
de3f27f8b1 We don't need to check defined? on an instance variable 2011-08-05 23:04:30 -07:00