nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13731 commits 4 branches 0 tags 121 MiB
Commit graph

689 commits

Author SHA1 Message Date
Jonne Haß
8f6ae75423 Merge pull request #4039 from marpo60/diaspora_with_sprites 
Add Sprites to Diaspora!
 2013-03-15 09:44:27 -07:00
Fabián Rodríguez
0a3e242e79 fix reshares in single post-view 2013-03-11 22:45:25 -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
Juan Manuel Azambuja
f429cacd7a [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00
movilla
7a8269ebf3 * Add test for mobile page: Edit profile mobile, Conversations mobile, Getting Started mobile 
* Complete the existing: Post mobile.
* Complete some test for no mobile: Edit profile, Post main.
* Fix little error css and js mobile.
* Add file-upload-custom javascripts to mobile.js.
 2013-03-10 15:02:18 +01:00
movilla
76b1e9b0dc Add the ability to upload photos from the mobile site 2013-02-26 23:25:58 +01:00
movilla
e0d0d0f668 Fixed removing images from publisher on the profile and tags pages 2013-02-21 22:19:24 +01:00
Asphyxia
07ae4e618c Repeated post on stream fails when content is the same 2013-01-31 22:01:09 -03:00
Jonne Haß
baadb49ebf Merge pull request #3844 from asphxia/feature/3672-reshare-alert-box-appearing-twice 
Issue #3672: Reshare alert box is appearing twice
 2013-01-31 11:13:13 -08:00
Jonne Haß
ff10ffe43c update feature to match overriden translation 2013-01-31 19:31:38 +01:00
Asphyxia
1ed0318db7 Reshare alert box is appearing twice 2013-01-31 14:52:47 -03:00
Asphyxia
389e93a3ae Stream form on profile page 2013-01-31 00:15:27 -03:00
Asphyxia
c0dd888e61 Issue #3832: Logged-out users stream options 2013-01-18 15:10:13 -03:00
Fabián Rodríguez
68e39e0393 fix specs 2013-01-16 19:33:20 -02:00
Fabián Rodríguez
aabbea6ee2 fix issue #3671 reshare a post multiple times 2013-01-12 04:52:56 -02:00
Florian Staudacher
ff173e233c add cucumber feature for taking screenshots of important pages 
- for before/after comparisons,
including rake tasks for easily generating the images from command line
 2012-12-17 20:25:34 +01:00
David McMullin
f290bcf169 add tests so it doesn't break again 2012-11-25 17:38:19 +00: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
Fabián Rodríguez
40f5314184 adds password_confirmation field to registration page 2012-10-11 19:45:52 -02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Florian Staudacher
452de1b866 fix remaining cukes and some cleanup 2012-09-17 20:35:38 +02:00
Jonne Haß
58d1448085 update factory girl 2012-09-12 13:24:23 +02:00
Jonne Haß
7ec2f8f419 finish beta striping 
A lot of cleanup is still needed, refactoring the CSS to be consistent, removing all sorts of unused stuff etc
 2012-09-12 07:51:19 +02:00
Jonne Haß
ab0ad630df strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep 2012-09-12 05:48:12 +02:00
Jonne Haß
ffde639f4d Merge branch 'betastrip' of git://github.com/DeadSuperHero/diaspora 2012-09-12 04:55:10 +02:00
Sean Tilley
49ea8c8563 Strip Beta Features 2012-09-11 21:52:53 -05:00
movilla
a564cbff9d New_login_mobile_web_ 2012-09-08 15:30:59 +02:00
Devendra
8325882ea2 Changing cucumber steps to use tabular form where possible 2012-08-22 23:22:10 +05:30
Devendra
94fadaebcb Changing all statements of form "I fill in " to tabular form, helps when there are multiple such statements consecutively. Changed single statements also for clarity and uniformity 2012-08-21 16:41:06 +05:30
Devendra
7b9fcc2b3d merging multiple consecutive "I (should|should not) see" lines into one 2012-08-17 15:37:28 +05:30
Devendra
3d21e89b3b Adding step definitions to facilitate merging of multiple consecutive "I (should|should not) see " clauses on single statement, adding one example as well 2012-08-09 16:00:39 +05:30
Devendra
7c4c11f8d6 Refactored cucumber features, steps, and support helpers for change password feature 2012-08-07 21:23:20 +05:30
Florian Staudacher
038599bf8f update jquery.mentionsInput to latest version 
+ make some tests a little nicer
 2012-07-10 20:37:57 +02:00
Zach Scott
82a47d0ba3 Fixed Issue #3382 - The comments under postings are missing when using the #tags -view 2012-06-18 22:46:01 -06:00
Florian Staudacher
994bfd4a24 fix client-side validations in registration form + test 2012-06-18 18:57:44 +02:00
Florian Staudacher
b184415c19 cleanup session cukes 2012-06-15 19:30:08 +02:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
Maxwell Salzberg
1bcaa5a4bf fix cuke, as canvas-frame is now stream-frame 2012-05-22 22:54:22 -07:00
danielgrippi
64a73fb665 new post types. remove old ones. yeah. 2012-05-21 18:45:01 -07:00
Dennis Collinson
fe0156a18b cuking out new stream, refactors. 2012-05-21 15:14:23 -07:00
Florian Staudacher
9c2c135731 I made a boo boo 2012-05-20 23:09:40 +02:00
Florian Staudacher
67dd49b1e4 ... wait for it ... 2012-05-20 22:44:50 +02:00
Florian Staudacher
9b563e39da fix login cukes 2012-05-19 22:29:12 +02:00
danielgrippi
f4c06c8f88 add rounded buttons to the composer flow; slay multi-photo option 2012-05-18 19:46:51 -07:00
danielgrippi
62ba75ad1b DG DC; Move stuff to second page of framer 2012-05-17 19:02:58 -07:00
Steven Hancock
2ae366ad19 Render invitation email without a layout 
Ideally, we'll probably want to add a layout for this email at some point,
but this simplifies it to the bare minimum and gets rid of the "click here
to change your notification settings" link.

fixes #3270
 2012-05-17 17:51:20 -07:00
danielgrippi
27aff7fb1e DG DC; GREEEEEEEEEN 2012-05-17 17:01:31 -07:00
Dennis Collinson
c66bd9d6d8 fix posting with services, fix cuke 2012-05-17 15:32:35 -07:00
Dennis Collinson
00f1adc8b2 Going back to the composer from the framer is happy via button 2012-05-17 15:32:35 -07:00
Florian Staudacher
fd5aedeb01 updated webmock, hopefully fix cucumber 2012-05-18 00:21:04 +02:00
Maxwell Salzberg
471ce309ea kill your darlings; remove diaspora_client with fire 2012-05-17 14:55:53 -07:00
Maxwell Salzberg
b124d3e5a1 Revert "update factory girl" new version does not support 1.8.7 :( 
This reverts commit c52342b7cb.
 2012-05-16 17:43:56 -07:00
Maxwell Salzberg
c52342b7cb update factory girl 2012-05-16 17:17:14 -07:00
Maxwell Salzberg
9af48d85aa be less strict in asserting post template as not all small frames are .post(which seems weird) 2012-05-14 19:00:25 -07:00
Maxwell Salzberg
06f389231a kill services users with fire. we need this feature, but we need to just start from scratch because this is redonkalonk 2012-05-14 16:25:19 -07:00
Dennis Collinson
ec8625746e add counts to small frame presentercomment out entirity of post_view feature in the hopes it will stop making rake hang 2012-05-12 18:08:45 -07:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts 
Lazily load post interactions on show page
hella refactorz
 2012-05-12 17:41:58 -07:00
Florian Staudacher
9f586e915f well, then let's try the other thing that is suggested on that page to fix cukes 2012-05-10 22:09:31 +02:00
Florian Staudacher
e0e8b47cb4 see, if this fixes those nasty cuke timeouts 2012-05-10 13:57:26 +02:00
Florian Staudacher
4fdb6bd9b7 use post cuke step instead of old skool steps 2012-05-10 00:16:50 +02:00
danielgrippi
5d92d2464b fix email spec; nokogiri needs a top-leve element 2012-05-08 18:21:38 -07:00
Steven Hancock
605b418d42 Reshares delegate nsfw to the root post 
fixes #3120
 2012-05-08 03:20:01 -07:00
Maxwell Salzberg
ddb7c2c9b0 gah attempt tp fix some stupid tests :/ 2012-05-07 23:20:56 -07:00
Maxwell Salzberg
f7205bdf18 sad panda. selenium web driver had to update, and clearly some of the behavior around send_key changed :( 2012-05-07 19:55:42 -07:00
Maxwell Salzberg
4c7e82fec9 derp; find always returns the first element in capybara 2012-05-07 18:56:30 -07:00
Maxwell Salzberg
fcd67ebc77 fix build 2012-05-07 15:55:34 -07:00
danielgrippi
c31413e73c green build = happy dan 2012-05-07 14:30:30 -07:00
Maxwell Salzberg
fa1897112b fix some tests 2012-05-03 20:07:56 -07:00
Florian Staudacher
979eb66e44 added tests for flash messages on reshares 2012-04-27 19:23:30 +02:00
Dennis Collinson
512347cad9 get crunk 2012-04-25 17:02:01 -07:00
Florian Staudacher
c4ccf71dab added debugging cuke steps [ci skip] 2012-04-24 23:11:10 +02:00
Florian Staudacher
390246dde1 temporarily "fix" the evil cuke of inconsistent death 2012-04-24 23:11:10 +02:00
Dennis Collinson
40c04234bd navigate to experimental profile on successful post 2012-04-23 18:08:02 -07:00
Dennis Collinson
062de4c269 MDC DC New Profile shows users info 
Profile show json
Profile backbone model
 2012-04-21 13:12:56 -07:00
Dennis Collinson
d0b7833dba cucumber does not like comments in the Feature section 2012-04-19 16:01:36 -07:00
Dennis Collinson
1938c75478 comment out chubbies till it's a focus. 2012-04-19 15:40:21 -07:00
Dennis Collinson
16223d003f change new publisher to public by default to make testing easier 2012-04-17 16:43:42 -07:00
Dennis Collinson
d767410e6d mentions are clickable in framer 2012-04-11 18:34:12 -07:00
Dennis Collinson
20da08408f can mention in new composer 2012-04-11 17:07:53 -07:00
danielgrippi
a1d4ca9bec Refactor composer and framer to user same layout 
composer touchup; added controls to the bottom; centered input area; removed forms.Base view

Fix tests
 2012-04-10 11:38:35 -07:00
Maxwell Salzberg
62c3a3b350 double wait time to see if travis responds to that, as its not even getting to the ording issue at this point 2012-04-10 11:08:14 -07:00
Maxwell Salzberg
f6b6a67729 this file got renamed 2012-04-10 10:30:52 -07:00
Jonne Haß
79acc2c4cf This doesn't work altogether, fix it yourself [ci skip] 
Revert "ensure that time is always far beyond last post creation"

This reverts commit 749b403d13.

Revert "make Timecop travel persistent for the whole run"

This reverts commit 5d9bdd80ab.

Revert "Timecop post creation for cucumber"

This reverts commit dba3dbbfeb.
 2012-04-10 12:56:25 +02:00
Jonne Haß
749b403d13 ensure that time is always far beyond last post creation 
oh yeah Timecop is really the best solution... hmpf
 2012-04-10 12:32:17 +02:00
Jonne Haß
5d9bdd80ab make Timecop travel persistent for the whole run 
So now we're getting dirty, this wouldn't be necessary with my solution...
 2012-04-10 11:54:06 +02:00
Jonne Haß
dba3dbbfeb Timecop post creation for cucumber 2012-04-09 22:05:22 +02:00
Maxwell Salzberg
e1d86bddcf some tweaks so it fails gracefully on systems that do not have free command 2012-04-05 14:29:41 -07:00
Maxwell Salzberg
21667768aa cucumber should not fail with pending steps :( 2012-04-05 12:49:56 -07:00
Maxwell Salzberg
20fee66eee dont do speedup magic on travis 2012-04-05 12:28:07 -07:00
Maxwell Salzberg
a36d5558db use merge not merge! so we dont create false user objects 2012-04-05 11:42:32 -07:00
Florian Staudacher
90387e83f8 speed up cukes by deferring GC 
-> https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection

this speeds up tests from 9min 47sec to 9min 16sec on my machine
(6% improvement)
 2012-04-05 16:01:58 +02:00
Maxwell Salzberg
d53b7b5f9a fix trumpeter spec 2012-04-04 23:05:41 -07:00
danielgrippi
169fc743d5 update feature to pending outdated assertion 2012-04-04 19:20:00 -07:00
Maxwell Salzberg
875ec11afc Merge pull request #3105 from Raven24/evil-comment-cuke 
refactored show-page comment cuke to be like normal comment cuke
 2012-04-04 12:01:19 -07:00
Maxwell Salzberg
f36e081a04 mark the trumpter mentioning spec wip so travis rake cucumber returns the right response code if it is green 2012-04-04 10:41:13 -07:00
Florian Staudacher
118ae2d657 refactored show-page comment cuke to be like normal comment cuke 2012-04-04 15:23:39 +02:00
Maxwell Salzberg
78146a95d9 try a much longer wait time and see if that makes things pass on travis :*( 2012-04-03 23:03:11 -07:00
Maxwell Salzberg
cf3776fde2 remove webmock from cucumber to try and fix the travis timeout errors :( 2012-04-03 22:16:51 -07:00
Maxwell Salzberg
ef74a06d85 reduce timeout to maybe get cukes to pass 2012-04-03 18:04:08 -07:00