Jonne Haß
|
7ba092ae0b
|
bump jquery-rails
|
2012-09-26 18:55:06 +02:00 |
|
Jonne Haß
|
d5be4d6e2b
|
bump asset_sync
|
2012-09-26 18:55:06 +02:00 |
|
Jonne Haß
|
254d4fd335
|
bump heroku and fog
|
2012-09-26 18:55:06 +02:00 |
|
Jonne Haß
|
0560cedab0
|
bump activerecord-import
|
2012-09-26 18:55:06 +02:00 |
|
Jonne Haß
|
7a478704d5
|
just stop settingslogic from breaking rspec output for now
|
2012-09-26 18:54:14 +02:00 |
|
Jonne Haß
|
06d9ff221d
|
Merge branch 'LoD' into develop
|
2012-09-23 19:33:33 +02:00 |
|
Jonne Haß
|
e70e48d6ca
|
some refactoring regarding the law of demeter
|
2012-09-23 19:33:19 +02:00 |
|
Jonne Haß
|
f0619dbbfd
|
readd develop branch to .travis.yml, somehow lost in merge
|
2012-09-23 19:06:54 +02:00 |
|
Jonne Haß
|
3b7dbd6703
|
change rspec format to documentation to debug travis
|
2012-09-23 19:01:57 +02:00 |
|
Jonne Haß
|
1277cf92b2
|
refactor ci scripts
|
2012-09-23 19:00:52 +02:00 |
|
Florian Staudacher
|
9d391d5885
|
Merge pull request #3597 from devendram/diaspora-refactoring-1
refactored user model (using scope instead of class methods) + rspec tests
for daily, monthly, yearly activities
|
2012-09-23 09:36:35 -07:00 |
|
Jonne Haß
|
0a1be1400d
|
Merge pull request #3603 from movilla/translation_ignore_user_popup
traslation popup ignore user => /stream
|
2012-09-22 13:47:34 -07:00 |
|
movilla
|
812fce7181
|
traslation popup ignore user /stream
|
2012-09-22 22:07:17 +02:00 |
|
Jonne Haß
|
24c1c908f7
|
remove routes to removed controller
|
2012-09-22 14:16:28 +02:00 |
|
Devendra
|
a2fa083c3e
|
added rspec tests and refactored user model to use scope, for daily, monthly, and yearly actives
|
2012-09-22 01:56:34 +05:30 |
|
Jonne Haß
|
db11b9d214
|
Merge branch 'update_gems' into develop
|
2012-09-20 14:37:34 +02:00 |
|
Jonne Haß
|
9534caeb05
|
Merge pull request #3568 from diaspora/update_gems
Update gems / participation wanted
|
2012-09-20 04:57:17 -07:00 |
|
Sean Tilley
|
48049d9b49
|
Merge pull request #3590 from movilla/reshares_mobile_2_the_revenge_absolute_root
reshare mobile doesnt show the original author - absolute_root - Fix: #3368 [ci skip]
|
2012-09-19 20:54:18 -07:00 |
|
Florian Staudacher
|
c4712f71a4
|
Merge branch 'hotfix/3499-chromeframe'
|
2012-09-19 13:09:01 +02:00 |
|
Florian Staudacher
|
3f0bcc8a10
|
rack expects an array instead of a string, fixes #3499
|
2012-09-19 13:08:12 +02:00 |
|
Florian Staudacher
|
84c8b4686b
|
Merge branch 'hotfix/3499-chromeframe' into develop
|
2012-09-19 13:02:02 +02:00 |
|
Florian Staudacher
|
fd27137662
|
rack expects an array instead of a string, fixes #3499
|
2012-09-19 13:00:07 +02:00 |
|
movilla
|
dc0b2d9e58
|
reshare mobile doesnt show the original author - absolute_root - Fix: 3368
|
2012-09-19 07:30:03 +02:00 |
|
Jonne Haß
|
8674f5aea2
|
Merge branch 'hotfix/redis_url' into develop
|
2012-09-18 15:55:32 +02:00 |
|
Jonne Haß
|
2f9dbdbd86
|
use self instead of AppConfig to query redis_url inside AppConfig
|
2012-09-18 15:52:57 +02:00 |
|
Jonne Haß
|
3e44808cb2
|
Merge pull request #3587 from movilla/image_profile_post
images disappeared user profiles in the publication (/post/) for not having class in css
|
2012-09-17 15:43:00 -07:00 |
|
movilla
|
bacb99cd18
|
images disappeared user profiles in the publication (/ post) for not having class in css
|
2012-09-17 23:41:46 +02:00 |
|
Jonne Haß
|
42f97db42e
|
Merge branch 'select_aspects_dropdown_list' of git://github.com/movilla/diaspora into develop
|
2012-09-17 21:36:36 +02:00 |
|
Jonne Haß
|
e13099b36e
|
Merge pull request #3586 from diaspora/feature/publisher-cleanup
WIP backbone-ify publisher
|
2012-09-17 12:33:02 -07:00 |
|
Jonne Haß
|
70eda77395
|
bump timecop
|
2012-09-17 21:25:39 +02:00 |
|
Florian Staudacher
|
8193978fd2
|
in 'standalone' mode, the close button is hidden
... publisher is embedded into something, that has its own close button
|
2012-09-17 20:46:33 +02:00 |
|
Florian Staudacher
|
452de1b866
|
fix remaining cukes and some cleanup
|
2012-09-17 20:35:38 +02:00 |
|
Florian Staudacher
|
200887ca45
|
adapt jasmine specs to the new structure
|
2012-09-17 15:33:52 +02:00 |
|
Florian Staudacher
|
a3477b7691
|
move modified (non-upstream) js lib to lib/assets
|
2012-09-17 12:38:16 +02:00 |
|
Jonne Haß
|
ded404f571
|
let travis build develop and update readme to display the status
|
2012-09-17 01:12:22 +02:00 |
|
Florian Staudacher
|
1002fe088d
|
split up the various parts of the publisher,
should probably rather be backbone-subviews ... ?
|
2012-09-16 17:38:58 +02:00 |
|
movilla
|
ae0ac1c72d
|
css change when you choose aspects before posting -dropdown list-
|
2012-09-16 17:37:27 +02:00 |
|
Florian Staudacher
|
948b84eca1
|
WIP backbone-ify publisher, get rid of weird old POJsO
|
2012-09-16 14:35:59 +02:00 |
|
Jonne Haß
|
6c1a1ec6d2
|
it's enviroNment
|
2012-09-15 18:52:12 +02:00 |
|
Jonne Haß
|
9e264b5258
|
hotfix typo, thanks david
|
2012-09-15 18:28:43 +02:00 |
|
Jonne Haß
|
48dcccf7b3
|
Unify redis initialization
REDISTOGO_URL is now deprecated in favor of REDIS_URL which is supported by the redis gem too.
|
2012-09-15 18:23:22 +02:00 |
|
Jonne Haß
|
6d74926b9f
|
bump foreman
|
2012-09-15 14:09:32 +02:00 |
|
Jonne Haß
|
5fdbbe03ee
|
bump faraday and faraday_middleware
|
2012-09-15 14:06:04 +02:00 |
|
Steven Hancock
|
ca719893dc
|
Update bootstrap-sass to 2.1.0.0
|
2012-09-15 01:42:27 -07:00 |
|
Jonne Haß
|
f1631084d3
|
Merge pull request #3579 from movilla/css_modification_counter_tw_fb_tmblr
css modification on the number of characters twiter, facebook and tumblr...
|
2012-09-14 08:28:58 -07:00 |
|
movilla
|
426fe1ab7d
|
css modification on the number of characters twiter, facebook and tumblr -.counter-
|
2012-09-14 16:45:03 +02:00 |
|
Jonne Haß
|
8279eb2262
|
update root migration so that later migrations do not fail
|
2012-09-14 15:24:53 +02:00 |
|
Jonne Haß
|
4bada36bf1
|
do not redirect admin to his profile upon sign in
|
2012-09-14 15:01:19 +02:00 |
|
Jonne Haß
|
ca1cc8c5f5
|
let .rvmrc complain about not existing ruby instead of breaking systems
|
2012-09-13 19:16:45 +02:00 |
|
Jonne Haß
|
bedb7d1e22
|
bump activerecord-import
|
2012-09-13 18:08:13 +02:00 |
|