Commit Graph

11959 Commits

Author SHA1 Message Date
Daniel O'Connor
222f875c42 Add more coverage of various scenarios and expected behaviours 2015-09-15 12:26:32 +09:30
Daniel O'Connor
dc983d4863 Add more coverage of various scenarios and expected behaviours 2015-09-15 12:24:37 +09:30
Daniel O'Connor
7256c28038 Refactor to a separate class, containing domain logic 2015-09-15 12:13:47 +09:30
Daniel O'Connor
021cb4f93b Use #{ENV['GROWSTUFF_SITE_NAME']} 2015-09-15 11:38:20 +09:30
Daniel O'Connor
83929cc8ee Add the ability to run feature tests via selenium if you configure it, or run specs with GROWSTUFF_CAPYBARA_DRIVER=selenium bundle exec rake spec:features/ 2015-09-15 11:28:30 +09:30
Daniel O'Connor
00ca01dc33 Add coverage of the most basic scenarios around sign up and login 2015-09-15 11:20:33 +09:30
Daniel O'Connor
a49f359f9e Fix minor typo in specs 2015-09-15 10:40:41 +09:30
Daniel O'Connor
be87d2861a Upgrade database cleaner gem, so that https://github.com/DatabaseCleaner/database_cleaner/pull/364 is available to us. 2015-09-15 10:29:29 +09:30
Cesy
481ca79cc1 Merge pull request #825 from sksavant/pr_member_notify
Notify members when mentioned in a post
2015-09-11 11:26:52 +01:00
Savant Krishna
346979c640 Merge remote-tracking branch 'upstream/dev' into pr_member_notify 2015-09-09 21:30:45 -04:00
Mackenzie
ec891fc0b2 Merge pull request #821 from CloCkWeRX/fix_empty_garden
Fix #818 by removing the .thumbnail around the button.
2015-09-09 16:07:02 -04:00
pozorvlak
ef6dd88b1e Merge pull request #820 from CloCkWeRX/fix_popover_better
Fix #819 by removing the popover behaviour for a standard avatar
2015-09-09 20:04:55 +00:00
twconquest
b2f3755196 Additional config fix to point to correct list id 2015-09-09 19:48:35 +00:00
pozorvlak
5884718fd0 Merge pull request #824 from sksavant/member_quicklink_md
Quick links to members in markdown
2015-09-09 17:46:24 +00:00
Savant Krishna
0c315981df Merge remote-tracking branch 'upstream/dev' into member_quicklink_md
Conflicts:
	lib/haml/filters/growstuff_markdown.rb
2015-09-07 20:08:57 -04:00
Savant Krishna
342323e566 Add test for trying to quicklink non-existent @ member 2015-09-07 20:05:24 -04:00
pozorvlak
d7582625c5 Merge pull request #828 from sksavant/csv_planting_fix
Fix bug #827 : Error in generating csv file for plantings with owner filter
2015-09-07 15:40:26 +00:00
pozorvlak
1cb4181ffc Merge pull request #826 from sksavant/escape_crop_link
Fix #721 : Escape quick crop link in markdown
2015-09-07 15:39:43 +00:00
Savant Krishna
9e7a80cb86 Fix bug #827 : Error in generating csv file for plantings with owner filter 2015-09-07 04:01:20 -04:00
Savant Krishna
a8924f95a7 Escape member links for [name](member) and @name using backslash
Change regex to lookforward

When escaping \@name remove \
2015-09-06 05:41:35 -04:00
Savant Krishna
7afd38a1ee Fix #721 : Escape quick crop link in markdown
Lookahead in markdown to verify \ is not present

Test for escaping crop link
2015-09-06 04:20:14 -04:00
Savant Krishna
1908f670d9 Tests for feature #505 : Notifying members when mentioned 2015-09-06 14:41:04 +10:00
Savant Krishna
7ef1eb5852 Create a notification to all members mentioned in a post : Feature #505 2015-09-06 14:41:04 +10:00
Savant Krishna
f36e9d726e Change @ regex to match alphanumeric or _ and modify test string 2015-09-06 14:35:35 +10:00
Savant Krishna
0adb24fa4d Add quick member link help to markdown help 2015-09-06 09:10:18 +10:00
Savant Krishna
aacf7b1f09 Modify regex to include @ in the group 2015-09-05 11:05:53 +10:00
Savant Krishna
b74d89c482 Tests for member quicklinks and @member links 2015-09-04 13:23:10 +10:00
Savant Krishna
3e8f017ad0 Modify markdown to render quick links to members using [name](member) or @name : Feature #504 2015-09-04 12:50:42 +10:00
Cesy
2e45857e1f Merge pull request #823 from jestallin/658_pages_and_links
GS-658 - internationalize header links and some page titles
2015-09-03 10:16:07 +01:00
Jim Stallings
b8b511e747 GS-658 - use yaml anchor for duplicate values 2015-08-30 11:02:47 -04:00
Jim Stallings
85f7ca4058 GS-658 - internationalize drop down links and page titles 2015-08-29 18:39:38 -04:00
Daniel O'Connor
ff779b6679 Trial rendering as comma separated 2015-08-29 07:51:53 +09:30
Daniel O'Connor
f357916779 For more accurate specs, explicitly target the login-name container 2015-08-29 07:49:55 +09:30
pozorvlak
1c4d740217 Merge pull request #822 from cesy/phantomjs
Adding commentary to test for clarification of non-JS version
2015-08-28 13:17:53 +00:00
Cesy
fbb442dfee Adding commentary to test for clarification of non-JS version 2015-08-28 13:00:38 +00:00
Daniel O'Connor
631747e919 Add a trailing sentence. 2015-08-27 15:26:40 +09:30
Daniel O'Connor
ff00b2c985 Fix #818 and layout of show garden page 2015-08-27 15:25:16 +09:30
Daniel O'Connor
a0cdf3a8b2 Fix #818 by removing the .thumbnail around the button. Also rearrange some of the headings (sizing) and controls (add new garden) to be more clearly not a tab. 2015-08-27 15:12:05 +09:30
Daniel O'Connor
c87a5f2d6b Fix #819 by removing the popover behaviour for a standard avatar; and putting the stats onto the card. 2015-08-27 14:35:15 +09:30
Daniel O'Connor
c09b0a0341 Merge branch 'dev' into add_facebook_signup 2015-08-27 12:19:48 +09:30
Daniel O'Connor
8a739b31a1 Minor style 2015-08-27 12:18:09 +09:30
Daniel O'Connor
afec210219 #645 #556 Add facebook links 2015-08-27 12:02:48 +09:30
Daniel O'Connor
dafee90b24 #645 #556 Add facebook auth management 2015-08-27 11:56:37 +09:30
Daniel O'Connor
f6790a5f9b #556 When an avatar is set from an oauth provider, don't encourage the user to update gravatar. 2015-08-27 11:52:49 +09:30
Daniel O'Connor
4983a6dfb3 #556 Improve user avatar sizing 2015-08-27 11:42:36 +09:30
Daniel O'Connor
c4c477fdd8 Merge branch 'add_facebook_signup' into dev 2015-08-27 11:31:07 +09:30
Daniel O'Connor
20b89f0d2f #556 Default to the oauth provided image on account creation 2015-08-27 11:27:15 +09:30
pozorvlak
53ed4f5b24 Merge pull request #810 from cesy/phantomjs
Turn on Phantom JS for all tests
2015-08-26 23:14:43 +00:00
Cesy
3300c303be Merge pull request #817 from CloCkWeRX/add_member_preferred_image
Add member preferred image - not accessible to users yet, prep for pulling from facebook
2015-08-26 10:30:45 +01:00
Daniel O'Connor
e84aaeb56d #509 Refactor the rendering of image_with_popover as well (size is *never* defined, so have defaulted it explicitly to 150) 2015-08-26 10:33:12 +09:30