goobertron
a90627467b
Add sign-up tests for mobile, minor adjustments to other mobile tests
2014-08-30 18:35:10 +01:00
Jonne Haß
1c9f030f7f
Merge pull request #5173 from remcohh/develop
...
Consolidate migrations
2014-08-29 17:42:33 +02:00
Florian Staudacher
47bfd59729
Merge pull request #5179 from svbergerem/rounded-contact-search-form
...
Rounded contact search input
2014-08-29 15:29:40 +02:00
Remco Huijdts
edae905859
Add correct schema
2014-08-29 14:55:40 +02:00
Steffen van Bergerem
0ca59e828a
Rounded contact search input
2014-08-29 14:45:16 +02:00
Jonne Haß
79e1a9aafd
port notify local users worker spec to doubles
2014-08-29 01:42:16 +02:00
Jonne Haß
7c28921ec7
Merge pull request #5138 from svbergerem/bootstrap-tags-view
...
Port tags page to Bootstrap
2014-08-28 23:12:32 +02:00
Jonne Haß
32c3adc197
Merge pull request #5175 from jhass/js_assets
...
Dynamic asset paths everywhere
2014-08-28 23:11:06 +02:00
Jonne Haß
462198799b
Dynamic asset paths everywhere
...
* Use asset pipeline aware helpers in CSS files
* Add js_image_paths to push image asset names to the client side JS
2014-08-28 21:04:29 +02:00
Steffen van Bergerem
3f3087c77f
Port tags page to Bootstrap
2014-08-28 18:02:02 +02:00
Remco Huijdts
858551387f
correct initial schema
2014-08-28 13:23:24 +02:00
Remco Huijdts
28a71a46aa
Consolidate migrations
2014-08-28 12:28:06 +02:00
Jonne Haß
31328e4722
Merge pull request #5172 from jhass/skip_assets
...
skip assets precompilation
2014-08-28 01:11:31 +02:00
Jonne Haß
1b0de7f7cc
skip assets precompilation for cucumber run
2014-08-27 18:38:43 +02:00
Jonne Haß
3387bbca74
skip assets precompilation for regular run
2014-08-27 18:37:14 +02:00
Jonne Haß
0675337dab
bump fog-core
2014-08-27 18:34:00 +02:00
Jonne Haß
bb51752d33
bump font-awesome-rails
2014-08-27 18:33:14 +02:00
Jonne Haß
6fef1cf990
bump gon
2014-08-27 18:32:50 +02:00
Jonne Haß
de9acef27f
add changelog entry for rspec 3 port
2014-08-27 18:25:28 +02:00
Jonne Haß
ccd7c670b3
Merge pull request #5170 from khall/issue_5149a
...
Issue 5149a
Conflicts:
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
2014-08-27 18:20:56 +02:00
Jonne Haß
806de6a9ba
Merge pull request #5084 from Flaburgan/profile-mobile-improvements
...
Improve profile page design on mobile
2014-08-27 17:48:59 +02:00
Jonne Haß
6623fb66a6
Merge pull request #4960 from Flaburgan/polish-conversation-view
...
Polish conversation view
2014-08-27 17:47:33 +02:00
Jonne Haß
2348fb9d09
drop firefox addon from travis.yml
...
Travis build environment was updated to FF 31
2014-08-27 17:00:21 +02:00
khall
856386bf38
undoing my changes picked up during migration
2014-08-27 07:27:58 -07:00
Flaburgan
b83295b4e4
Polish conversation view
2014-08-27 14:40:58 +02:00
flaburgan
1dbce6d84d
Improve profile page design on mobile
2014-08-27 14:17:05 +02:00
Jonne Haß
f1ab434b18
Merge pull request #5153 from svbergerem/redesign-contacts-page
...
Redesign contacts page
2014-08-27 10:01:41 +02:00
Jonne Haß
8867023592
Merge pull request #4982 from Flaburgan/add-icon-in-dropdown-aspect
...
Add visibility icons in publisher dropdown aspect
2014-08-27 09:50:51 +02:00
khall
fe492c6fb8
Fixing a .should test to expect(), adding suggested line to spec_helper to prevent the use of .should in the future
2014-08-26 17:39:13 -07:00
khall
b7c68031fa
Last rspec fix brought to you by jhass
2014-08-26 17:12:58 -07:00
khall
087dbd4acf
Bumping rspec to 3.0.2
2014-08-26 17:12:21 -07:00
khall
875895f2d0
Convert specs to RSpec 3.0.4 syntax with Transpec
...
This conversion is done by Transpec 2.3.6 with the following command:
transpec features
* 19 conversions
from: obj.should
to: expect(obj).to
* 1 conversion
from: == expected
to: eq(expected)
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2014-08-26 17:11:44 -07:00
khall
de3e0bd91a
Updating cucumber features
2014-08-26 17:11:44 -07:00
khall
c27b38d69a
Merge branch 'develop' into issue_5149
...
Conflicts:
spec/controllers/aspects_controller_spec.rb
spec/controllers/conversations_controller_spec.rb
spec/controllers/people_controller_spec.rb
spec/controllers/photos_controller_spec.rb
spec/integration/receiving_spec.rb
spec/lib/postzord/receiver/public_spec.rb
spec/models/post_spec.rb
spec/models/user/querying_spec.rb
2014-08-26 17:11:39 -07:00
khall
4edd824d3c
No deprecation warnings, but one spec still fails (but only when I run all the specs, not when I run just the one spec)
2014-08-26 17:10:29 -07:00
khall
c42916df27
Two tests failing after rspec 2.99 => 3.0.0
2014-08-26 17:10:26 -07:00
khall
027bb9fcb0
Rspec version bump to 2.99
2014-08-26 17:00:21 -07:00
Jonne Haß
b53ee9c7b3
Merge pull request #5169 from jaideng123/5157-Increase_captcha_field_length
...
Increase max length of simple_captcha to 12
2014-08-27 01:29:38 +02:00
Flaburgan
2151b4f791
Add jasmine tests
2014-08-27 00:03:49 +02:00
flaburgan
3d793679e0
Add visibilit icons in publisher dropdown aspect
2014-08-26 22:47:41 +02:00
Steffen van Bergerem
ff84ee0485
Small style changes, add tests
2014-08-26 22:45:43 +02:00
Steffen van Bergerem
f1408a7a09
Add contacts search and port aspect membership save/destroy to backbone
2014-08-26 21:41:11 +02:00
Steffen van Bergerem
9587961883
Display all contacts in the contact list
2014-08-26 21:41:02 +02:00
jaideng123
1de67281f4
Simplified range check
2014-08-26 14:04:28 -05:00
jaideng123
f53001577e
Increase max length of simple_captcha to 12
2014-08-26 13:24:00 -05:00
Steffen van Bergerem
6461135bfd
Redesign contacts page
2014-08-26 19:18:32 +02:00
Jonne Haß
e3dc82bdcd
Merge branch 'release/0.4.1.0' into develop
2014-08-26 19:12:14 +02:00
Steffen van Bergerem
5a4697e254
Remove validation.js from mobile sign in page (fix regression)
2014-08-26 19:11:59 +02:00
Jonne Haß
2e1ed81750
Merge pull request #5164 from goobertron/tos_notes
...
Changelog note for change in jQuery CDN default
2014-08-26 18:04:57 +02:00
goobertron
9ee23017b8
Changelog note for change in jQuery CDN default
2014-08-26 16:37:45 +01:00
