MrZYX
|
5b51dde195
|
updated locales
|
2011-08-27 23:00:33 +02:00 |
|
Maxwell Salzberg
|
1df4e76f36
|
updating gemfile again
|
2011-08-23 17:43:35 -07:00 |
|
Maxwell Salzberg
|
89bd4f8da5
|
updating gemfile and gemfile.lock
|
2011-08-23 17:28:05 -07:00 |
|
danielgrippi
|
a7d9bbed84
|
wip
|
2011-08-23 16:37:50 -07:00 |
|
danielgrippi
|
27049e52b5
|
connect logic
|
2011-08-23 16:37:50 -07:00 |
|
Dan Hansen
|
545611fffa
|
green?
|
2011-08-21 20:45:51 -05:00 |
|
Raphael Sofaer
|
60e9fd54e2
|
Fix a problem with re-saving deleted objects in a spec in postgres, add postgres to test group in gemfile
|
2011-08-18 16:05:14 -07:00 |
|
Maxwell Salzberg
|
419707412a
|
update jasmine to destroy deprication warnings in the tests
|
2011-08-17 20:57:11 -07:00 |
|
danielgrippi
|
4d4d11b90b
|
upgrade selenium-webdriver to 2.4 for FF6 support
|
2011-08-17 12:49:07 -07:00 |
|
Raphael Sofaer
|
685165d133
|
Lock fixture_builder at 0.2.2
|
2011-08-10 10:12:14 -07:00 |
|
danielgrippi
|
aac72b12e7
|
added hoptoad support, API key read from application.yml
|
2011-08-09 10:46:15 -07:00 |
|
Maxwell Salzberg
|
215fdf6550
|
update gemfile.lock to account for new diaspora-client gem that doesnt throw warnings
|
2011-08-09 10:37:34 -07:00 |
|
MrZYX
|
e11de0c7d0
|
update i18n-inflector and i18n-inflector-rails, this makes them usable with ruby 1.8.7 again
|
2011-08-09 17:00:33 +02:00 |
|
Raphael Sofaer
|
7052654b25
|
Update factorygirl, fix the searcheable_person factory to work with factory_girl 2.0.3
|
2011-08-05 15:45:05 -07:00 |
|
Maxwell Salzberg
|
f0075db694
|
mac osx only dependenacy is freaking out production gems
|
2011-07-31 21:46:38 -07:00 |
|
Maxwell Salzberg
|
70e6c8ccb4
|
update gemfile.lock due to adding guard
|
2011-07-31 21:42:25 -07:00 |
|
Maxwell Salzberg
|
bb8db654d6
|
add basic pod error logging, and added guard and removed autotest
|
2011-07-30 11:44:27 -07:00 |
|
MrZYX
|
67ffdd71aa
|
update rails-i18n
|
2011-07-25 12:54:25 +02:00 |
|
Maxwell Salzberg
|
9ac88a8c39
|
update gemfile
|
2011-07-21 14:32:10 -07:00 |
|
Maxwell Salzberg
|
0cc018dd6b
|
i think this works. there is some weird stuff in vannacontroller, but that might have always been there
|
2011-07-21 14:32:10 -07:00 |
|
Maxwell Salzberg
|
df62f58156
|
fixed the safe_buffer issues
|
2011-07-21 14:32:09 -07:00 |
|
Raphael Sofaer
|
55009a8381
|
Use activerecord-import to re-save ServiceUser objects. We should do the same in ReceiveLocalBatch.
|
2011-07-13 10:59:41 -07:00 |
|
MrZYX
|
98ebb384ca
|
update i18n-inflector-rails
|
2011-07-12 20:37:13 +02:00 |
|
MrZYX
|
2a15a17983
|
rails-i18n is now a gem
|
2011-07-12 15:04:48 +02:00 |
|
Maxwell Salzberg
|
2d9d9bd1a1
|
Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same""
This reverts commit 696779d589.
|
2011-07-02 12:05:26 -07:00 |
|
Maxwell Salzberg
|
696779d589
|
Revert "remove perform delegate: use a gem that unobtrusivly does the same"
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
|
2011-07-02 12:01:31 -07:00 |
|
Maxwell Salzberg
|
dd752d7dd9
|
remove perform delegate: use a gem that unobtrusivly does the same
thing. use built in resque inline method for single process mode
|
2011-07-02 11:57:10 -07:00 |
|
Raphael Sofaer
|
63902fd273
|
Lock oauth2-provider
|
2011-06-29 17:30:12 -07:00 |
|
Raphael Sofaer
|
3887144db6
|
I seriously think that this commit is going to fix CI. SRSLY.
|
2011-06-29 15:34:45 -07:00 |
|
Raphael Sofaer
|
d6321d2327
|
Bundle in the oauth features, take the source out of the chubbies Gemfile
|
2011-06-29 11:21:23 -07:00 |
|
Raphael Sofaer
|
4683047ee0
|
point diaspora client to the right place in the gemfiles
|
2011-06-28 17:36:01 -07:00 |
|
Raphael Sofaer
|
3078220bc0
|
Point diaspora-client to git
|
2011-06-28 17:25:02 -07:00 |
|
Raphael Sofaer
|
1af945de11
|
Merge branch 'master' into oauth
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
|
2011-06-28 17:13:38 -07:00 |
|
Michael Sofaer
|
ef7580a698
|
Notifications page works with Vanna
|
2011-06-27 19:51:35 -07:00 |
|
danielgrippi
|
73fe74c834
|
updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber
|
2011-06-27 18:58:29 -07:00 |
|
danielgrippi
|
0b5de2aa7a
|
WIP getting rid of app_url in params
|
2011-06-24 11:22:44 -07:00 |
|
danielgrippi
|
bd84eaaf75
|
added cucumber test for re-registering a pod from a client
|
2011-06-23 18:57:39 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
d46f3a8d1f
|
fixed every spec but the activity stream photos controller spec
|
2011-06-23 15:22:36 -07:00 |
|
danielgrippi
|
5917f0d695
|
added JWT verification support to diaspora
|
2011-06-22 16:15:03 -07:00 |
|
Raphael Sofaer
|
04b0705733
|
Faraday follows redirects
|
2011-06-22 12:53:18 -07:00 |
|
Raphael Sofaer
|
728a547cb2
|
Undo some pg changes
|
2011-06-19 16:16:30 +02:00 |
|
Raphael Sofaer
|
7c454b7d15
|
Fix stream query for postgres, shouldn't break mysql
|
2011-06-19 16:16:30 +02:00 |
|
Ilya Zhitomirskiy
|
9366b7243a
|
configured the testmode
|
2011-06-15 16:04:38 -07:00 |
|
Ilya Zhitomirskiy
|
844bf48851
|
changed back to the git repo for client
|
2011-06-14 18:35:36 -07:00 |
|
Ilya Zhitomirskiy
|
dca2eca67c
|
cucumber specs are green
|
2011-06-14 15:36:05 -07:00 |
|
Raphael Sofaer
|
42d177eea4
|
Lock linecache to avoid require_relative thing
|
2011-06-14 09:51:19 -07:00 |
|
Raphael Sofaer
|
4815482354
|
Start some real docs
|
2011-06-13 16:12:32 -07:00 |
|
Ilya Zhitomirskiy
|
f31a78f23f
|
updated the Gemfile to point to repo instead of path
|
2011-06-09 17:42:33 -07:00 |
|
Raphael Sofaer
|
6d5169d707
|
Chubbies is working with local diaspora-client gem
|
2011-06-09 15:01:09 -07:00 |
|
Maxwell Salzberg
|
4b13c83de7
|
Chubbies now uses sqlite to have tables of pods and users
|
2011-06-03 16:24:12 -07:00 |
|