Jonne Haß
2fcf729f64
don't use a rails method in a pre-rails environment
2012-12-08 00:50:30 +01:00
Jonne Haß
4150a89eb8
fix Gemfile.lock
2012-12-07 22:41:06 +01:00
Florian Staudacher
94760f4c04
update jasmine gem, removed useless spec, + changelog)
2012-12-07 21:21:27 +01:00
Tom Scott
e717eaac70
Remove debugger from the Gemfile.
...
Developers are free to choose their own debugging agent, but unless
it causes problems, personal development gems are not to be
included in the project's Gemfile. This is so each developer can
maintain their own comfortable environment without having workflows
enforced upon them.
Conflicts:
Gemfile.lock
2012-12-07 14:21:09 -05:00
Florian Staudacher
2c7f2d6fbb
Merge branch 'feature/3779-hide-post-icon-alignment' of https://github.com/Flaburgan/diaspora into Flaburgan-feature/3779-hide-post-icon-alignment
...
[ci skip]
Conflicts:
Changelog.md
2012-12-07 17:47:19 +01:00
Jonne Haß
366768eac7
the day I decide to switch to seleniums prerelease 2.27 comes out. great. anyway, still two timeouts, any ideas? anyone?
2012-12-06 18:38:06 +01:00
Jonne Haß
459df9b735
Merge pull request #3791 from movilla/suggest_member
...
Translation "suggest member" of Community Spotlight
2012-12-06 09:34:01 -08:00
Jonne Haß
c28412e1ea
Merge pull request #3792 from movilla/mail_podmin
...
Add feature contact podmin. Close #3770
2012-12-06 09:32:50 -08:00
movilla
491c2a537c
Add feature contact pod admin
2012-12-06 15:26:49 +01:00
movilla
65376a604b
Allow translation of "suggest member" of Community Spotlight
2012-12-06 13:15:34 +01:00
Jonne Haß
e05edcfda6
Revert "hmm, I hate it if these things work locally..."
...
This reverts commit 4cebe42375
2012-12-06 10:45:46 +01:00
Jonne Haß
4cebe42375
hmm, I hate it if these things work locally...
2012-12-06 10:45:12 +01:00
Jonne Haß
d836d1102a
let travis find the selenium prerelease
2012-12-06 10:39:31 +01:00
Jonne Haß
613fbb6ffd
lets see what travis has to say about the selenium prerelease
2012-12-06 10:37:11 +01:00
Flaburgan
65c16ac44c
Update changelog
2012-12-02 13:26:46 +01:00
Flaburgan
aee6068412
Resize deletelabel and ignoreuser images to align them
2012-12-02 13:20:24 +01:00
Jonne Haß
18573fe4bb
Merge pull request #3781 from liamn/feature/update-cat-image
...
Update cat image so it's secure - new image from khanb1 on flickr.
2012-12-02 03:13:23 -08:00
Liam
c9559b93f5
Update cat image so it's secure - new image from khanb1 on flickr.
2012-12-02 10:31:45 +00:00
Jonne Haß
9d954b1a60
Merge pull request #3777 from davecocoa/feature/3775-fix-tags-on-profile-edit
...
fix the tag handling on the profiles edit page
2012-12-01 09:18:09 -08:00
David McMullin
86ee4e2020
update changelog
2012-12-01 16:07:41 +00:00
David McMullin
6e912adb88
add a necessary param, fix the retrieve limit
2012-12-01 11:18:13 +00:00
Jonne Haß
bf27cca03a
Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead.
2012-11-30 18:16:56 +01:00
Jonne Haß
2a7a0b7b99
* made number of unicorn worker processes configurable
...
* made configuration loader indepenent of rails
* corrected mismatch between example and default config (server.db/server.database)
2012-11-30 14:00:25 +01:00
Jonne Haß
669dd87b11
extract configruation system to a gem
2012-11-30 13:35:59 +01:00
Dennis Schubert
656e52360f
Remove REEs garbage collection [ci skip]
...
We are not using REE anymore, so...
2012-11-29 22:57:38 +01:00
Jonne Haß
7aa0726971
use file? instead of exists? to check for correct ca bundle path
2012-11-27 21:14:44 +01:00
Jonne Haß
fc180a4521
guard: minimize running all specs [ci skip]
2012-11-26 14:30:30 +01:00
Jonne Haß
bf698f3882
Do not strip "markdown" in links when posting to services, fix #3765
2012-11-26 14:16:43 +01:00
Jonne Haß
995775955e
Merge pull request #3737 from davecocoa/feature/2704-fix-aspects
...
Feature/2704 fix aspects
2012-11-25 10:07:20 -08:00
David McMullin
c3c603f8cd
Update changelog
2012-11-25 17:41:58 +00:00
David McMullin
0873ae9ab7
improve behaviour of deselect all
2012-11-25 17:38:19 +00:00
David McMullin
f290bcf169
add tests so it doesn't break again
2012-11-25 17:38:19 +00:00
David McMullin
f6b32fd13a
rename the JS so the magic can return
2012-11-25 17:38:19 +00:00
Jonne Haß
96924b8458
updated changelog [ci skip]
2012-11-25 18:31:40 +01:00
Jonne Haß
7b548fd571
Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags
...
port tagFollowings to BackBone
2012-11-25 09:30:47 -08:00
Jonne Haß
e536622c4b
update changelog [ci skip]
2012-11-25 18:25:51 +01:00
Jonne Haß
6540fda1e7
Merge pull request #3748 from rschaden/3271-invitation-email-validation
...
3271 invitation email validation
2012-11-25 09:18:29 -08:00
rschaden
49d4079065
add email validation to invitations
2012-11-25 14:25:20 +01:00
Jonne Haß
b2606bc8c8
givup on installing FF16, just allow cucumber to fail until FF17 is supported
2012-11-24 10:35:07 +01:00
Jonne Haß
23cc8a806a
we really need a new selenium release...
2012-11-24 10:26:56 +01:00
Jonne Haß
19ac3bc45c
install libnotify4 too
2012-11-23 01:00:21 +01:00
Jonne Haß
0f6aab9593
giving up on apt, just download the right firefox deb
2012-11-23 00:57:24 +01:00
Jonne Haß
3b05490306
maybe that's a correct ff package version
2012-11-22 23:56:31 +01:00
Jonne Haß
1146421f83
maybe ff 16.0.2 is installable?
2012-11-22 23:45:45 +01:00
Jonne Haß
e8a7f40970
attempt to install ff 16 until there's a new selenium release
2012-11-22 23:42:08 +01:00
Jonne Haß
cb785195c9
update changelog for #3759
2012-11-22 21:19:16 +01:00
Jonne Haß
8b4b893c63
Merge pull request #3759 from bobbyw/feature/3750-last-post-link
...
Fix #3750
2012-11-22 12:16:42 -08:00
Jonne Haß
e25ebe2098
lets see if this fixes anything about the randomly failing comments cuke, still no clue about the recent timeouts
2012-11-22 21:14:26 +01:00
Bobby Wilson
abd4e17daf
Fix #3750
2012-11-22 13:00:47 -07:00
Jonne Haß
76bd782962
bump recommended ruby version to 1.9.3-p327 since it fixes a potential DoS attack
2012-11-22 20:17:00 +01:00
