Jonne Haß
|
2de0213d6f
|
Revert "Removed a couple missed "new_styles" assets."
This reverts commit e323d6134e.
|
2012-09-12 12:55:57 +02:00 |
|
Jonne Haß
|
2b729059c9
|
was too long awake last commit, here are the files back we still need
|
2012-09-12 12:55:57 +02:00 |
|
Sean Tilley
|
719eeff56f
|
Merge pull request #3571 from hfase01/master
Removed a couple lines missed by new style removal. [ci skip]
|
2012-09-12 01:19:34 -07:00 |
|
Hans Fase
|
e323d6134e
|
Removed a couple missed "new_styles" assets.
|
2012-09-12 04:05:33 -04:00 |
|
Jonne Haß
|
7ec2f8f419
|
finish beta striping
A lot of cleanup is still needed, refactoring the CSS to be consistent, removing all sorts of unused stuff etc
|
2012-09-12 07:51:19 +02:00 |
|
Jonne Haß
|
ab0ad630df
|
strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep
|
2012-09-12 05:48:12 +02:00 |
|
Jonne Haß
|
ffde639f4d
|
Merge branch 'betastrip' of git://github.com/DeadSuperHero/diaspora
|
2012-09-12 04:55:10 +02:00 |
|
Sean Tilley
|
49ea8c8563
|
Strip Beta Features
|
2012-09-11 21:52:53 -05:00 |
|
Florian Staudacher
|
4e1e0bcfed
|
Merge pull request #3565 from movilla/nsfw_freeze_position
With mobile click "show" in #nsfw-posts links to top of page Fix: #3564
|
2012-09-11 10:06:35 -07:00 |
|
Jonne Haß
|
51bde9bf66
|
updated 8 locale files [ci skip]
|
2012-09-11 18:40:54 +02:00 |
|
movilla
|
10eb26ad2d
|
With mobile click "show" in #nsfw-posts links to top of page Fix: #3564
|
2012-09-11 16:42:55 +02:00 |
|
Jonne Haß
|
d479ceea4f
|
Merge pull request #3550 from diaspora/update_gems
Update gems
|
2012-09-11 02:40:19 -07:00 |
|
Jonne Haß
|
8dab297d26
|
bump and convert back to gem release: acts-as-taggable-on
|
2012-09-11 00:46:37 +02:00 |
|
Jonne Haß
|
f22346a4ae
|
bump pg
|
2012-09-11 00:46:37 +02:00 |
|
Jonne Haß
|
de88463d33
|
bump gherkin
|
2012-09-11 00:46:37 +02:00 |
|
Jonne Haß
|
9c2f864bf9
|
bump rack-piwik
|
2012-09-11 00:46:37 +02:00 |
|
Jonne Haß
|
108673703c
|
bump rack-google-analytics
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
ab0143d18e
|
bump gon
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
0d925c0fed
|
bump haml
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
3886547bf1
|
bump rack-cors
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
04a5a787ba
|
bump timecop
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
bcbcdcee8e
|
bump uglifier
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
b8a3313a65
|
bump debugger
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
088446e86e
|
bump rspec-rails, remove deprecated rspec syntax
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
e7b1edbef7
|
bump database_cleaner
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
80153bf287
|
bump thin
|
2012-09-11 00:46:36 +02:00 |
|
Jonne Haß
|
39a5baa8c8
|
bump resque
|
2012-09-11 00:46:35 +02:00 |
|
Jonne Haß
|
29967d14e1
|
bump omniauth
|
2012-09-11 00:46:35 +02:00 |
|
Jonne Haß
|
d1987d62c4
|
bump heroku_san
|
2012-09-11 00:46:35 +02:00 |
|
Jonne Haß
|
72cfff77b9
|
bump fixture_builder
|
2012-09-11 00:46:32 +02:00 |
|
Jonne Haß
|
d5b4a76488
|
bump foreman
|
2012-09-10 23:55:52 +02:00 |
|
Jonne Haß
|
d9a9c5352a
|
bump foreigner
|
2012-09-10 23:55:52 +02:00 |
|
Florian Staudacher
|
04a17fd508
|
Merge pull request #3561 from movilla/NSFW_mobile_will_come_back
NSFW mobile come back
|
2012-09-10 13:08:51 -07:00 |
|
Jonne Haß
|
b68c4d6a0c
|
Merge pull request #3549 from diaspora/update_selenium
bump selenium-webdriver
|
2012-09-10 12:07:30 -07:00 |
|
movilla
|
a4a483af90
|
NSFW mobile come back
|
2012-09-10 20:48:34 +02:00 |
|
Jonne Haß
|
53c77f7efd
|
drop rename notice about script_server.yml [ci skip]
|
2012-09-10 14:00:02 +02:00 |
|
Jonne Haß
|
4a77ccb0cc
|
update travis badge to point at master branch [ci skip]
|
2012-09-10 13:44:00 +02:00 |
|
Sean Tilley
|
3deff9327a
|
Merge pull request #3557 from movilla/web_mobile_login_second
New web mobile login (Jonne suggestion) [ci skip]
|
2012-09-08 12:02:15 -07:00 |
|
Sean Tilley
|
fa6a379d6b
|
Merge pull request #3558 from movilla/404_mobile_page
404 page set for mobile [ci skip]
|
2012-09-08 11:11:14 -07:00 |
|
movilla
|
c6d24c61f9
|
404 page set for mobile
|
2012-09-08 19:43:10 +02:00 |
|
movilla
|
a564cbff9d
|
New_login_mobile_web_
|
2012-09-08 15:30:59 +02:00 |
|
Florian Staudacher
|
9bd2def105
|
Merge pull request #3551 from jeremyjh/2769-profile-tags
#2769 let profile tag entry grow to size of input box
|
2012-09-08 02:59:10 -07:00 |
|
Jeremy Huffman
|
c8f8f6741a
|
let profile tag entry grow to size of input box
use auto so line-breaks work better
|
2012-09-07 23:24:41 -04:00 |
|
Jonne Haß
|
a9ebe42b9f
|
turn mailer on in test env so the stubs can take action
|
2012-09-07 22:12:07 +02:00 |
|
Jonne Haß
|
d27408d8a9
|
set perform_deliveries, this should fix #3524
|
2012-09-07 21:46:13 +02:00 |
|
Jonne Haß
|
d33bf10c56
|
bump selenium-webdriver
|
2012-09-07 02:35:17 +02:00 |
|
Jonne Haß
|
edc9d75df7
|
remove deprecation warning about outdated render call
|
2012-09-07 01:55:53 +02:00 |
|
Jonne Haß
|
8a759c3aca
|
Use Builder::XChar.encode instead of to_xs in spec
|
2012-09-07 00:09:43 +02:00 |
|
Jonne Haß
|
a488dd50c4
|
follow up of last commit fixing remaining specs
changed spec since it didn't actually test what it said
|
2012-09-06 22:11:04 +02:00 |
|
Jonne Haß
|
81442f0f2a
|
Erb::Util.h now escapes ' which it didn't before
this is what 3.2.8 actually fixes to prevent XSS iirc
We're including the raw message in the atom feed so
we should test for it
|
2012-09-06 21:12:49 +02:00 |
|