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

1823 commits

Author SHA1 Message Date
Jonne Hass
b38cf47661 rename config/script_server_config.yml to config/script_server.yml to remove redundancy 2011-09-07 03:30:43 +02:00
Jonne Hass
7beb2bb7e5 updated locales 2011-09-06 17:54:14 +02:00
Jonne Hass
a6d5fe68cb no need to install firefox on travis anymore; no need to come up with 
custom Xvfb init script anymore; lets try out travis notifications
 2011-09-06 15:27:23 +02:00
Maxwell Salzberg
7ff11188b6 update gemfile 2011-09-05 13:28:08 -07:00
Maxwell Salzberg
13eb7fbb7b forgot to remove js file from mobile assets 2011-09-05 11:03:57 -07:00
Maxwell Salzberg
a7602c4fd1 update jquery mobile 2011-09-05 10:51:36 -07:00
Jonne Hass
c682eb8a7a updated locales 2011-09-05 02:30:30 +02:00
Jonne Hass
d1a5e627ba export DB in script/server 2011-09-04 19:51:24 +02:00
Jonne Hass
6403cbded6 note to self: don't use debian manpages for ubuntu stuff… 2011-09-04 16:03:39 +02:00
Jonne Hass
19302078a2 improve aptitude command a bit 2011-09-04 15:55:45 +02:00
Jonne Hass
1a9e0162f9 really fix sed 2011-09-04 15:31:42 +02:00
Jonne Hass
6a268e08d6 fix sed in before-travis.sh 2011-09-04 15:21:07 +02:00
Jonne Hass
03110c466f use -q2 again for aptitude since -q3 doesn't seem to have any effect 2011-09-04 15:09:34 +02:00
Jonne Hass
835c4447f6 I just want to see if this works :P 
- Removed launchy since I couldn't find any use of it
- Ruby 1.9 seems to need em-synchrony explictly
- No need to recreate the Gemfile.lock on Travis if proper :platforms
options are used in the Gemfile
- Removed group :development, :test and moved the stuff in the
corresponding sections
- Install adapter Gems according to the env var DB, install al if it is
unset
- Merged database.yml.postgres into database.yml.example. Bonus point:
easier switching between mysql and postgres
- May break everything but lets see what CI says
 2011-09-04 14:53:28 +02:00
Sarah Mei
689fd7ec94 Include both mysql and pg in the Gemfile tp reduce travis startup time. 2011-09-03 22:48:56 -07:00
Sarah Mei
bf954f3e6a Need to rebundle if we switch the Gemfile for postgres 2011-09-03 21:52:57 -07:00
Sarah Mei
7c24a1a1fb How about we switch the Gemfile *before* we bundle install? 
PSA: don't drink & code, kids.
 2011-09-03 21:50:49 -07:00
Sarah Mei
1cc7026b59 First try at postgresql support on travis. 2011-09-03 21:44:13 -07:00
Sarah Mei
949423ccda Make YAML::ENGINE syck under ruby 1.9 to fix travis 1.9 build issue 2011-09-03 19:52:39 -07:00
Sarah Mei
8f9a0a032d Remove debugging output from travis script. 2011-09-03 19:22:01 -07:00
Sarah Mei
460b734b9e Must bundle exec rake on travis to avoid stack-level-too-deep rake errors. 2011-09-03 19:07:25 -07:00
Sarah Mei
60301d5a93 More debug output in travis. Also, use --without development production in the rebundle, same as in the original bundle. 2011-09-03 18:46:20 -07:00
danielgrippi
66836e53d2 Aspect dropdowns read 'All Aspects' if all aspects are selected 2011-09-03 18:38:12 -07:00
Sarah Mei
aa1aaaa0d8 Add --trace to debug the stack level too deep error on the travis 1.9 build. 2011-09-03 18:30:19 -07:00
Sarah Mei
024574534b Add execute bit to before-travis.sh 2011-09-03 18:03:42 -07:00
Sarah Mei
77149a9623 Move travis startup script to its own file. Add GC settings for REE and -q2 for aptitude install. 2011-09-03 17:57:18 -07:00
Sarah Mei
392db905cb Put the xvfb pidfile in /tmp instead of /root 2011-09-03 13:45:26 -07:00
Sarah Mei
2eca2c0f40 Add /etc/init.d script for xvfb. Copy it into place before trying to use it on travis. 2011-09-03 13:35:13 -07:00
MrZYX
b1f283c995 updated locales 2011-09-01 23:18:47 +02:00
MrZYX
6ef8edc9c1 updated locales 2011-08-31 20:34:45 +02:00
danielgrippi
1198670383 Added Foreman gem. Run Diaspora using foreman start (will start everything except mySQL. Passing in a -p flag will let you specifiy the port. Also: I took single_process_mode out of app config and made it an environment variable. If you want to boot a lightweight server, run SINGLE_PROCESS=true rails s. 2011-08-29 14:38:07 -07:00
danielgrippi
f2fb431fed condense asset declarations; include all js in widget and helper directories (this is what we've already been doing) 2011-08-27 22:22:20 -07:00
danielgrippi
802dd989a8 remove javascript in lieu of css; feature is still failing 2011-08-27 22:04:30 -07:00
Gonzalo Rodriguez
b9dbe0ecdd Closes #1827. Minor text fix on Getting Started page 2011-08-27 21:32:58 -03:00
MrZYX
5b51dde195 updated locales 2011-08-27 23:00:33 +02:00
Dan Hansen
27d4fd8176 fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files 
require confirmation for comments in js, get rid of rails helper
 2011-08-26 15:24:07 -05:00
Dan Hansen
d75ef8d020 made backtotop a widget, added jquery-debounce 2011-08-26 12:30:28 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a40543e15c a user now has the option to disable reshare email notifications 2011-08-25 17:16:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337 reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
MrZYX
ded85fb225 updated locales 2011-08-25 00:10:14 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7fd7fa968c fixed the email from header issues and backfilled few tests 2011-08-22 17:38:40 -07:00
MrZYX
f8a030d761 updated locales 2011-08-22 23:16:30 +02:00
MrZYX
87cd09a936 fix string concat 2011-08-22 23:09:51 +02:00
Dan Hansen
4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	spec/javascripts/stream-spec.js
 2011-08-21 20:57:01 -05:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Andrej Kacian
b772b8354d Fixed misplaced translations for no tags on own profile 2011-08-22 01:55:36 +02:00
Gonzalo Rodriguez
4ccb5f778a Missing js for contacts page. Aspect renaming wasn't working. 2011-08-21 20:31:16 -03:00
MrZYX
1b5698c1f5 updated locales 2011-08-21 17:09:16 +02:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
 2011-08-20 14:40:56 -05:00
Gonzalo Rodriguez
f1cf81772b Closes #1386. On conversations, disable Reply button once pressed 2011-08-20 15:51:39 -03:00