Commit graph

11693 commits

Author SHA1 Message Date
Maxwell Salzberg
7361b8f305 for some reason the final step did not get shown [ci skip] 2012-04-18 12:00:03 -07:00
Maxwell Salzberg
225b296c69 point it to the master blob, too [ci skip] 2012-04-18 11:58:36 -07:00
Maxwell Salzberg
ef1d6672fa fix readme [ci skip] 2012-04-18 11:56:40 -07:00
Sean Tilley
7ce18162d1 Update README [ci skip] 2012-04-18 11:25:31 -07:00
Sean Tilley
b791404b12 Add infos back in. [ci skip] 2012-04-18 11:24:40 -07:00
Florian Staudacher
d8c42fde67 remove app.models.Photos 2012-04-18 20:21:16 +02:00
Florian Staudacher
8eb70c8a80 use app.models.Stream instead of app.models.Photos,
change naming a bit to be more general since its posts+photos now
(re #3158)
2012-04-18 20:20:56 +02:00
Florian Staudacher
4385027443 small js fixes
closes #3106 - hardening url handling,
fixes #2725 - backport from upstream
2012-04-18 19:59:34 +02:00
danielgrippi
3621576717 add/remove hidden class for pagination instead of manipulating HTML contents on every page load. 2012-04-18 10:27:22 -07:00
Maxwell Salzberg
b10aedb615 update the iframe route, fix a small styleing thing in newspaper style for iframe view 2012-04-17 22:43:47 -07:00
Maxwell Salzberg
90a2f05515 include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770 2012-04-17 22:28:01 -07:00
Sean Tilley
4d95c52960 Image Redirect URL should be blank [ci skip] 2012-04-18 00:18:22 -05:00
Sean Tilley
d46734e90c Set single_process_mode to true by default [ci skip] 2012-04-17 23:27:34 -05:00
danielgrippi
3479cb7bdd refactored stream and Stream View
streamView no longer abuses render with fetching
moved post collapsing into contentView
subtle nicification.
2012-04-17 21:06:34 -07:00
Sean Tilley
27513cf319 Simplify instructions for setting up a test environment [ci skip] 2012-04-17 21:42:23 -05:00
danielgrippi
37cd6f616e refactor stream fetching logic 2012-04-17 19:18:12 -07:00
Dennis Collinson
16223d003f change new publisher to public by default to make testing easier 2012-04-17 16:43:42 -07:00
Jonne Haß
25f6df230d Merge pull request #3150 from Gallaecio/l10n-gl
Updated the Galician translation.
2012-04-17 13:59:43 -07:00
Maxwell Salzberg
1a7ec495c9 Merge pull request #3136 from movilla/Auto_fix
Issue #3134:Problem with translation in authorizations/new.html.haml
2012-04-17 13:52:29 -07:00
Maxwell Salzberg
d456fed99c Merge pull request #3148 from DeadSuperHero/appconfiglove
Refactor application.yml.example [ci skip]
2012-04-17 10:48:24 -07:00
Maxwell Salzberg
6fefcca292 update readme [ci skip] 2012-04-17 10:29:32 -07:00
Maxwell Salzberg
672eb1674f use rails admin gem, not the smaller git repo. NOTE: I will delete diaspora/rails_admin_smaller in about a week to let people who pulled it get off of it 2012-04-17 10:20:52 -07:00
Florian Staudacher
ec5289bd3b continue working on install script [ci skip] 2012-04-17 02:21:05 +02:00
Jonne Haß
b99e77d8ce Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-04-16 23:59:03 +02:00
Jonne Haß
959523aae8 updated 22 locale files [ci skip] 2012-04-16 23:58:57 +02:00
Florian Staudacher
fe130caf10 moved non-ascii url markdown tests to text_formatter_spec, added test case + fix 2012-04-16 23:41:05 +02:00
Maxwell Salzberg
24b69236a0 exclude share vis in rails admin, dont exclude users [ci skip] 2012-04-15 17:58:49 -07:00
Maxwell Salzberg
3586413b18 sorry :( Revert "adding custom landing page for heroku" [ci skip]
This reverts commit f7d1f0d9b9.
2012-04-15 17:11:13 -07:00
Maxwell Salzberg
a558f45f9d use shallow copy of rails_admin [ci skip] 2012-04-15 17:08:05 -07:00
Maxwell Salzberg
17b451e4ad tags for logging [ci skip] 2012-04-15 17:04:53 -07:00
Maxwell Salzberg
b0e4c477bf log more in authorizations controller :( 2012-04-15 17:03:09 -07:00
Maxwell Salzberg
f7d1f0d9b9 adding custom landing page for heroku 2012-04-15 15:34:30 -07:00
Jordi Mallach
00e42b11f2 Fix typo in Catalan translation (thanks to David Bas@JD). 2012-04-15 21:54:08 +02:00
Jordi Mallach
c9fff4a435 Update Catalan translation to 4d92653. 2012-04-15 19:09:01 +02:00
Jordi Mallach
4d92653874 Fix typo in key name: seperated → separated. 2012-04-15 19:07:59 +02:00
Jordi Mallach
2bb9fbf58d Fix typo in key name: autorize → authorize. 2012-04-15 19:05:03 +02:00
Jordi Mallach
7b73c62a0b Update Catalan translation to cac2b1e. 2012-04-15 18:56:55 +02:00
Florian Staudacher
6c34207e01 freeze at a valid time, not 0000-01-01 ... 2012-04-15 13:03:33 +02:00
Florian Staudacher
d9d7bbb74b using timecop for interactions + whitespaces removed 2012-04-15 03:10:18 +02:00
Florian Staudacher
d328cdaa96 "twipsy" is now "tooltip", "position" must be "placement" and "select" is not a valid trigger
- should fix a few cukes...
2012-04-15 02:02:12 +02:00
Adrián Chaves Fernández (Gallaecio)
0956fbbdb6 Improved the Galician translation and fixed a quoting error. 2012-04-14 22:44:13 +02:00
Adrián Chaves Fernández (Gallaecio)
c659b8f393 Updated the Galician translation. 2012-04-14 22:29:52 +02:00
Florian Staudacher
4e030c3de8 made install script a little smarter, hope u like it ;) 2012-04-14 20:28:39 +02:00
Steven Hancock
7e517c2636 Initialize on asset precompile
This re-enables 'config.assets.initialize_on_precompile' to allow the
Rails Admin assets to precompile. On Heroku deploys, this may require
the Heroku Labs 'user_env_compile' feature to be enabled, which you
should be using anyway for Asset Sync to work properly. :)
2012-04-13 20:42:05 -07:00
Maxwell Salzberg
9f6ad65d73 update schema, views spec 2012-04-13 18:32:35 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Sean Tilley
af389a97f8 refactor appconfig 2012-04-13 19:56:46 -05:00
Dennis Collinson
a0ea8c8542 Update aspects dropdown to say number of selected aspects 2012-04-13 17:49:49 -07:00
Sean Tilley
aaa8930264 Refactor AppConfig 2012-04-13 19:46:23 -05:00
Maxwell Salzberg
c4b36a179e Merge pull request #3138 from stevenh512/bootstrap-sass
bootstrap-sass (w00t)
2012-04-13 17:44:08 -07:00