Raphael
|
636242283b
|
Fix cucumber features
|
2011-02-02 18:49:45 -08:00 |
|
Raphael
|
3114672989
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-02-02 18:13:03 -08:00 |
|
Sarah Mei
|
e7cf5fc841
|
Fix/expand cucumber feature for new user signup.
Replace "wait for aspects page"-type steps with general wait for step.
|
2011-02-02 17:17:00 -08:00 |
|
Raphael
|
8a2e0eef7c
|
No semicolons in names
|
2011-02-02 16:57:04 -08:00 |
|
Raphael
|
cd8d9989cf
|
Refactor publisher JS, use hidden field for submitting
|
2011-02-02 14:27:14 -08:00 |
|
maxwell
|
34a0abe0c8
|
fix 500 on mobile notifications page
|
2011-02-02 13:14:34 -08:00 |
|
Raphael
|
3fb6b0e072
|
Fix saved state cucumber feature
|
2011-02-02 11:52:56 -08:00 |
|
danielvincent
|
693ad112ba
|
stream element sockets in non-mobile
|
2011-02-02 11:29:37 -08:00 |
|
Dan Hansen
|
82db655a56
|
make the markup between _comment and _stream_element more consistent, fix embedder in comments
|
2011-02-02 12:55:16 -06:00 |
|
maxwell
|
67ed035f21
|
make notifications updated_at rather than created at
|
2011-02-01 21:45:36 -08:00 |
|
zhitomirskiyi
|
34e5ba99bc
|
removed the image or default
|
2011-02-01 18:11:02 -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
|
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 |
|
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 |
|
Dan Hansen
|
cdb5cf37e7
|
show publisher if it was closed when you select another aspect
|
2011-02-01 00:40:11 -06: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 |
|
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
|
789ff679a9
|
persists open aspects across logins also fixed the status message controller spec broken in master
|
2011-01-31 18:31:41 -08:00 |
|
Raphael
|
c56eaadfa0
|
Make person profile a little bit aware of an incoming request
|
2011-01-31 15:47:01 -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 |
|
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 |
|
MrZYX
|
391a9b0de5
|
translate contacts in _header.haml
|
2011-01-31 19:48:36 +01:00 |
|
zhitomirskiyi
|
ac50a0119a
|
spec for not raising on already existant actor
|
2011-01-31 10:23:26 -08:00 |
|
zhitomirskiyi
|
cfef9a747e
|
all green
|
2011-01-30 20:10:34 -08:00 |
|
zhitomirskiyi
|
a4988a28b4
|
WIP
|
2011-01-30 10:00:03 -08:00 |
|
zhitomirskiyi
|
17dde3a7b9
|
farther along towards getting the specs to pass
|
2011-01-29 23:58:48 -08:00 |
|
zhitomirskiyi
|
17a2c9e311
|
moving over some code migration successful
|
2011-01-29 23:34:11 -08:00 |
|
maxwell
|
348ae0b61d
|
small hack to add some feedback when links are tapped on the mobile site.
|
2011-01-29 18:42:50 -08:00 |
|
maxwell
|
5267365b4f
|
move js strings to application helper
|
2011-01-29 13:54:28 -08:00 |
|
Dan Hansen
|
b89a59ca55
|
update timeago usages
|
2011-01-29 13:30:32 -08:00 |
|
Dan Hansen
|
0831ad6e40
|
move i18n.loadLocale to the application template, remove localize controller & helper, renamed localize to get_javascript_strings_for and added it to the application helper
|
2011-01-29 13:29:54 -08:00 |
|
Dan Hansen
|
3078156dbb
|
javascript i18n wip
|
2011-01-29 13:28:43 -08:00 |
|
zhitomirskiyi
|
9d4d0cecdb
|
wip
|
2011-01-28 22:39:29 -08:00 |
|
zhitomirskiyi
|
f48d7a0826
|
wip
|
2011-01-28 22:37:38 -08:00 |
|
danielvincent
|
e3f4ae1cc7
|
fixed button styling
|
2011-01-28 17:42:04 -08:00 |
|