nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6244 commits 4 branches 0 tags 121 MiB
Commit graph

6244 commits

This branch
This branch
All branches
Author SHA1 Message Date
MrZYX
9ae6ba4d66 updated locales 2011-02-03 15:35:59 +01:00
Raphael
636242283b Fix cucumber features 2011-02-02 18:49:45 -08:00
Raphael
7c59a5b4bd Schema changed on rebuild 2011-02-02 18:24:53 -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
maxwell
7bfaf462c8 zomg actually set the db and use it 2011-02-02 15:33:19 -08:00
maxwell
450696fa60 added db to variables 2011-02-02 15:31:55 -08:00
maxwell
228c1a85e8 add equals 2011-02-02 15:12:51 -08:00
maxwell
f97c4ae5c9 adding loading of user and password from database.yml 2011-02-02 15:09:19 -08:00
maxwell
94135827ce add mysql dump cron and task 2011-02-02 14:55:13 -08:00
Raphael
cd8d9989cf Refactor publisher JS, use hidden field for submitting 2011-02-02 14:27:14 -08:00
Sarah Mei
a687f26961 Merge branch 'master' of github.com:diaspora/diaspora 2011-02-02 14:22:20 -08:00
Sarah Mei
b84836ed95 Merging close_account.feature and closes_account.feature 2011-02-02 14:22:07 -08:00
maxwell
3b77663481 people controller takes so much time on CI 2011-02-02 13:37:54 -08:00
maxwell
34a0abe0c8 fix 500 on mobile notifications page 2011-02-02 13:14:34 -08:00
Dan Hansen
286dcef0f0 only hide pagination in #main_stream divs 2011-02-02 14:14:47 -06:00
Raphael
ff3f376c07 Fix cucumber feature 2011-02-02 11:56:39 -08:00
Raphael
3fb6b0e072 Fix saved state cucumber feature 2011-02-02 11:52:56 -08:00
Andreas Schneider
aa6d616d69 db: person_id can only be updated if index is updated too. 
This fixes the following error:

Mysql2::Error: Duplicate entry '0' for key
'index_profiles_on_person_id': ALTER TABLE `profiles` CHANGE `person_id`
`person_id` int(11) NOT NULL
 2011-02-02 20:37:55 +01:00
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