Andreas Schneider
e63b605b2a
db: Create limited varchar to be able to add index.
2011-02-02 20:37:55 +01:00
Andreas Schneider
8bdc3ec35a
db: Alter the import tables to avoid a mysql bug.
2011-02-02 20:37:55 +01:00
Andreas Schneider
2ddd810dea
db: Fixed the migration of the database.
...
The limit down to 127 is needed cause of a long time bug in mysql. The
error message looks like this when creating an index.
Mysql2::Error: Specified key was too long; max key length is 1000 bytes
So with utf8 (3 bytes for one char) you exceed this with two
varchar(255).
See http://bugs.mysql.com/bug.php?id=4541
2011-02-02 20:37:55 +01:00
danielvincent
693ad112ba
stream element sockets in non-mobile
2011-02-02 11:29:37 -08:00
Sarah Mei
73ea3c60a0
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-02 11:14:36 -08:00
Sarah Mei
9a6fca87ff
Re-enable running a single cucumber feature on the command line
2011-02-02 11:13:59 -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
Sarah Mei
9a618d4dc0
Try removing all cached gems for REE before bundle installing on CI
2011-02-02 09:52:20 -08:00
Sarah Mei
a8d6fcd952
remove gem cache before bundle install on ci
2011-02-02 08:55:56 -08:00
Sarah Mei
1de4976915
remove histories table from schema.rb. this is why you don't edit or revert migrations >.<
2011-02-02 08:54:57 -08:00
MrZYX
99cf9904f9
put jquery-ui back in as we need it for /aspects/manage at least
2011-02-02 16:56:50 +01:00
MrZYX
5ed587ddcd
updated locales
2011-02-02 16:23:12 +01:00
maxwell
d040380e57
fix data conversion spec, ILYA
2011-02-01 22:27:07 -08:00
maxwell
d4f99ca080
move search init to search.js, because mobile does not have search to init
2011-02-01 22:13:52 -08:00
maxwell
67ed035f21
make notifications updated_at rather than created at
2011-02-01 21:45:36 -08:00
zhitomirskiyi
6694485388
added the cucumber feature back in
2011-02-01 18:13:48 -08:00
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