Jonne Haß
|
047a05f74c
|
bump mini_magick
|
2014-08-25 19:15:29 +02:00 |
|
Jonne Haß
|
59d1076e31
|
bump guard-rspec
|
2014-08-25 19:15:29 +02:00 |
|
Jonne Haß
|
ebf43c1956
|
bump gon
|
2014-08-25 19:15:29 +02:00 |
|
Jonne Haß
|
b0bf570cd9
|
bump fog
|
2014-08-25 19:15:29 +02:00 |
|
Jonne Haß
|
25f117f8d8
|
bump devise
|
2014-08-25 19:15:29 +02:00 |
|
Jonne Haß
|
168aa26306
|
bump asset_sync
|
2014-08-25 19:15:27 +02:00 |
|
Jonne Haß
|
d745d621f8
|
bump acts-as-taggable-on
|
2014-08-25 19:14:50 +02:00 |
|
Jonne Haß
|
c6771e7575
|
Merge pull request #5159 from jhass/rails41
Update to Rails 4.1
|
2014-08-25 19:05:38 +02:00 |
|
Jonne Haß
|
42b08e8ab8
|
Update to Rails 4.1
|
2014-08-25 17:37:02 +02:00 |
|
Jonne Haß
|
acc8691487
|
drop useless require from script/get_config.rb [ci skip]
|
2014-08-25 02:48:29 +02:00 |
|
Jonne Haß
|
3582df7c26
|
Merge pull request #5152 from jhass/stabilize_cukes
Try stabilizing cukes
|
2014-08-25 01:09:52 +02:00 |
|
Jonne Haß
|
b9ec56f44b
|
bump firefox on travis
|
2014-08-24 23:00:30 +02:00 |
|
Jonne Haß
|
caa5067721
|
don't make loading an assertion, just try waiting for it
|
2014-08-24 22:59:22 +02:00 |
|
Jonne Haß
|
e0c836c03d
|
bump rails
|
2014-08-24 16:03:50 +02:00 |
|
Jonne Haß
|
13f50eeee6
|
do not touch the own model in an after commit hook
That just recurses endlessly, fixes #5146
|
2014-08-24 16:03:17 +02:00 |
|
Jonne Haß
|
2619beb157
|
Merge pull request #4481 from diaspora/rails4
Port to Rails 4
|
2014-08-24 13:42:31 +02:00 |
|
Jonne Haß
|
a1e547f8d7
|
Merge pull request #5105 from goobertron/jquery_default
Change default for jQuery CDN to false
|
2014-08-24 13:36:57 +02:00 |
|
Jonne Haß
|
3044195ebc
|
Merge branch 'release/0.4.1.0' into develop
|
2014-08-24 13:34:29 +02:00 |
|
Jonne Haß
|
52d5a1cd1a
|
Merge pull request #5141 from svbergerem/mark-read-link-notifications
Change mark read link on notifications page
|
2014-08-24 13:32:32 +02:00 |
|
Jonne Haß
|
950ce72694
|
Merge branch 'release/0.4.1.0' into develop
|
2014-08-24 13:31:11 +02:00 |
|
Jonne Haß
|
feb45a6291
|
Merge pull request #5135 from goobertron/tos2
Minor formatting changes to ToS
|
2014-08-24 13:30:51 +02:00 |
|
Jonne Haß
|
5c60f10022
|
start new development cycle
|
2014-08-24 13:28:02 +02:00 |
|
Jonne Haß
|
a7b0e85659
|
Merge branch 'release/0.4.1.0' into develop
|
2014-08-24 13:26:04 +02:00 |
|
Jonne Haß
|
cf3d6293dc
|
Merge pull request #5130 from wegotcoders/4948-add-linebreaks
line breaks have been added to long headings
|
2014-08-24 13:25:22 +02:00 |
|
Jonne Haß
|
28c247ef8b
|
Merge pull request #5140 from svbergerem/refactor-css
Refactor css
|
2014-08-24 13:17:56 +02:00 |
|
Jonne Haß
|
527fb559e5
|
Bump version to 0.4.1.0
|
2014-08-24 13:17:29 +02:00 |
|
Jonne Haß
|
5762a5855e
|
remove manual sign in from close account cuke
|
2014-08-24 02:15:11 +02:00 |
|
Jonne Haß
|
2361b8e00f
|
bump capybara and phantomjs
|
2014-08-24 01:57:49 +02:00 |
|
Jonne Haß
|
01c4fa18d3
|
fix and stablize some cukes
|
2014-08-24 01:02:35 +02:00 |
|
Jonne Haß
|
2c6e9a9786
|
try working around precompilation bug by committing generated sprites, not nice but luckily they don't change often
|
2014-08-24 01:02:35 +02:00 |
|
Jonne Haß
|
68affd5dd1
|
bump entypo-rails
|
2014-08-24 01:02:35 +02:00 |
|
Jonne Haß
|
0a70a125be
|
Remove deprecation warning in blueprint view
|
2014-08-24 01:02:35 +02:00 |
|
goobertron
|
0f2929a0ce
|
Add strong codes for pod name
|
2014-08-23 19:40:02 +01:00 |
|
Steffen van Bergerem
|
c18df1c32f
|
Change mark read link on notifications page
|
2014-08-23 17:42:19 +02:00 |
|
Jonne Haß
|
d6d65cd0fd
|
apply rails 4 todos and fix specs after rebase
|
2014-08-23 16:47:57 +02:00 |
|
Jonne Haß
|
3fadba0430
|
update rails and compass-rails after rebase
|
2014-08-23 16:47:57 +02:00 |
|
Jonne Haß
|
5068be90e8
|
reduce cuke failures
* Bump sass-rails (without effect)
* Bump mobile-fu (without effect)
* Cosmetically fix two cukes
* Refactor Taggable#tag_strings
* Rename default.css to default.css.scss (without effect)
* Fix receiving a conversation
* Pass aspect_ids instead of a relation to User#aspects_from_ids
|
2014-08-23 16:47:57 +02:00 |
|
Jonne Haß
|
d070f19243
|
make rspec and jasmine pass with the new code
|
2014-08-23 16:47:57 +02:00 |
|
Jonne Haß
|
38e5ae2b73
|
bump rails_admin
|
2014-08-23 16:47:57 +02:00 |
|
Jonne Haß
|
8d1b611f88
|
bump jasmine-jquery-rails
|
2014-08-23 16:47:57 +02:00 |
|
Jonne Haß
|
b671509184
|
bump jasmine
|
2014-08-23 16:47:57 +02:00 |
|
Jonne Haß
|
e9ab6dc1e6
|
bump rack-ssl
|
2014-08-23 16:47:57 +02:00 |
|
Jonne Haß
|
c856fb459a
|
bump rails-i18n
|
2014-08-23 16:47:57 +02:00 |
|
Jonne Haß
|
c506276c73
|
bump activerecord-import
|
2014-08-23 16:47:57 +02:00 |
|
Jonne Haß
|
61c72b44e9
|
update rails to 4.0.5
|
2014-08-23 16:47:56 +02:00 |
|
Florian Staudacher
|
b07f6cf1db
|
adapt rebased changes to jasmine 2
|
2014-08-23 16:47:48 +02:00 |
|
Florian Staudacher
|
037671f1b6
|
port remaining specs - jasmine is green again (non-CI)
|
2014-08-23 16:46:08 +02:00 |
|
Florian Staudacher
|
304e560e43
|
use new jasmine async code
|
2014-08-23 16:46:08 +02:00 |
|
Florian Staudacher
|
d4aca571ac
|
add jasmine-jquery gem and use it, port some more specs
|
2014-08-23 16:46:08 +02:00 |
|
Florian Staudacher
|
4d3874cc2e
|
port more specs, add aspect factory
|
2014-08-23 16:46:04 +02:00 |
|