Jonne Haß
9e5ac86a36
Merge branch 'release/0.4.1.0' into develop
2014-08-26 01:50:58 +02:00
lyzellis
8c90fea1e1
changes hovercard background color to grey on hover
2014-08-26 01:50:36 +02:00
Jonne Haß
3b3a44b39b
Merge pull request #5158 from khall/issue_5044
...
Fix for issue 5044
2014-08-26 01:18:39 +02:00
Jonne Haß
f772af86a6
Merge pull request #5156 from khall/issue_5040
...
Fix for issue 5040
2014-08-26 01:16:41 +02:00
Jonne Haß
cb6c79a885
Merge pull request #5151 from khall/issue_5090
...
Fix for issue 5090
2014-08-26 01:14:45 +02:00
khall
1d0446fcab
Adding tabindex='0' attributes to non-blueprint view elements since blueprint is so last week
2014-08-25 15:50:53 -07:00
Jonne Haß
ef214d7681
bump http_accept_language
2014-08-25 22:06:28 +02:00
Jonne Haß
42b08e8ab8
Update to Rails 4.1
2014-08-25 17:37:02 +02:00
khall
049e504ad3
Fix for issue 5044: Adding tabindex attributes for add contact dropdown and contents, also binding keypress event to perform same action that click does.
2014-08-24 21:37:39 -07:00
khall
41dc950a06
Adding scope for account_deletion to get only those that are uncompleted and then adding that scope to accounts.rake. Tested it out and it works well
2014-08-24 19:02:11 -07:00
khall
6d56a6fbac
Updating with jhass's code change. Still looking into Travis failure...
2014-08-24 16:01:59 -07:00
khall
a9fd16db3e
Fix for issue 5090: Changing error message wording and providing more information to user when status message is too long.
2014-08-24 13:28:57 -07: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ß
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ß
feb45a6291
Merge pull request #5135 from goobertron/tos2
...
Minor formatting changes to ToS
2014-08-24 13:30:51 +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ß
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ß
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ß
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
Florian Staudacher
adf7aa98dd
port router specs, don't test backbone - our own code is enough
2014-08-23 16:38:58 +02:00
Florian Staudacher
c81379d38f
port some more JS specs to jasmine 2.0... still a lot to do
2014-08-23 16:38:57 +02:00
Jonne Haß
1b3a2185eb
Fix and simplify current_page? check on profile page
2014-08-23 16:38:57 +02:00
Jonne Haß
cb13d30a02
Directly query photos when doing an update_all
...
For some reason it doesn't correctly set the bind variables
when called through an association with non-standard
keys. Probably a Rails bug.
2014-08-23 16:38:57 +02:00
Jonne Haß
35b17d8c4f
Do not call self-modifying Enumerable methods on AR::Relation objects
2014-08-23 16:38:57 +02:00
Jonne Haß
da9c1db14f
before_action
2014-08-23 16:38:57 +02:00
Niall Paterson
f33038f105
updated before_filters to before_actions as recommended for rails 4
2014-08-23 16:34:01 +02:00
Jonne Haß
244388fcb5
make aspect membership controller specs green
2014-08-23 16:34:01 +02:00
Jonne Haß
645a427798
Fix account deleter by not relying on protected_atrributes
2014-08-23 16:34:01 +02:00
Jonne Haß
dc12479070
Filter :id in User.build for now
...
Rails 4 seem to allow setting the id through supplied parameters
The controllers ported to strong_parameters should guard against
attacks over this vector, but I didn't want to remove the specs
that test this here
2014-08-23 16:34:01 +02:00
Jonne Haß
76c6d95a0e
replace deprecated disable_with option
2014-08-23 16:34:01 +02:00
Jonne Haß
09f0665225
replace deprecated usages for all
2014-08-23 16:34:01 +02:00
Jonne Haß
cc8a614c29
Remove attr_accessible from OpenGraphCache
2014-08-23 16:34:01 +02:00
Jonne Haß
2f1193fa36
Fix "prepared statements" errors
...
See https://coderwall.com/p/45ombq
2014-08-23 16:34:00 +02:00
Jonne Haß
dfa0245f4b
make assets:precompile work
2014-08-23 16:34:00 +02:00
Jonne Haß
a9e107364a
make status message controller spec pass and deprecation free
2014-08-23 16:34:00 +02:00
Jonne Haß
2cca5745c9
remove deprecated scoped
2014-08-23 16:34:00 +02:00
Jonne Haß
cb195f4d55
access connection through class
2014-08-23 16:34:00 +02:00
Jonne Haß
2f54d4f17d
remove conditions on association deprecation warnings
2014-08-23 16:34:00 +02:00
Jonne Haß
89afb616cf
replace deprecated scope syntax and unify it
2014-08-23 16:34:00 +02:00
Jonne Haß
33c3b38f2f
replace deprecated finder and finder_options syntax
2014-08-23 16:34:00 +02:00
Steffen van Bergerem
d682821f2d
Refactor css
2014-08-23 15:45:45 +02:00
Jonne Haß
c4970b485f
Merge pull request #5131 from wegotcoders/3801_delete_own_photos
...
3801 delete own photos
2014-08-23 10:52:29 +02:00
Steffen van Bergerem
987c982bb5
Fix mobile sign in page regression
2014-08-21 22:19:14 +02:00
goobertron
c8e5b326e5
Minor formatting changes to ToS
2014-08-21 11:36:21 +01:00
