Граф коммитов

1757 Коммитов

Автор SHA1 Сообщение Дата
Shane Caraveo b07d541fe4 make server-share work again by forcing server-core rev 2011-06-29 20:44:46 -07:00
Philippe M. Chiasson 91fdb0faa9 adjust to new name 2011-05-12 12:49:11 -04:00
Philippe M. Chiasson efd583896b Update hudson friendly symlink for the new name 2011-05-11 13:11:00 -04:00
Philippe M. Chiasson 23817adf0c clean up leftover setup.py code for when we included web stuff 2011-05-11 12:23:41 -04:00
Philippe M. Chiasson 2a71ca25a8 Bug 655081 - Improve logformat r=tarek 2011-05-06 12:06:31 -04:00
Rob Miller edffbfe1b6 Merge branch 'bug/654608-rename-f1-to-share' into develop 2011-05-05 11:00:01 -07:00
Rob Miller 37c708889a Merge branch 'develop' into bug/654608-rename-f1-to-share
Conflicts:
	development.ini
2011-05-05 10:58:51 -07:00
Rob Miller dcc215c9bf Merge branch 'bug/654598-make-dev-target' into develop 2011-05-05 10:54:38 -07:00
Rob Miller b0db7e8bcf Merge branch 'develop' into bug/654598-make-dev-target
Conflicts:
	Makefile
2011-05-05 10:53:31 -07:00
Rob Miller 874a02b450 a few more F1 -> server-share changes 2011-05-04 13:32:39 -07:00
Rob Miller 040431d6b7 Merge branch 'develop' of github.com:mozilla/f1 into develop 2011-05-04 13:16:26 -07:00
Rob Miller 440708969f readme changes to reflect F1 -> ShareServer rebranding 2011-05-04 12:16:29 -07:00
Tarek Ziadé 987e133f21 Merge branch 'develop' of github.com:mozilla/f1 into develop 2011-05-04 21:06:11 +02:00
Tarek Ziadé a178c73852 Bug 654445 - fetch the static part of share (client-share-web) into the main app - r=jrburke 2011-05-04 21:03:24 +02:00
Tarek Ziadé 6a5725004e removed web and hooked client-share-web instead 2011-05-04 14:50:34 +02:00
Tarek Ziadé 7498ffcc0d removed web and hooked client-share-web instead 2011-05-04 14:50:26 +02:00
Rob Miller db016c2111 change more references to the egg name from linkdrop -> ShareServer 2011-05-03 18:58:39 -07:00
Rob Miller a684daca0b change logger key to 'shareserver' for parity w/ egg name, etc. 2011-05-03 18:43:49 -07:00
Rob Miller 1616f49f71 change the name of the egg to ShareServer 2011-05-03 18:43:30 -07:00
Rob Miller 89eeda1625 change "Mozilla F1 for Firefox" to "Firefox Share" in templates 2011-05-03 18:43:01 -07:00
Rob Miller 495b162433 add DEV_DEPS value and a `dev` target that is exactly like `build` except it
used DEV_DEPS instead of DEPS
2011-05-03 16:54:09 -07:00
Rob Miller 19172064da Merge branch 'bug/642855-pylons-removal' into develop 2011-05-03 15:49:12 -07:00
Rob Miller 7b887a2ae1 add dependencies that we used to get transitively through pylons 2011-04-27 13:28:04 -07:00
Rob Miller 389c22d77b pep8 2011-04-27 13:14:47 -07:00
Rob Miller 187c40c4ef no more pylons dependency 2011-04-27 13:13:44 -07:00
Rob Miller f2f072acea delete reference to non-existent controller action 2011-04-27 12:41:29 -07:00
Rob Miller 90e93c8cdd scrap the error middleware for now 2011-04-27 12:31:19 -07:00
Rob Miller 0dfe3eeaf4 our mapper is on the app object now 2011-04-27 12:08:34 -07:00
Rob Miller b665c3fcbf missed a couple of things resolving conflicts in the last merge 2011-04-27 12:08:13 -07:00
Rob Miller dfff2ba06e Merge branch 'develop' into bug/642855-pylons-removal
Conflicts:
	linkdrop/controllers/contacts.py
	linkdrop/tests/services/test_playback.py
2011-04-27 11:56:41 -07:00
Rob Miller 2303e21a89 Merge branch 'develop' of github.com:mozilla/f1 into develop 2011-04-27 11:53:22 -07:00
Mark Hammond 6504671136 Merge branch 'bug/642863-accept-language-header' into develop 2011-04-27 16:16:52 +10:00
Mark Hammond 1b79633c5e update to work with recent reorg 2011-04-27 15:57:00 +10:00
Mark Hammond c80fc0d746 merge branch 'develop' 2011-04-27 15:54:03 +10:00
Rob Miller abbbc0cd7c scrapping more pylons boilerplate 2011-04-26 17:56:33 -07:00
Rob Miller 7668b13a5c scrapping more pylons boilerplate 2011-04-26 17:49:11 -07:00
Rob Miller 168ecb37d5 remove pylons mention in comment 2011-04-26 17:47:01 -07:00
Rob Miller c7f1614da5 pass the config to the shorten_link call 2011-04-26 17:46:36 -07:00
Rob Miller 37b1a62f12 request objects are from webob, not pylons 2011-04-26 17:46:11 -07:00
jrburke 615aaad639 Merge branch 'develop' of git@github.com:mozilla/f1 into develop 2011-04-26 17:31:11 -07:00
jrburke 063daa1c39 Updating README for OS X troubleshooting info. 2011-04-26 17:31:00 -07:00
Rob Miller 78012248e7 Merge branch 'develop' into bug/642855-pylons-removal 2011-04-26 16:54:30 -07:00
Rob Miller d01b2613cc Merge branch 'develop' of github.com:mozilla/f1 into develop 2011-04-26 16:54:22 -07:00
Rob Miller 71279b8fac stuff a beaker session into the environ since downstream code assumes it will be
there
2011-04-26 16:52:40 -07:00
Rob Miller 95a7de26fd the URLGenerator object is now stored in request.urlgen so as not to overload
the request.url value that's already in use
2011-04-26 16:52:11 -07:00
Rob Miller 65a10edd43 set up magical StackedObjectProxy config object *sigh* 2011-04-26 16:34:06 -07:00
Philippe M. Chiasson 0179722a3a make sure we have a web/ directory to keep setup.py happy at RPM time 2011-04-26 15:44:28 -04:00
Philippe M. Chiasson 36374a73cc fix incorrect name in RPM 2011-04-26 14:34:16 -04:00
Philippe M. Chiasson 2db89ad4b6 dont include web content in RPM anymore 2011-04-26 12:20:53 -04:00
Rob Miller 5182037e9c initialize the tests WSGI app objects and make sure we can get to the ones that we
need, and instantiate URLGenerator objects as needed for reverse URL lookups
2011-04-25 18:57:02 -07:00