zhitomirskiyi
|
34e5ba99bc
|
removed the image or default
|
2011-02-01 18:11:02 -08:00 |
|
zhitomirskiyi
|
358bf0a856
|
fix migration on open aspects boolean
|
2011-02-01 17:56:16 -08:00 |
|
zhitomirskiyi
|
21e3c2ae73
|
Merge branch 'open-aspects'
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/home_controller.rb
app/helpers/application_helper.rb
db/migrate/20110201013408_add_open_aspects_to_user.rb
spec/controllers/aspects_controller_spec.rb
spec/controllers/home_controller_spec.rb
|
2011-02-01 17:32:08 -08:00 |
|
zhitomirskiyi
|
59f1bff046
|
storing it as a boolean in the aspect
|
2011-02-01 17:25:15 -08:00 |
|
zhitomirskiyi
|
7f026e8271
|
now updating the open aspects in js
|
2011-02-01 16:58:33 -08:00 |
|
Raphael
|
06a6cf7fac
|
Adjust autocomplete options and css
|
2011-02-01 15:07:03 -08:00 |
|
Raphael
|
bbe47fbb55
|
Correct limit on search autocomplete
|
2011-02-01 14:35:14 -08:00 |
|
MrZYX
|
423cd7807b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-02-01 22:45:28 +01:00 |
|
MrZYX
|
7ca8391739
|
Javascript I18n: fallback to DEFAULT_LANGUAGE for missing keys
|
2011-02-01 22:45:02 +01:00 |
|
Raphael
|
cfd6639f4d
|
Revert "Merge branch 'open-aspects'"
This reverts commit 181bd823c4, reversing
changes made to 2c3ed2ab73.
|
2011-02-01 13:15:20 -08:00 |
|
MrZYX
|
15329af94d
|
made "Search for" translatable
|
2011-02-01 21:55:28 +01:00 |
|
zhitomirskiyi
|
bc058332d3
|
commented on post email now includes the comment
|
2011-02-01 12:54:05 -08:00 |
|
zhitomirskiyi
|
27f1231479
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-02-01 12:11:49 -08:00 |
|
zhitomirskiyi
|
181bd823c4
|
Merge branch 'open-aspects'
|
2011-02-01 12:10:12 -08:00 |
|
zhitomirskiyi
|
55403d9bea
|
the saved aspects works properly now
|
2011-02-01 12:07:18 -08:00 |
|
Raphael
|
7d18e2bcd8
|
Finish autocomplete
|
2011-02-01 11:56:56 -08:00 |
|
Raphael
|
518642d0d7
|
Move image_url defaulting logic into profile
|
2011-02-01 11:56:56 -08:00 |
|
Raphael
|
7be232e33e
|
autocomplete wip
|
2011-02-01 11:56:56 -08:00 |
|
Raphael
|
9080649180
|
Starting work on an autocomplete feature
|
2011-02-01 11:56:56 -08:00 |
|
maxwell
|
2c3ed2ab73
|
making this feature fail because the publisher is not shown, by rendering this test in a browser
|
2011-02-01 10:09:50 -08:00 |
|
MrZYX
|
9600378178
|
Merge branch 'cucumber_fixes' of https://github.com/dangold1138/diaspora
|
2011-02-01 17:01:55 +01:00 |
|
MrZYX
|
d8f5607509
|
updated locales
|
2011-02-01 16:56:29 +01:00 |
|
Dan Hansen
|
cdb5cf37e7
|
show publisher if it was closed when you select another aspect
|
2011-02-01 00:40:11 -06:00 |
|
maxwell
|
06013fabec
|
fix sm show
|
2011-01-31 21:50:06 -08:00 |
|
maxwell
|
13f482f3fe
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-31 21:45:05 -08:00 |
|
maxwell
|
aeb33432af
|
Revert "WIP"
This reverts commit 8898650842.
|
2011-01-31 21:41:23 -08:00 |
|
maxwell
|
7bb7bb396a
|
Revert "persists open aspects across logins also fixed the status message controller spec broken in master"
This reverts commit 9e7f03236e.
|
2011-01-31 21:41:05 -08:00 |
|
Sarah Mei
|
59a6c3b3a0
|
Fix import database errors by not importing notifications
|
2011-01-31 21:36:10 -08:00 |
|
Dan Hansen
|
13608fbdad
|
hide pagination links, deja vu, max?
|
2011-01-31 23:13:23 -06:00 |
|
Dan Goldenberg
|
2567a9441e
|
Added notification.feature
|
2011-01-31 18:42:34 -08:00 |
|
Dan Goldenberg
|
58bc4f7387
|
fixed the viewing a requests profile scenario
|
2011-01-31 18:42:34 -08:00 |
|
zhitomirskiyi
|
9e7f03236e
|
persists open aspects across logins also fixed the status message controller spec broken in master
|
2011-01-31 18:37:20 -08:00 |
|
zhitomirskiyi
|
8898650842
|
WIP
|
2011-01-31 18:37:20 -08:00 |
|
zhitomirskiyi
|
789ff679a9
|
persists open aspects across logins also fixed the status message controller spec broken in master
|
2011-01-31 18:31:41 -08:00 |
|
zhitomirskiyi
|
a68bdd6118
|
WIP
|
2011-01-31 15:52:56 -08:00 |
|
Raphael
|
c56eaadfa0
|
Make person profile a little bit aware of an incoming request
|
2011-01-31 15:47:01 -08:00 |
|
Raphael
|
0e2243e620
|
use capture and captures to detect thins in /service
|
2011-01-31 15:28:43 -08:00 |
|
Raphael
|
e3a5102624
|
incoming request on person show should just link to share_with
|
2011-01-31 15:28:43 -08:00 |
|
Raphael
|
906de27922
|
Make notifications/read_all non-ajax, link back to index page
|
2011-01-31 15:28:43 -08:00 |
|
Raphael
|
a2bb8515f9
|
Update cap scripts to have separate staging and production environments, use bundler
|
2011-01-31 15:28:43 -08:00 |
|
zhitomirskiyi
|
a6c1b5bf59
|
mark notification as read on the status message show page
|
2011-01-31 15:26:20 -08:00 |
|
zhitomirskiyi
|
7a667abc73
|
unread true on notification receive
|
2011-01-31 15:09:01 -08:00 |
|
zhitomirskiyi
|
d6ab633e2c
|
Merge branch 'notification-migration'
|
2011-01-31 14:41:15 -08:00 |
|
Dan Hansen
|
2e03c7f9f6
|
forgot to remove these files from my previous commit
|
2011-01-31 15:23:04 -06:00 |
|
Dan Hansen
|
3746d296b0
|
fix dom traversing for embedder
|
2011-01-31 15:15:30 -06:00 |
|
zhitomirskiyi
|
a789be737a
|
also making sure that the notification actor id is unique in the keep delete table
|
2011-01-31 11:42:49 -08:00 |
|
zhitomirskiyi
|
2d078a212a
|
remove mongo id from the notifications table
|
2011-01-31 11:31:59 -08:00 |
|
zhitomirskiyi
|
7cb23fd803
|
added a select for the actor id to group by it
|
2011-01-31 11:27:56 -08:00 |
|
zhitomirskiyi
|
03e8aa31f4
|
fixed notifications migration
|
2011-01-31 11:02:51 -08:00 |
|
MrZYX
|
391a9b0de5
|
translate contacts in _header.haml
|
2011-01-31 19:48:36 +01:00 |
|