Jonne Haß
|
39b64bd65b
|
bump ffi
|
2013-03-21 22:07:31 +01:00 |
|
Jonne Haß
|
90e1a654ad
|
bump jasmine
|
2013-03-21 22:07:31 +01:00 |
|
Jonne Haß
|
c320f59c96
|
bump fssm
|
2013-03-21 22:07:31 +01:00 |
|
Jonne Haß
|
3c7007c31d
|
bump chunky_png
|
2013-03-21 22:07:31 +01:00 |
|
Jonne Haß
|
47be1191f3
|
bump coffee-script-source
|
2013-03-21 22:07:31 +01:00 |
|
Jonne Haß
|
e7ff0448ed
|
bump foreman
|
2013-03-21 22:07:31 +01:00 |
|
Jonne Haß
|
cb1f31ae8e
|
bump timecop
|
2013-03-21 22:07:31 +01:00 |
|
Jonne Haß
|
802ef60cad
|
bump twitter
|
2013-03-21 22:07:31 +01:00 |
|
Jonne Haß
|
61841f22a8
|
bump jwt
|
2013-03-21 22:07:31 +01:00 |
|
Jonne Haß
|
05ba4d04e7
|
bump fog
|
2013-03-21 22:07:30 +01:00 |
|
Jonne Haß
|
2725ef799b
|
bump redis
|
2013-03-21 22:07:30 +01:00 |
|
Jonne Haß
|
8aa4d8e0e8
|
bump cucumber-rails
|
2013-03-21 22:07:30 +01:00 |
|
Jonne Haß
|
1e00d8b683
|
bump selenium-webdriver
|
2013-03-21 22:07:30 +01:00 |
|
Jonne Haß
|
6159074f61
|
bump childprocess
|
2013-03-21 22:07:30 +01:00 |
|
Jonne Haß
|
e5311653a8
|
bump foreigner
|
2013-03-21 22:07:30 +01:00 |
|
Jonne Haß
|
c6818617e4
|
bump faraday
|
2013-03-21 22:07:30 +01:00 |
|
Jonne Haß
|
283b26cc30
|
bump rspec-rails
|
2013-03-21 22:07:30 +01:00 |
|
Jonne Haß
|
d8770731fc
|
bump font-awesome-sass-rails
|
2013-03-21 21:25:19 +01:00 |
|
Jonne Haß
|
6677746333
|
bump safe_yaml
|
2013-03-21 21:25:19 +01:00 |
|
Jonne Haß
|
871abf8d4b
|
bump unicorn
|
2013-03-21 21:25:19 +01:00 |
|
Jonne Haß
|
3855eaf223
|
bump handlebars_assets
|
2013-03-21 21:25:18 +01:00 |
|
Jonne Haß
|
10e5bb7b0d
|
bump guard
|
2013-03-21 21:25:18 +01:00 |
|
Jonne Haß
|
74599f19fc
|
bump coderay
|
2013-03-21 21:25:18 +01:00 |
|
Jonne Haß
|
c1ffc59ddb
|
bump client_side_validations
|
2013-03-21 21:25:18 +01:00 |
|
Jonne Haß
|
3430e1f90b
|
bump sass
|
2013-03-21 21:25:18 +01:00 |
|
Jonne Haß
|
6813434e91
|
bump excon
|
2013-03-21 21:25:18 +01:00 |
|
Jonne Haß
|
669faa042d
|
bump addressable
|
2013-03-21 20:50:25 +01:00 |
|
Jonne Haß
|
56a1cc75bb
|
Merge pull request #4070 from workwareusa/patch-1
Update diaspora.yml.example
|
2013-03-21 11:12:14 -07:00 |
|
workwareusa
|
8745611f33
|
Update diaspora.yml.example
Fixed the wording so admins know invites are either enabled or disabled, and the number of invites is set by default to 25.
|
2013-03-21 14:30:13 -03:00 |
|
Jonne Haß
|
a55f6fd98c
|
Merge branch 'hotfix/0.0.3.4' into develop
Conflicts:
Changelog.md
config/defaults.yml
|
2013-03-18 21:10:29 +01:00 |
|
Jonne Haß
|
1a995aa47c
|
bump rails to 3.2.13, release 0.0.3.4
|
2013-03-18 21:07:55 +01:00 |
|
Jonne Haß
|
1a58f9cf29
|
Merge branch 'mobile_comment' of https://github.com/movilla/diaspora into develop
Conflicts:
Changelog.md
|
2013-03-18 20:59:39 +01:00 |
|
Jonne Haß
|
6bb3967d33
|
Merge pull request #4063 from movilla/reshare_mobile_delete
Mobile error 500 if a reshared (original) post will be deleted. Close #3409
|
2013-03-18 12:32:50 -07:00 |
|
movilla
|
bf2bd5a97c
|
Hide comment button in the mobile view when not signed in
|
2013-03-18 20:15:55 +01:00 |
|
movilla
|
3990bebcf4
|
Fix mobile view of deleted reshares
|
2013-03-18 16:52:37 +01:00 |
|
Florian Staudacher
|
47046013ae
|
Merge pull request #4061 from MrZYX/gemfile_rework
rework Gemfile
|
2013-03-16 05:02:35 -07:00 |
|
Florian Staudacher
|
472649f0d7
|
Merge pull request #4050 from Flaburgan/patch-2
Update en.yml
|
2013-03-16 04:29:38 -07:00 |
|
Jonne Haß
|
2afa2899c5
|
rework Gemfile
|
2013-03-15 21:00:27 +01:00 |
|
Jonne Haß
|
e51443b3ef
|
Merge pull request #4059 from marpo60/remove_unnecessary_javascript_views
delete unused javascript views
|
2013-03-15 11:45:22 -07:00 |
|
Juan Manuel Azambuja
|
06dc53749a
|
delete unused javascript views
|
2013-03-15 14:39:34 -03:00 |
|
Jonne Haß
|
d9b36cd312
|
update changelog [ci skip]
|
2013-03-15 17:47:09 +01:00 |
|
Jonne Haß
|
8f6ae75423
|
Merge pull request #4039 from marpo60/diaspora_with_sprites
Add Sprites to Diaspora!
|
2013-03-15 09:44:27 -07:00 |
|
Jonne Haß
|
5a26d0b639
|
added sprites to .gitignore
|
2013-03-15 16:10:34 +01:00 |
|
Antoine D
|
fa1d0ce68e
|
Update en.yml
Only one sentence was not in future.
|
2013-03-14 20:42:04 +01:00 |
|
Florian Staudacher
|
ecd93bca6f
|
Merge pull request #4056 from marpo60/fix-4023
fix reshares in single post-view
|
2013-03-13 01:28:07 -07:00 |
|
Fabián Rodríguez
|
d63aff8ea8
|
update changelog
|
2013-03-12 20:24:03 -03:00 |
|
Juan Manuel Azambuja
|
78e1f6f251
|
add assets:preocompile prerequisite for cucumber specs on CI
|
2013-03-12 12:23:55 -03:00 |
|
Fabián Rodríguez
|
0a3e242e79
|
fix reshares in single post-view
|
2013-03-11 22:45:25 -03:00 |
|
Juan Manuel Azambuja
|
2556f08b89
|
[Sprites] update sprites after develop merge
|
2013-03-11 20:16:16 -03:00 |
|
Juan Manuel Azambuja
|
1115e10536
|
Merge branch 'develop' into diaspora_with_sprites
Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/application.css.sass
app/assets/templates/comment_tpl.jst.hbs
app/assets/templates/stream-element_tpl.jst.hbs
app/helpers/aspects_helper.rb
app/helpers/contacts_helper.rb
app/views/aspects/_aspect_listings.haml
app/views/aspects/toggle_contact_visibility.js.erb
app/views/contacts/_aspect_listings.haml
app/views/layouts/_header.html.haml
app/views/shared/_footer.html.haml
app/views/tags/_followed_tags_listings.haml
|
2013-03-11 20:10:55 -03:00 |
|