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 |
|
Gonzalo Rodriguez
|
ea3b719253
|
Fixed notifications time-ago calculation
|
2011-02-20 05:13:34 -02: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 |
|
MrZYX
|
aa6ac41d68
|
remeber sort order
|
2011-02-19 17:06:26 +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
|
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 |
|
maxwell
|
0bf3cae54a
|
MS IZ added spec from admin page, moved it to its own controller where it belongs
|
2011-02-18 11:35:24 -08:00 |
|
maxwell
|
e3b298c5d4
|
this may be temp. i want to see if ci passes; Revert "I18n: Workaround for a weired caching issue when multiple users are logged in"
This reverts commit dfa5d875c5.
|
2011-02-17 19:01:42 -08:00 |
|
maxwell
|
2540c5adb9
|
adding person and profile to show
|
2011-02-17 18:15:35 -08:00 |
|
zhitomirskiyi
|
8196ee33dd
|
making instantiating an empty contact
|
2011-02-17 18:05:22 -08:00 |
|
zhitomirskiyi
|
23754ec3fb
|
added the files
|
2011-02-17 18:05:21 -08:00 |
|
zhitomirskiyi
|
16b7ec3990
|
pulled out share_with to be contact new and contact show
|
2011-02-17 18:05:21 -08:00 |
|
zhitomirskiyi
|
25671f07c7
|
refactor of a line
|
2011-02-17 18:05:21 -08:00 |
|
zhitomirskiyi
|
ba779e18d6
|
aspect memberships are now dependant delete_all on contact
|
2011-02-17 18:05:21 -08:00 |
|
zhitomirskiyi
|
1e6bf9c80e
|
MS IZ the cucumber now passes
|
2011-02-17 18:05:21 -08:00 |
|
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 |
|
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 |
|
Raphael Sofaer
|
cd7e4d6e8f
|
Requests create a read, rather than unread, notification
|
2011-02-16 23:44:25 -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 |
|
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
|
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 |
|
danielvincent
|
164fe1c1b5
|
adjust column width, leading, serifs, etc. in stream for better readability.
|
2011-02-13 15:27:14 -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 |
|
danielvincent
|
ca0d52c8e2
|
log character counts of status messages and comments
|
2011-02-13 00:17:34 -08:00 |
|
David Morley
|
6df0a25327
|
fix link to facebox
|
2011-02-12 14:57:35 -08:00 |
|