Raphael
|
429087ef83
|
Merge remote branch 'tomk/729-retain-input-on-failure'
|
2011-01-04 16:39:07 -08:00 |
|
Raphael
|
83d6b95c46
|
Merge remote branch 'nickvdb/763-notifications-paginate'
|
2011-01-04 16:18:46 -08:00 |
|
Raphael
|
0e55b0bf44
|
Merge remote branch 'tomk/721-wrong-person-link-when-creating-comment'
|
2011-01-04 16:14:39 -08:00 |
|
Raphael
|
adb238c7d1
|
Merge remote branch 'tomk/717-rake-statistics'
|
2011-01-04 16:13:28 -08:00 |
|
Raphael
|
8d5dc5d27b
|
Merge remote branch 'tomk/ui-cosmetics'
|
2011-01-04 16:02:11 -08:00 |
|
Raphael
|
6102217a88
|
Don't display the invitations link unless the user has invitations, thanks Pasta
|
2011-01-04 15:59:53 -08:00 |
|
zhitomirskiyi
|
f134cfd43f
|
moved the test to the controller
|
2011-01-04 15:44:55 -08:00 |
|
Raphael
|
06d7ddbe0d
|
Hopefully get rid of some problems with deleted accounts moving forward
|
2011-01-04 15:36:42 -08:00 |
|
Raphael
|
c643346589
|
Making it easier to maybe put .inspect on all the accesses to the json export
|
2011-01-04 14:25:40 -08:00 |
|
Raphael
|
894a008daa
|
Hopefully finish export to csv
|
2011-01-04 11:59:25 -08:00 |
|
Raphael
|
16d7ccdf0b
|
fix youtube title stting
|
2011-01-04 11:48:02 -08:00 |
|
zhitomirskiyi
|
d3daa32558
|
mark a notification as read when you ignore a request
|
2011-01-04 11:27:25 -08:00 |
|
Raphael
|
936f7fdb3d
|
newlines are in the data, probably easiest to use a different separator in the CSV
|
2011-01-04 11:24:11 -08:00 |
|
Raphael
|
0966889ab9
|
continue work on mongo export
|
2011-01-04 10:58:22 -08:00 |
|
MrZYX
|
b528802dc8
|
updated locales
|
2011-01-03 15:32:03 +01:00 |
|
lfortin
|
62585aa445
|
more JS formatting
|
2011-01-02 19:41:20 -05:00 |
|
lfortin
|
efb711963f
|
in JS, avoid global variables as much as possible
|
2011-01-02 19:24:38 -05:00 |
|
Alec Leamas
|
4905b21286
|
Pkg update
|
2011-01-02 21:32:07 +01:00 |
|
Alec Leamas
|
457c330f68
|
Pkg update
|
2011-01-02 19:41:24 +01:00 |
|
Alec Leamas
|
22a696bcf8
|
Print warnings on stderr, where they belong.
|
2011-01-02 16:07:19 +01:00 |
|
zhitomirskiyi
|
20efe06ad5
|
capturing mousedown instead of click to handle open in other tab
|
2011-01-01 21:14:36 -08:00 |
|
zhitomirskiyi
|
212a6dfeee
|
logging both the stout and the sterr
|
2011-01-01 20:43:47 -08:00 |
|
danielvincent
|
055fbe3e00
|
stream is now a div. generalized some partial extentions for mobile site.
|
2011-01-01 23:09:18 -05:00 |
|
MrZYX
|
9db2d8854f
|
fixed #781
|
2011-01-01 23:55:12 +01:00 |
|
MrZYX
|
cdf1722247
|
updated locales
|
2011-01-01 17:14:26 +01:00 |
|
MrZYX
|
a71b81eacd
|
renamed en-shaw to en_shaw
|
2011-01-01 02:22:35 +01:00 |
|
Philip Champon
|
607fea6722
|
Handling bug http://bugs.joindiaspora.com/issues/767
Added email argument to task, warn and replace if address resolves to
an invalid user@domain one.
|
2010-12-31 14:53:32 +01:00 |
|
MrZYX
|
3338397822
|
added en-shaw to languages.yml
|
2010-12-31 13:11:34 +01:00 |
|
MrZYX
|
0faeb70ec3
|
updated locales
|
2010-12-31 13:06:35 +01:00 |
|
zhitomirskiyi
|
94e0427ffa
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-30 14:28:41 -08:00 |
|
zhitomirskiyi
|
9f227b3b0a
|
manual logging in the backup, since Rails.logger is nil
|
2010-12-30 14:27:35 -08:00 |
|
Alec Leamas
|
3f2d48b26e
|
handling http/https references
See discussion in c92f80b2eb
|
2010-12-30 23:22:43 +01:00 |
|
MrZYX
|
4596759628
|
added ga to languages.yml
|
2010-12-30 14:41:08 +01:00 |
|
MrZYX
|
3133ade245
|
fixed indentation error in devise.ga.yml
|
2010-12-30 14:38:14 +01:00 |
|
MrZYX
|
892bc2bc1a
|
Merge branch '99translations' of ../diaspora-fork
|
2010-12-30 14:29:39 +01:00 |
|
MrZYX
|
a7467dedb8
|
updated locales
|
2010-12-30 14:29:36 +01:00 |
|
MrZYX
|
c7458f107a
|
fixed syntax error in devise.ga.yml
|
2010-12-30 14:28:13 +01:00 |
|
MrZYX
|
37964892ce
|
Merge branch 'irish-language' of https://github.com/joedavis/diaspora
|
2010-12-30 14:24:24 +01:00 |
|
Thomas R. Koll
|
be270c4696
|
Adding rake statistics:genders to list all genders with profile count
|
2010-12-30 14:18:12 +01:00 |
|
Joe Davis
|
cca1b207bd
|
finished translating
|
2010-12-30 12:58:27 +00:00 |
|
Thomas R. Koll
|
61d0f0ea65
|
Feature #717: Adding rake tasks to print statistics on users and content
Adds following rake tasks:
rake statistics:users
rake statistics:content
|
2010-12-30 13:38:26 +01:00 |
|
Raphael
|
4e44b197c2
|
Begin writing migration from mongo to mysql
|
2010-12-29 18:15:13 -08:00 |
|
Thomas R. Koll
|
5c7d39505a
|
Fixes #721 when creating a comment (ajax) the link to your own profile is fucked up and instead it linked to the user id
|
2010-12-30 00:48:43 +01:00 |
|
Thomas R. Koll
|
367d2756be
|
Fixes #713: Set a pointer cursor for "add photos" input field
|
2010-12-30 00:17:59 +01:00 |
|
Thomas R. Koll
|
6ea9b36cc9
|
Applying fix as suggested by duke
|
2010-12-30 00:07:29 +01:00 |
|
Raphael
|
0328c1677c
|
Get rid of a reference to Mongo
|
2010-12-29 11:28:22 -08:00 |
|
Raphael
|
64c31af529
|
GREEN
|
2010-12-29 11:18:10 -08:00 |
|
Thomas R. Koll
|
5e1f5ff5b1
|
Starting spec for rails.js
|
2010-12-29 17:43:50 +01:00 |
|
Thomas R. Koll
|
869cbdf9e9
|
* Localizeable "Rename aspect" button
* Don't list emails_delivered if there are none yet
* Don't show drag_to_add button if there are no @remote_requests
|
2010-12-29 17:00:08 +01:00 |
|
Nick van der Burgt
|
3faff76b0c
|
Reverted the changes in ie.js
|
2010-12-29 16:11:34 +01:00 |
|