Commit graph

5997 commits

Author SHA1 Message Date
maxwell
7ace73b84b iz ms wip fixing contactController destroy 2011-02-17 18:05:21 -08:00
maxwell
8c2e6dd8cb aspect membership refactor complete 2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340 IZ MS; refactored aspect_membership_controller, moved and updated views accordingly 2011-02-17 18:05:21 -08:00
maxwell
8ae23f5705 wip 2011-02-17 18:05:21 -08:00
maxwell
17a801394e work in progress. need to update the views for the controller changes 2011-02-17 18:05:21 -08:00
maxwell
6858e2e543 crazy ugly admin interface so an admin can invite people, and search for user accounts for basic debugging 2011-02-17 18:00:59 -08:00
Raphael Sofaer
2304827569 Only save the connected person if it has changed 2011-02-17 20:30:38 -05:00
danielvincent
fc9d9a4c55 make the invite friends dialog more obvious 2011-02-17 15:58:37 -05:00
Raphael Sofaer
51bc26c3df Fix notificationscontroller spec 2011-02-17 15:27:50 -05:00
MrZYX
2394d40603 fixed Gemfile for ruby 1.9.1 2011-02-17 18:52:12 +01:00
MrZYX
edef56c84a ruby 1.9 ftw (thanks jrichardlai) 2011-02-17 16:20:27 +01:00
MrZYX
026ced5276 updated locales 2011-02-17 15:46:53 +01:00
MrZYX
b7ce51d206 Merge branch '680-error-on-login-goes-away-quickly' of https://github.com/grzuy/diaspora into flashmsg 2011-02-17 15:34:42 +01:00
MrZYX
dc74aed79b I </3 those performance specs… 2011-02-17 15:23:29 +01:00
Raphael Sofaer
ef9ab553bf require the called migration within the undo migration 2011-02-17 00:35:33 -05:00
Raphael Sofaer
ff4a049d2d It turns out that we need to rewrite validates_uniqueness_of :case_sensitive => false 2011-02-16 23:49:35 -05:00
Raphael Sofaer
cd7e4d6e8f Requests create a read, rather than unread, notification 2011-02-16 23:44:25 -05:00
Raphael Sofaer
6cf8de94a7 take secret token stuff out of chef scripts 2011-02-16 22:46:43 -05:00
Gonzalo Rodriguez
11e431f640 Add flash message above the login form 2011-02-16 23:37:28 -02:00
MrZYX
dfa5d875c5 I18n: Workaround for a weired caching issue when multiple users are logged in 2011-02-16 22:40:18 +01:00
danielvincent
a636ceec7f search does not wildcard on both sides of search term; is less dumb. 2011-02-16 12:41:45 -05:00
MrZYX
2161c1dd72 updated locales 2011-02-16 15:42:23 +01:00
danielvincent
41f077e039 posts are ordered by recent comment activity instead of time created 2011-02-16 02:04:46 -05:00
Dan Hansen
e2ec4c0424 possibly fix the problem with js i18n that occurs on joindiaspora 2011-02-15 22:43:06 -06:00
zhitomirskiyi
90897099bd not double saving photos 2011-02-15 17:24:35 -08:00
maxwell
d1b91e1eac wip, profiles controller and specs, with cucumber failures 2011-02-15 14:17:25 -08:00
MrZYX
f7de3a216a fixed a translation 2011-02-15 15:02:36 +01:00
MrZYX
7fb6c5bcb9 updated locales 2011-02-15 13:43:45 +01:00
MrZYX
ba439b9413 Merge branch '559-posting-empty-messages' of https://github.com/grzuy/diaspora into sharebutton 2011-02-15 13:08:59 +01:00
Gonzalo Rodriguez
2b3926c629 Disable share button when whitespaces on status message input. 2011-02-15 09:50:39 -02:00
Dan Hansen
42fd9a19da now sarahmei can watch revolution OS too! will write tests soon 2011-02-14 23:59:03 -06:00
MrZYX
54feaca998 redirect to the start page if there's no referer in photos#show 2011-02-14 22:25:21 +01:00
MrZYX
b4b3fd2bb3 Merge branch 'master' of github.com:diaspora/diaspora 2011-02-14 21:50:54 +01:00
MrZYX
fbaf9d6e84 fixed translation in request accepted mail 2011-02-14 21:50:38 +01:00
maxwell
4111a0ae4e make notifications return json for MuGMaN 2011-02-14 11:59:58 -08:00
MrZYX
614aa3056a updated locales 2011-02-14 17:46:13 +01:00
danielvincent
164fe1c1b5 adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
zhitomirskiyi
50ea657cd2 put it back for reference 2011-02-13 15:14:27 -08:00
zhitomirskiyi
9f78156206 broke out the en activerecord validations translations to their respective file 2011-02-13 15:09:05 -08:00
MrZYX
965f4e2ea5 another weired case where a photo can have a .status_message_id but no .status_message 2011-02-13 21:08:32 +01:00
MrZYX
20e1316491 it can somehow happen that a person has no profile. somehow. idk why. 2011-02-13 19:29:04 +01:00
MrZYX
86cc7a0d35 added some languages 2011-02-13 13:36:06 +01:00
MrZYX
654be58a87 moved gl-ES to gl and added it to languages.yml 2011-02-13 13:18:58 +01:00
MrZYX
81369176f1 updated locales 2011-02-13 12:02:03 +01:00
MrZYX
935b934b7a Merge branch 'pubphoto' of https://github.com/diasporg/diaspora 2011-02-13 11:56:20 +01:00
danielvincent
ca0d52c8e2 log character counts of status messages and comments 2011-02-13 00:17:34 -08:00
Raphael Sofaer
cac8c586de Forgot that emails are no longer db-unique 2011-02-12 22:44:09 -08:00
Raphael Sofaer
8fabe0f402 Checking in the migration helps. 2011-02-12 22:41:30 -08:00
Raphael Sofaer
753a113aa9 New splunk logs indicate we need more indicies 2011-02-12 21:47:55 -08:00
David Morley
9b88eef832 add photos.show.original_post 2011-02-12 16:11:37 -08:00