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

6244 commits

This branch
This branch
All branches
Author SHA1 Message Date
MrZYX
98cdee97c0 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections 
Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/controllers/posts_controller.rb
	app/controllers/publics_controller.rb
 2011-02-24 00:33:34 +01:00
zhitomirskiyi
e106ec6a79 added post author to the subject of the also commented email as well as the notification 2011-02-23 13:03:11 -08:00
zhitomirskiyi
97e00f9ee3 changed the delete to a destroy on retraction, also removed a puts 2011-02-23 12:00:42 -08:00
maxwell
16e8ecc72c fixing debugging statement in smcontroller, also fix the spec 2011-02-22 22:38:23 -08:00
maxwell
e446dcaeb5 make sm_controller show the error in the js 2011-02-22 22:21:48 -08:00
maxwell
5bce2d1615 remove mongomapper error handler in photos_controller#create 2011-02-22 22:02:58 -08:00
maxwell
ec21230756 make status_message_controller#create return the error message 2011-02-22 22:01:08 -08:00
Dan Hansen
e4ba498d70 whoops 2011-02-22 23:21:50 -06:00
Dan Hansen
f41bc0c14d <3z 2011-02-22 23:19:57 -06:00
Sarah Mei
06a992a088 Modify REE garbage collection settings for speedier tests. 2011-02-22 21:00:08 -08:00
Raphael Sofaer
74b8921c09 make video urls have correct href 2011-02-22 18:51:40 -08:00
Raphael Sofaer
17f41f1291 Make login-error shadow more readable 2011-02-22 18:08:46 -08:00
Raphael Sofaer
efd95df029 Don't install ruby-debug in rubinius, wtf why does rubiniues declare 1.8? 2011-02-22 18:08:46 -08:00
Raphael Sofaer
15a1eb8afc Add Rubinius's generated files 2011-02-22 18:08:45 -08:00
maxwell
eb9a943724 parinoid checks for admin page thx dangold 2011-02-22 15:43:10 -08:00
Dan Hansen
801382714a remove jquery 1.4.2, we never use it 2011-02-22 13:59:10 -06:00
Dan Hansen
9ef6606f80 load jquery from google only if local copy fails 2011-02-22 13:41:05 -06:00
MrZYX
e943d6ae5e updated locales 2011-02-22 16:12:06 +01:00
MrZYX
3d034668fd Revert "updated locales" 
This reverts commit 85c346b520.
 2011-02-22 16:07:31 +01:00
MrZYX
85c346b520 updated locales 2011-02-22 13:59:23 +01:00
MrZYX
65447e63ec Catalan locale update from Jordi Mallach 2011-02-22 13:51:38 +01:00
Dan Hansen
e04685e7ab remove unused javascript that's in a view 2011-02-21 23:25:38 -06:00
Sarah Mei
33c7400919 clean up fixture builder 2011-02-21 20:06:54 -08:00
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