Sarah Mei
|
dcf7e57a1d
|
Use standard carrierwave gem instead of deleted git repo. This may break photo uploading, but better that than breaking bundle install.
|
2011-02-21 13:54:08 -08:00 |
|
Sarah Mei
|
814ef38fa9
|
Don't actually need 36 notifications.
|
2011-02-21 13:20:39 -08:00 |
|
MrZYX
|
feb47df97e
|
total refactor of version header. X-Git-Update: ISO 8601 formated date of the last commit, X-Git-Revision: sha1 hash of the last commit
|
2011-02-21 17:13:11 +01:00 |
|
MrZYX
|
e02c3eafc0
|
Merge branch 'xheader' of https://github.com/diasporg/diaspora into xheader
|
2011-02-21 16:12:24 +01:00 |
|
MrZYX
|
e4ae0ddf67
|
updated locales
|
2011-02-21 15:32:32 +01:00 |
|
Sarah Mei
|
49adf5034f
|
Revert javascript move
|
2011-02-20 20:05:40 -08:00 |
|
Sarah Mei
|
fe3c67a662
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-02-20 14:56:03 -08:00 |
|
Sarah Mei
|
26779889d0
|
To run specs without perf tests: rake spec SPEC_OPTS="--tag ~performance"
|
2011-02-20 14:40:51 -08:00 |
|
danielvincent
|
3d6d742def
|
move js to body bottom
|
2011-02-20 16:31:06 -05:00 |
|
MrZYX
|
166f75d883
|
I think I fixed #882
|
2011-02-20 22:10:27 +01:00 |
|
MrZYX
|
da244f8438
|
reintroduced remember me on the login page
|
2011-02-20 21:49:08 +01:00 |
|
MrZYX
|
ab706f4127
|
fixed sort by css for languages different from english
|
2011-02-20 19:00:13 +01:00 |
|
MrZYX
|
abf385d79d
|
collapsed langcodes_alias_map.yml and languages.yml into locale_settings.yml
|
2011-02-20 14:35:24 +01:00 |
|
MrZYX
|
5ac91d771a
|
fixed #507
|
2011-02-20 13:55:54 +01:00 |
|
MrZYX
|
77cac72ed5
|
fixed #306
|
2011-02-20 13:34:22 +01:00 |
|
MrZYX
|
47d2b752c2
|
updated locales
|
2011-02-20 13:14:35 +01:00 |
|
MrZYX
|
2b625c468a
|
Merge branch '874-wrong-time-ago-on-notifications' of https://github.com/grzuy/diaspora
|
2011-02-20 13:03:33 +01:00 |
|
MrZYX
|
af14fa76a1
|
fixed #881
|
2011-02-20 13:00:30 +01:00 |
|
Sarah Mei
|
183c840108
|
And this is why we pair. ::sigh::
(Revert silly change to aspects#index spec.)
|
2011-02-20 01:54:06 -08:00 |
|
Sarah Mei
|
8c1fc12d82
|
Don't use sleep when you want different timestamps on your posts. Just set created_at directly.
|
2011-02-20 01:47:10 -08:00 |
|
Sarah Mei
|
ad141bc5a2
|
rm -f the fixture builder yml file, to avoid the no-such-file warnings.
|
2011-02-20 01:17:28 -08:00 |
|
Sarah Mei
|
ee8796fc79
|
I should know better than to commit after midnight when I'm soloing.
(Let's require the support files in the right order.)
|
2011-02-20 01:08:13 -08:00 |
|
Sarah Mei
|
dc499293b3
|
Took 90 seconds off the build. Fixture builder FTFW.
Cleaned up spec_helper - moved stuff into support files.
|
2011-02-20 00:35:51 -08:00 |
|
Sarah Mei
|
b7815f0d84
|
I want to know what's making the build take almost 20 minutes.
|
2011-02-19 23:30:34 -08:00 |
|
Gonzalo Rodriguez
|
ea3b719253
|
Fixed notifications time-ago calculation
|
2011-02-20 05:13:34 -02:00 |
|
Sarah Mei
|
5a23907143
|
Fix cucumber feature for deleting posts.
|
2011-02-19 22:35:10 -08:00 |
|
Sarah Mei
|
b0d98b9ce8
|
Add people#show specs around showing the right set of posts.
|
2011-02-19 22:17:45 -08:00 |
|
Sarah Mei
|
77adc02cbd
|
Fix spec failure related to presence of app config settings. Also, you can't test application controller directly.
|
2011-02-19 22:17:22 -08:00 |
|
Sarah Mei
|
51df11aafc
|
Fix build failure related to addition of default scope on Contact
|
2011-02-19 21:44:37 -08:00 |
|
Sarah Mei
|
edf15aa5bd
|
Add specs for people#show when you're viewing your own page
|
2011-02-19 21:13:30 -08:00 |
|
Sarah Mei
|
11a4544882
|
Refactor people controller specs to be more sensible
|
2011-02-19 12:15:37 -08:00 |
|
MrZYX
|
3a26673298
|
fixed the spec I broke…
|
2011-02-19 17:55:31 +01:00 |
|
MrZYX
|
aa6ac41d68
|
remeber sort order
|
2011-02-19 17:06:26 +01:00 |
|
MrZYX
|
7ab287c3e1
|
forgot to add a link to the webchat
|
2011-02-19 14:48:00 +01:00 |
|
MrZYX
|
dcaa84f73d
|
added #diaspora IRC channel to README.md
|
2011-02-19 14:43:31 +01:00 |
|
MrZYX
|
17c3f0a0ee
|
fixed last bug from #544
|
2011-02-19 14:41:37 +01:00 |
|
MrZYX
|
11f95ee596
|
fixed broken css for other languages at account settings page
|
2011-02-19 14:27:45 +01:00 |
|
Jonne Hass
|
02f7f10ef1
|
Minimal fix to admins_controller.rb
|
2011-02-19 04:49:05 -08:00 |
|
MrZYX
|
a13a7ad5c1
|
fixed some css glitches at the #share_with popup
|
2011-02-19 13:17:21 +01:00 |
|
MrZYX
|
17daf3c7ca
|
fixed the position of the share button
|
2011-02-19 13:05:24 +01:00 |
|
MrZYX
|
096e5e577b
|
updated locales
|
2011-02-19 12:00:07 +01:00 |
|
MrZYX
|
124ac738ea
|
'sort by:'translatable
|
2011-02-19 11:39:28 +01:00 |
|
Gonzalo Rodriguez
|
778afa2889
|
Update locale before loading flash notice on user language update
|
2011-02-19 02:25:03 -02:00 |
|
zhitomirskiyi
|
199d5fbdc1
|
the alt text now displays the correct number of contacts in an aspect
|
2011-02-18 17:44:47 -08:00 |
|
zhitomirskiyi
|
61dd5a835a
|
default scope on contact
|
2011-02-18 17:38:02 -08:00 |
|
maxwell
|
43f17b3ed8
|
made toggle for post time on aspects#index
|
2011-02-18 16:47:44 -08:00 |
|
maxwell
|
3c8a87783f
|
stream order can take created at to be sorted by origin post time
|
2011-02-18 16:07:22 -08:00 |
|
maxwell
|
37a699ace1
|
stream order can take created at to be sorted by origin post time
|
2011-02-18 16:01:04 -08:00 |
|
zhitomirskiyi
|
6dc35c516a
|
added two pending specs for mnutt
|
2011-02-18 13:15:48 -08:00 |
|
maxwell
|
a1fdd3cdf9
|
i think the ci app_config has some setup i am unaware of, so this makes it not depend on that setting
|
2011-02-18 12:38:29 -08:00 |
|