From ea2b249e914e7a998c74fff53c7ff0d4605fdf28 Mon Sep 17 00:00:00 2001 From: laibabasit008 Date: Tue, 9 Jun 2020 18:34:05 +0500 Subject: [PATCH] Overlapping Text Aligned in Email Verification Fixed Text Alignment in Email Verification Aligned Overlapping Text in email Verification --- requirements/prod.txt | 3 +- systers_portal/static/css/style.css | 7 + systers_portal/systers_portal/settings/dev.py | 4 +- .../templates/account/verification_sent.html | 3 +- taan828 | 5206 +++++++++++++++++ 5 files changed, 5219 insertions(+), 4 deletions(-) create mode 100644 taan828 diff --git a/requirements/prod.txt b/requirements/prod.txt index 2cfe1714..717d286d 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -1,4 +1,5 @@ -Django==1.11.6 + +Django==1.11.29 Pillow==4.3.0 django-allauth==0.33.0 django-braces==1.11.0 diff --git a/systers_portal/static/css/style.css b/systers_portal/static/css/style.css index 06dd49e3..70eb2dda 100755 --- a/systers_portal/static/css/style.css +++ b/systers_portal/static/css/style.css @@ -40,6 +40,7 @@ body { bottom: 0; width: 100%; height: 60px; + background-color: #f5f5f5; } @@ -235,6 +236,12 @@ body > .container-fluid { } } +/*Clear for preventing overlapping of divs +-------------------------------------------------- */ +#container{ + margin: auto; + clear:both; +} /* Common: about us, contact -------------------------------------------------- */ diff --git a/systers_portal/systers_portal/settings/dev.py b/systers_portal/systers_portal/settings/dev.py index f41408fe..7e59b423 100644 --- a/systers_portal/systers_portal/settings/dev.py +++ b/systers_portal/systers_portal/settings/dev.py @@ -7,8 +7,8 @@ 'default': { 'ENGINE': 'django.db.backends.postgresql', 'NAME': 'systersdb', - 'USER': '', - 'PASSWORD': '', + 'USER': 'myuser', + 'PASSWORD': '1234', 'HOST': 'localhost', 'PORT': '5432', } diff --git a/systers_portal/templates/account/verification_sent.html b/systers_portal/templates/account/verification_sent.html index e53bd339..af246b5b 100644 --- a/systers_portal/templates/account/verification_sent.html +++ b/systers_portal/templates/account/verification_sent.html @@ -2,7 +2,8 @@ {% block title %} - Verify Your E-mail Address{% endblock %} {% block content %} -
+ +

Verify Your E-mail Address

We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.

diff --git a/taan828 b/taan828 new file mode 100644 index 00000000..faeda42a --- /dev/null +++ b/taan828 @@ -0,0 +1,5206 @@ +commit 6524d08d96820af4fedd473d2a9f4cd187b376b4 +Author: laibabasit008 +Date: Tue Jun 9 18:34:05 2020 +0500 + + Overlapping Text Aligned in Email Verification + + Fixed text alignment in Email Verification + +commit b5b6de93520154ff042a168183fc26680f6780fe +Author: Yash Shah <201851150@iiitvadodara.ac.in> +Date: Wed May 20 23:58:44 2020 +0530 + + left and right margins added to pages (#532) + + * left and right margins added to pages + +commit aa92f97fb0cddede6e16811701b42afa7604e88e +Author: Abhijit Kumar +Date: Wed May 6 23:54:45 2020 +0530 + + styled discussion area after adding date and minimised space occupied by comments (#340) + + Approved by @sammy1997 and @sakshi1499. Reviewed by @poojithansl and @Vaibhavi24. + +commit ef45922fab44f4488d19419bb3cdf61f3080122c +Merge: 7b75f61 f4325f8 +Author: Sombuddha Chakravarty +Date: Tue Apr 28 21:29:20 2020 +0530 + + Merge pull request #525 from arunikayadav42/readme_changes + + Password field not null warning added + +commit f4325f8533c097fa00e60b1175153ca1217daf13 +Author: arunikayadav42 +Date: Tue Apr 28 16:18:39 2020 +0530 + + Password field not null warning added + +commit 7b75f61074aa05b12ac7a70a663ab433fe283e6b +Merge: b4168f3 b6d56fa +Author: Abhijit Kumar +Date: Fri Apr 10 23:33:52 2020 +0530 + + Merge pull request #520 from ritwickraj78/issue4 + + Fixed RSVP Update Issue + +commit b6d56fa984497ddbc9be2d30cba356163358163a +Author: RitwickRaj78 +Date: Thu Apr 9 23:13:54 2020 +0530 + + Fixed RSVP Update Issue + +commit b4168f34be88a86a83653d7555432065ba509298 +Merge: a4e9e9b c6f31ee +Author: Sombuddha Chakravarty +Date: Sun Apr 5 14:28:53 2020 +0530 + + Merge pull request #501 from arunikayadav42/readme + + Added the portal stream link to the readme + +commit a4e9e9bc733cf1bda265a4efc1f90185a7302642 +Merge: d59570b cae2dcf +Author: Sombuddha Chakravarty +Date: Sun Apr 5 14:27:02 2020 +0530 + + Merge pull request #519 from ritwickraj78/issue4 + + Update Database Settings + +commit cae2dcfb7d8f05b926b437b40479de56a791d06a +Author: RitwickRaj78 +Date: Sat Apr 4 14:05:03 2020 +0530 + + Update Database Settings + +commit d59570bde6b75c51e187c1407dc57db53a7e633d +Merge: 76b28fb 31a06d2 +Author: Abhijit Kumar +Date: Sat Apr 4 00:20:38 2020 +0530 + + Merge pull request #507 from ritwickraj78/develop + + Added Image Field To Meetup + +commit 76b28fbdd125c12b429007686c0f80e6ae175bda +Merge: 384bbb6 de78812 +Author: Abhijit Kumar +Date: Sat Apr 4 00:19:19 2020 +0530 + + Merge pull request #518 from ritwickraj78/issue3 + + Fixes Missing Bracket + +commit 31a06d2a1c9ab4e77cf3422a1878cf8fd39a8d39 +Author: RitwickRaj78 +Date: Mon Mar 16 16:40:33 2020 +0530 + + Added Image Field To Meetup and fixed missing brackets + +commit de7881222df910fa4e7cec82015fbca56c716e42 +Author: RitwickRaj78 +Date: Fri Apr 3 23:30:54 2020 +0530 + + Fixed Bracket Issue + +commit 384bbb6ad297eedd2f7d49b60a992fc0470a958b +Merge: beaf172 afa8111 +Author: Abhijit Kumar +Date: Tue Mar 24 15:46:00 2020 +0530 + + Merge pull request #459 from abhishekspeer/issue2 + + Remove frontend glitches, Improve responsive css + +commit beaf172e246408c11ced1504d3cfa552314d5f26 +Merge: 1dcd41d 0531004 +Author: Sombuddha Chakravarty +Date: Tue Mar 24 15:24:58 2020 +0530 + + Merge pull request #515 from anchalg00/develop + + Updating README for setup in Windows + +commit 0531004c1adeb242b3debb5ffff6449b72371de8 +Author: anchalg00 <53042471+anchalg00@users.noreply.github.com> +Date: Mon Mar 23 16:07:44 2020 +0400 + + update-readme-for-windows + +commit c6f31ee886ce5c8f3b5746e4d7be9bbd75494879 +Author: arunikayadav42 +Date: Mon Mar 23 10:29:31 2020 +0530 + + Added zulip stream link to readme. + +commit 1dcd41d93898709238906781c03c1173a4cf9db0 +Merge: cb0731e bde8bf0 +Author: Sombuddha Chakravarty +Date: Mon Mar 23 02:06:02 2020 +0530 + + Merge pull request #514 from BeKingsman/issue4 + + Sign Up replaced by Sign In at login page + +commit cb0731eddeeff8b8c49ccf3b2855c5275b0722e2 +Merge: d59c915 ebe7245 +Author: Sombuddha Chakravarty +Date: Mon Mar 23 02:04:56 2020 +0530 + + Merge pull request #513 from BeKingsman/Branch1 + + Broken Links In README Fixed, fixes #495 + +commit ebe7245047ce60805cd33e96224f7122c66c8af1 +Author: HARSH AGARWAL +Date: Sun Mar 22 22:45:35 2020 +0530 + + fix README links + +commit bde8bf08e291bc4d06f4925bafc32422c2efc2a1 +Author: HARSH AGARWAL +Date: Sun Mar 22 22:03:58 2020 +0530 + + Resolve Sign up issue + +commit afa81118d2aae89d17753dcfbfd23f7cee8a1809 +Author: abhishekspeer +Date: Sat Mar 21 01:53:32 2020 +0530 + + Remove design glitches, improve responsive CSS + +commit d59c9156cb5835d07501cb1260ef59873caf44e2 +Merge: 4ce11c0 0046bc3 +Author: Sombuddha Chakravarty +Date: Thu Mar 19 20:32:25 2020 +0530 + + Merge pull request #461 from abhishekspeer/overlapping_messages + + Changes css, fix overlapping issue + +commit 4ce11c0c134c61269689a4d2a4e0e8cea6120651 +Merge: 5ee18be c759fcd +Author: Sombuddha Chakravarty +Date: Wed Mar 18 19:15:45 2020 +0530 + + Merge pull request #445 from ananyaarun/issue399 + + Corrected links in README.md + +commit 5ee18be47b0c0b251c81515ba82f268101b560c6 +Merge: 8447ed9 3b304bd +Author: Sombuddha Chakravarty +Date: Wed Mar 18 16:35:27 2020 +0530 + + Merge pull request #463 from abhishekspeer/submitissue + + Fixes UPLOAD PICTURE button issue + +commit 3b304bd242eafd3c554b6d1da8f19dfcc1668cdd +Author: abhishekspeer +Date: Wed Mar 18 16:08:29 2020 +0530 + + Unstage changes in test_views + +commit 0046bc32f44c32f1e30de777dc108c3eaff76c89 +Author: abhishekspeer +Date: Tue Mar 17 16:02:42 2020 +0530 + + Unstaged commits + +commit 8447ed9f74262752e06bda34a983a17c27dca972 +Merge: 2bbfdf4 f7d1de8 +Author: Sombuddha Chakravarty +Date: Tue Mar 17 11:27:32 2020 +0530 + + Merge pull request #496 from bismitaguha/update-docs + + Update broken links in CONTRIBUTING.md + +commit 2bbfdf466d344e24a068a7458f621008efaa8441 +Merge: 93e1da7 ea6b290 +Author: Sombuddha Chakravarty +Date: Mon Mar 16 17:52:33 2020 +0530 + + Merge pull request #504 from bismitaguha/update-gitignore + + Update .gitignore to include .vscode/ + +commit f7d1de89a6db969a9641e25db5c17d2f875545cb +Author: Bismita Guha +Date: Mon Mar 16 17:36:55 2020 +0530 + + Update broken-links in CONTRIBUTING.md + +commit 93e1da75c949d6a678f282d41742704211873e44 +Merge: 3ab74af 46735c7 +Author: Sombuddha Chakravarty +Date: Mon Mar 16 17:18:27 2020 +0530 + + Merge pull request #503 from ritwickraj78/develop + + Modified post_test_view scripts and fixed travis CI build. + +commit ea6b290ebed099f1aa9b477c3e512eb6559a452b +Author: Bismita Guha +Date: Mon Mar 16 17:08:36 2020 +0530 + + Update .gitignore to include .vscode/ + +commit 46735c7ab0d03315e5c59f7dc03851aa55928327 +Author: RitwickRaj78 +Date: Mon Mar 16 16:40:33 2020 +0530 + + Modified post_test_view scripts + +commit 3ab74af2e925a76409c50fc5a674fb2c6df2e240 +Merge: 79a4270 0428450 +Author: Abhijit Kumar +Date: Mon Mar 16 11:33:54 2020 +0530 + + Merge pull request #490 from ritwickraj78/develop + + Added postgres as a service and modified test + +commit 04284503ff6336770cb19ed42521e32603ee483b +Author: ritwickraj78 +Date: Wed Mar 11 06:42:32 2020 +0530 + + Added Postgres as a service + +commit 82933a2b2a6f3b2fbd0002a8206abd1e8bc4f402 +Merge: b08d49f 79a4270 +Author: May Burgos +Date: Fri Nov 16 11:51:20 2018 -0500 + + Merge pull request #454 from systers/develop + + updating master + +commit 79a42708de1f2ef556e8ad10bb3b02d501d377d2 +Merge: fd0b1c8 a988f2a +Author: Poojitha Nandigam +Date: Fri Nov 9 10:00:55 2018 -0500 + + Merge pull request #451 from Tlazypanda/migratebootstrap + + Fixes #450 Removed testing error + +commit a988f2ad4526d9d6467077e642d569bfd424be0e +Author: Tlazypanda +Date: Wed Nov 7 05:15:56 2018 +0530 + + Remove testing error + + Remove testing error + + Remove flake8 error + +commit c759fcd9699e81789373923ae895bdc27d4511ae +Author: Ananya Arun <32260628+ananyaarun@users.noreply.github.com> +Date: Fri Aug 24 00:46:20 2018 +0530 + + Corrected links in README.md + +commit fd0b1c87c85ebeaaf3b6e7a4ce00ea082466713b +Merge: 210ee62 2f51160 +Author: Yatna Verma +Date: Thu Aug 9 17:06:03 2018 +0530 + + Merge pull request #442 from abhi20161997/final_search_features + + Added Upcoming meetups page along with search options and filters + +commit 2f51160f956d7bd800831967906eb33788b48fb8 +Merge: 28f559b 210ee62 +Author: Abhijit Kumar +Date: Thu Aug 9 16:52:19 2018 +0530 + + Merge branch 'develop' into final_search_features + +commit 210ee62026174cc10e6a4f7a2e24183af8c6142b +Merge: 6ef8154 e736b56 +Author: Poojitha Nandigam +Date: Thu Aug 9 16:48:49 2018 +0530 + + Merge pull request #440 from abhi20161997/notifications + + Added e-mail notifications + +commit 28f559bd66712162cdaf652c1cc59ab8d8475920 +Merge: 961a710 6ef8154 +Author: Abhijit Kumar +Date: Thu Aug 9 16:41:29 2018 +0530 + + Merge branch 'develop' into final_search_features + +commit e736b5685016f914f7be65fa6ab791b4522addbf +Merge: 75fe4d8 6ef8154 +Author: Abhijit Kumar +Date: Thu Aug 9 16:35:56 2018 +0530 + + Merge branch 'develop' into notifications + +commit 6ef815431d3b76009cc94739449092f7703d6847 +Merge: 6ffa748 7960ced +Author: Yatna Verma +Date: Thu Aug 9 16:28:08 2018 +0530 + + Merge pull request #444 from abhi20161997/last_issue + + Added end date and time field to meetups + +commit 6ffa7481747f5c91a25a35336c51beb6a5637ccc +Merge: 48013a8 03e0aa1 +Author: Poojitha Nandigam +Date: Thu Aug 9 02:55:10 2018 +0530 + + Merge pull request #434 from abhi20161997/oauth + + Enabled Sign Up and Login via Facebook, Google, Github and Twitter + +commit 961a710022300d943946c8e6f6e4398718e3048c +Merge: 64c51be 48013a8 +Author: abhi20161997 +Date: Wed Aug 8 23:41:52 2018 +0530 + + resolved merge conflicts + +commit 7960cedaafdadf541046c9c50dfdb67493f52c54 +Merge: 71655ca 48013a8 +Author: abhi20161997 +Date: Wed Aug 8 23:22:00 2018 +0530 + + resolved merge conflcits + +commit 75fe4d85adf9a497fe640e10360c0e4443ce74ee +Merge: a7cba5f 48013a8 +Author: abhi20161997 +Date: Wed Aug 8 22:22:20 2018 +0530 + + resolved conflicts + +commit 03e0aa11fe008322d9be63ec9bc6859cb5dbae82 +Merge: 91a6d23 48013a8 +Author: Abhijit Kumar +Date: Wed Aug 8 22:54:56 2018 +0530 + + Merge branch 'develop' into oauth + +commit 48013a81e3c3995a19f0255535ac728bb1211cad +Merge: da6f329 75b7d69 +Author: Yatna Verma +Date: Wed Aug 8 19:52:32 2018 +0530 + + Merge pull request #438 from abhi20161997/add_end_date + + Added End Date and ID field to meetups and send them along with Description via the API + +commit da6f329a080ba0f2d5c25d0ef396bd0534c7e15b +Merge: a5ec470 c5b7f9b +Author: Yatna Verma +Date: Wed Aug 8 19:50:51 2018 +0530 + + Merge pull request #436 from abhi20161997/display_username + + Display username on righmost top corner after login + +commit 64c51beef023f7c3796847121f9ba49f688ddcf2 +Author: abhi20161997 +Date: Tue Aug 7 18:33:19 2018 +0530 + + Added Upcoming meetups page along with search options and filters + +commit 91a6d23ae9a120d8efa649abeb624932950c2e1d +Author: abhi20161997 +Date: Sat Jul 21 22:34:01 2018 +0530 + + github,linkedin,facebook,google signup added + +commit 71655ca25d273accf0063da66c88a372db09a4fd +Author: abhi20161997 +Date: Wed Aug 8 04:44:27 2018 +0530 + + Added end date and time field + +commit a7cba5f719fb1c273eb8071e5191c60e5adc6f6d +Author: abhi20161997 +Date: Sun Jul 29 18:52:50 2018 +0530 + + added notifications + +commit 75b7d69bceecf609b000ed0b8b47af9b6d6be7fd +Author: abhi20161997 +Date: Sun Jul 29 04:12:54 2018 +0530 + + Added end_date field to meetups + +commit c5b7f9b8a13e12370456e9738d34ba6489833823 +Author: abhi20161997 +Date: Sun Jul 29 01:50:54 2018 +0530 + + display username after login + +commit a5ec470a9a7a703323ef27e8903196db64a155e5 +Merge: 97f6d94 f914cc2 +Author: Yatna Verma +Date: Sat Jul 21 14:43:37 2018 +0530 + + Merge pull request #428 from abhi20161997/vms_api_documentation + + Added the API_FOR_VMS documentation in the Portal docs. + +commit f914cc23dbee34f97d73827bfac766ab09c20bb9 +Author: Abhijit Kumar +Date: Sat Jul 21 14:05:32 2018 +0530 + + Update api_for_vms.rst + +commit e5ceda8892f6b07bc308a7730c87f89e1c8c8cdc +Author: Abhijit Kumar +Date: Sat Jul 21 14:05:00 2018 +0530 + + Update api_for_vms.rst + +commit 97f6d94e85db07fce69a6f807b23cafbee725ec4 +Merge: afb07ef c62106f +Author: Yatna Verma +Date: Sat Jul 21 14:03:54 2018 +0530 + + Merge pull request #423 from abhi20161997/navbar + + Upgraded navbar as per Branding Guidelines + +commit 821f190028766c8d8d5278dd75709bfd9ec3ccca +Author: Abhijit Kumar +Date: Wed Jul 18 18:38:26 2018 +0530 + + Update api_for_vms.rst + +commit afb07ef22337a12c822391da6718c5260070e8de +Merge: fd9d9f3 5a7a954 +Author: MehaKaushik +Date: Sun Jul 8 19:15:08 2018 +0530 + + Merge pull request #414 from Fenn-CS/add-selenium-tests-community-app + + added automated tests for community app + +commit 1e8bf610ad5e3a342c8daa9a2a71c8f73453d593 +Author: abhi20161997 +Date: Thu Jun 28 22:32:47 2018 +0530 + + added VMS_API documentation to the portal docs + +commit c62106fafecf12442ef0e6c04bffa9fc5a981ef1 +Merge: b6692d5 fd9d9f3 +Author: Yatna Verma +Date: Mon Jul 2 20:49:36 2018 +0530 + + Merge branch 'develop' into navbar + +commit fd9d9f3fef9a1fd0762779165990b14c735d792e +Merge: 897b9f3 20a969c +Author: Poojitha Nandigam +Date: Tue Jun 26 21:56:21 2018 +0530 + + Merge pull request #416 from abhi20161997/apiforvms + + API to communicate with VMS + +commit 897b9f36ae9066d0c37f2bb4158a713512bd2b2b +Merge: 2943851 f8075c7 +Author: Yatna Verma +Date: Tue Jun 26 18:00:21 2018 +0530 + + Merge pull request #417 from abhi20161997/browse_button + + Changed css of browse button to match the general style of the form + +commit b6692d5b791b94d690d0e95a5b697b14ffc9cc06 +Author: abhi20161997 +Date: Tue Jun 26 15:22:13 2018 +0530 + + Upgraded navbar as per UI branding + +commit 20a969ca223ebea0217d29441bb07855446ca29b +Author: abhi20161997 +Date: Mon Jun 11 13:42:09 2018 +0530 + + API to communicate with VMS + +commit f8075c7b036e0e0a446f7b614de5839d2f6f56a5 +Author: abhi20161997 +Date: Sun Jun 17 00:23:39 2018 +0530 + + changed css of browse button + +commit 5a7a954cea5d45ba3b6b11b7f8610382bf84b3b8 +Author: Fenn-25 +Date: Mon Jun 11 16:17:59 2018 +0100 + + added automated tests for community app + + Signed-off-by: Fenn-25 + +commit 2943851e3b074e2b9c4f8327dd1cab523001b4c0 +Merge: 00a6726 030eea9 +Author: Yatna Verma +Date: Fri Jun 8 15:55:22 2018 +0530 + + Merge pull request #388 from abhi20161997/UI_upgrade + + UI upgrade of Systers and about us page + +commit 00a67264dbc882722acdafbfd982b507aac37a17 +Merge: a528398 940e29d +Author: May Burgos +Date: Wed May 30 14:40:15 2018 -0400 + + Merge pull request #401 from Oishika-Pradhan/update-facebook-link + + Update facebook link in contact page + +commit a5283985ed284bbf43eddcda985c285e7570bd6c +Merge: 90cd076 15e2c66 +Author: May Burgos +Date: Wed May 30 14:39:38 2018 -0400 + + Merge pull request #398 from Fenn-CS/add-codacy-config-file + + added empty configuration file codacy + +commit 030eea9877e14375df9f927bee3e3c6f07d76450 +Merge: d148117 8c1df66 +Author: Abhijit Kumar +Date: Wed May 30 23:04:54 2018 +0530 + + Merge branch 'develop' into UI_upgrade + +commit 90cd076e899248ef721771b7d9d8b0b1ab29961e +Author: Fenn-25 +Date: Mon May 28 19:02:07 2018 +0100 + + transfered and rewrote base, login and admin tests from automated testing + + Signed-off-by: Fenn-25 + +commit d148117e58ecd7da23a801a2bbc4428d12101025 +Author: Abhijit +Date: Wed May 16 15:07:57 2018 +0530 + + UI upgrade of Systers and about us page + +commit 8c1df660b87421f90cb269d7989a43d99c32efe6 +Merge: d0372e5 2e07840 +Author: Yatna Verma +Date: Sun May 27 21:57:00 2018 +0530 + + Merge pull request #403 from abhi20161997/favicon_replace + + Replacing the favicon + +commit d0372e5c7e1538afa93f0c95c0447d0d0ab39157 +Merge: 8454cf5 50ecad0 +Author: Yatna Verma +Date: Sun May 27 21:56:31 2018 +0530 + + Merge pull request #405 from abhi20161997/UI_contact_page + + UI upgrade of contact page + +commit 8454cf5df503d821c66c2a88c1577bad0dbfd734 +Author: Fenn-25 +Date: Thu May 24 07:47:16 2018 +0100 + + transfered meetup tests from automated-testing repo + + Signed-off-by: Fenn-25 + +commit 50ecad00c0ee24792bcf76eea323af6920b16f95 +Author: Abhijit +Date: Tue May 22 01:30:54 2018 +0530 + + UI upgrade of contact page + +commit 74595b059e47badc9feb95d1a886e20697099114 +Merge: 0f80c4e b1a9625 +Author: Yatna Verma +Date: Wed May 23 11:18:22 2018 +0530 + + Merge pull request #397 from abhi20161997/UI_community_page + + uprading UI of request_community_form + +commit 2e078403f2a75a3bbc7d764d87dfec3fb85a7b21 +Author: Abhijit +Date: Tue May 22 00:27:44 2018 +0530 + + replace favicon + +commit b1a96257cac5c3daecaccc91931bd071a6c83884 +Author: Abhijit +Date: Sat May 19 23:27:48 2018 +0530 + + uprading UI of request_community_form + +commit 940e29dac581035ff53bfa10a2a9fe4d302d3b81 +Author: Oishika Pradhan +Date: Mon May 21 22:33:46 2018 +0530 + + updates facebook link in contact page + +commit 15e2c665d8c7b1e8d68d3f1414507e3de56dafd2 +Author: Fenn-25 +Date: Sat May 19 20:41:39 2018 +0100 + + added empty configuration file codacy + + Signed-off-by: Fenn-25 + +commit 0f80c4e53da716e4b9d727bfc4dd935df7f300f8 +Merge: a9deb21 82d6e9a +Author: Yatna Verma +Date: Mon May 14 22:42:56 2018 +0530 + + Merge pull request #367 from Fenn-CS/add-request-meetup-to-meetup-dropdown + + added request meetup location to meetup dropdown + +commit a9deb21bfd8ab6aa61e9f62f79c7411954a0510d +Merge: 0109bc9 33bdb36 +Author: Yatna Verma +Date: Mon May 14 22:42:27 2018 +0530 + + Merge pull request #364 from Fenn-CS/add-windows-setup-instructions + + added set up instructions for windows enviroment + +commit 0109bc99482e022b76ffc3a543f55014460515f8 +Merge: d7f02f0 cd5eaad +Author: Yatna Verma +Date: Mon May 14 22:41:11 2018 +0530 + + Merge pull request #353 from abhi20161997/add-newline-preserve + + Enter character is now reflected in comments + +commit d7f02f085866e3aa7a25d1737c60f19a622d3611 +Merge: fea0988 33b7dbd +Author: Yatna Verma +Date: Mon May 14 22:39:54 2018 +0530 + + Merge pull request #361 from ajatprabha/issue_355 + + fix slug regex to accept hyphens + +commit fea098853a3fe14b0d8504b73298ca8fc5ca060f +Author: Fenn-25 +Date: Sat May 5 16:16:52 2018 +0100 + + made common pages responsive on large screens + + Signed-off-by: Fenn-25 + +commit 63c451e882517f6303a3ec55bf5f3569b6bb0a20 +Author: poojitha +Date: Sun May 6 21:37:38 2018 +0530 + + Modifying auth in files + +commit e75e067473a9ddb0326c3191e7809078664f1a51 +Author: poojitha +Date: Sun May 6 16:09:20 2018 +0530 + + Adding Migration files + +commit 41b2fd7eefcf1a0ef4abe450ef07f0b6d5919a80 +Author: sa7i +Date: Wed Feb 28 16:12:10 2018 +0530 + + Adding tests + +commit 1e0f43ab0ae82c217175fc09f0c4b978d8fe5c1b +Author: sa7i +Date: Wed Feb 28 00:07:18 2018 +0530 + + Making changes to templates + +commit 18e2d8c89196f3511953cba0ba227d1102eb1763 +Author: sa7i +Date: Wed Feb 28 00:06:56 2018 +0530 + + Modifying organizers into moderators in forms,views,urls,.. + +commit 77dc95ddbe4559966b1e2b364fbf39e0810cbb37 +Author: sa7i +Date: Tue Feb 27 22:51:37 2018 +0530 + + changes to signals + +commit f0f5123231bc8db7c0ac3d2e4b3364d4d9e00c04 +Author: sa7i +Date: Tue Feb 27 22:42:52 2018 +0530 + + Changing models to accept leader, moderator and member + +commit cda788c73c39a14201aefd4cd47611b459c5bade +Author: sa7i +Date: Tue Feb 27 22:11:31 2018 +0530 + + Adding auth groups into permissions, signals, constants + +commit c6a64814c06323bcd03ec8a5dae9f24e5a50f569 +Author: sa7i +Date: Tue Feb 27 21:55:31 2018 +0530 + + Registering signals + +commit a1ce9d9a451f7ebba45b7c138c3fc9f50aa44dbf +Merge: 4f20a9d 8fc1dc5 +Author: Yatna Verma +Date: Fri Apr 27 23:25:52 2018 +0530 + + Merge pull request #336 from ajatprabha/ticket_333 + + add cancel button for non-approved join request + +commit 82d6e9abc2cab06da1d92d09af8ca36fe5eaf3f8 +Author: Fenn-25 +Date: Tue Apr 24 01:11:26 2018 +0100 + + added request meetup location to meetup dropdown + + Signed-off-by: Fenn-25 + +commit 33bdb362b7ee1ad7b10f8a3468af53bbc78e887a +Author: Fenn-25 +Date: Wed Apr 18 23:04:07 2018 +0100 + + added set up instructions for windows environment + + Signed-off-by: Fenn-25 + +commit 8fc1dc597217eea77bc3c630c058e5f80f9fbeec +Author: Ajat Prabha +Date: Thu Mar 1 19:03:22 2018 +0530 + + add cancel button for non-approved join request + + refactor the code + + add a documented comment + +commit 4f20a9d618790c1ad52bd41058446335376dca1f +Merge: 0b366c2 fcd8468 +Author: Poojitha Nandigam +Date: Wed Mar 28 12:44:47 2018 +0530 + + Merge pull request #352 from sa7i/request-meetups + + Requesting meetups + +commit 0b366c21353b01500bb34ba16aec550ecd82ab9f +Merge: 3d87016 ceb135a +Author: Poojitha Nandigam +Date: Wed Mar 28 12:26:16 2018 +0530 + + Merge pull request #359 from aashutoshrathi/badge + + Fixes #356: Changed PNG badge to SVG + +commit 33b7dbd94c713151193a9f12dd843ac931dbceb4 +Author: Ajat Prabha +Date: Sat Mar 24 12:35:03 2018 +0530 + + fix slug regex to accept hyphens + +commit ceb135a0b322d36fa3c6b29ae6ce02939f405c3c +Author: Aashutosh Rathi +Date: Mon Mar 19 17:25:31 2018 +0530 + + Fixes #356: Changed PNG badge to SVG + +commit cd5eaadbe3648d64e1542925e3ead39113194fe1 +Author: Abhijit +Date: Sun Mar 11 11:31:30 2018 +0530 + + Enter character is now reflected in comments + +commit fcd8468e58aeb0fd0a650941879fc55d4b391df6 +Author: poojitha +Date: Fri Mar 9 22:13:13 2018 +0530 + + fixing codacy issues, coverage, migrations + +commit 6dbb08f7b8ef997a148c04960016d9dd122bc88e +Author: poojitha +Date: Fri Mar 9 22:07:39 2018 +0530 + + Modifying files + +commit 2c877bde905c14bdb996b39bdd6619f6f1775a05 +Author: sa7i +Date: Fri Jan 26 11:28:26 2018 +0530 + + Changes to Templates + +commit 25010eaa922c06d7a8deba91b77387a2b1c71534 +Author: sa7i +Date: Fri Jan 26 11:13:45 2018 +0530 + + Solving flake8 + +commit b29ac9c84cc2d93972f77b13dfa58667da427873 +Author: sa7i +Date: Fri Jan 26 10:36:24 2018 +0530 + + migrations + +commit 2c3dcb74de2ce9cdfd7e0d09f0cc07d0630edb15 +Author: sa7i +Date: Fri Jan 26 10:34:34 2018 +0530 + + templates + +commit 3532e49b15c1b53ccf5fc8eb869c200156cc9ed1 +Author: sa7i +Date: Fri Jan 26 10:31:18 2018 +0530 + + tests + +commit 4d8309226fa68661dc79f71b356e037aca7c90f8 +Author: sa7i +Date: Fri Jan 19 09:29:28 2018 +0530 + + Adding files + +commit 3d870165ad0b93e55c084a2e463bede642ec6ff3 +Merge: 06af496 7294518 +Author: Tapasweni Pathak +Date: Sat Mar 10 11:51:18 2018 -0500 + + Merge branch 'nathalier-iss-231' into develop + +commit 7294518d68c1c22a51e71873d362a303a0b758db +Author: Tapasweni Pathak +Date: Sat Mar 10 11:51:04 2018 -0500 + + Rename few variables + +commit 0ac51280aa9e172ce12d8bb00077851a3c044e3e +Merge: 06af496 2cd90b1 +Author: Tapasweni Pathak +Date: Sat Mar 10 11:44:04 2018 -0500 + + Merge branch 'iss-231' of https://github.com/nathalier/portal into nathalier-iss-231 + +commit 06af4966ebd5420a6568bb9ab009b5f645f445ec +Merge: be197de 09ad09d +Author: Tapasweni Pathak +Date: Sat Mar 10 11:33:11 2018 -0500 + + Merge pull request #350 from sa7i/request-communities + + Requesting communities + +commit be197de7592c0038104ad4f37e224e73c8d77704 +Merge: 330b755 5e5dcdc +Author: Tapasweni Pathak +Date: Sat Mar 10 10:12:36 2018 -0500 + + Merge pull request #335 from imrshu/rv_dev + + Fix User Re-Login on a back button + +commit 330b7553cfbf0834dbbc46dbf12105206208c8be +Merge: f57092a dcd578c +Author: Tapasweni Pathak +Date: Sat Mar 10 10:04:23 2018 -0500 + + Merge branch 'Nik-Khandelwal-Issue-309' into develop + +commit dcd578c8caafe7644e999da8e62a29976e1e719f +Author: Tapasweni Pathak +Date: Sat Mar 10 10:03:59 2018 -0500 + + Fix spelling + +commit d6b62f349fc64e91c4b0a0f420eb116708799d49 +Merge: f57092a 541849f +Author: Tapasweni Pathak +Date: Sat Mar 10 09:58:27 2018 -0500 + + Merge branch 'Issue-309' of https://github.com/Nik-Khandelwal/portal into Nik-Khandelwal-Issue-309 + +commit f57092aeb207572b635c469be46140f4e651d73d +Merge: a38f024 421cf4c +Author: Tapasweni Pathak +Date: Sat Mar 10 09:41:11 2018 -0500 + + Merge branch 'Nik-Khandelwal-Issue-#310' into develop + +commit 421cf4ced0f046e25dee560905dc8f92add56e2e +Author: Nik-Khandelwal +Date: Wed Feb 28 07:03:10 2018 +0530 + + RSVP and Add Support hidden for Past events + +commit a38f024771e2af5a9719e0487c51791d04f7ce8b +Author: Tapasweni Pathak +Date: Sat Mar 10 09:18:06 2018 -0500 + + Only Python 3.6 + +commit c11fd6b533bf74616c241083b4aa99af19c94f4c +Merge: b7c6f95 ca26142 +Author: Tapasweni Pathak +Date: Sat Mar 10 09:15:44 2018 -0500 + + Merge branch 'update-readme' of https://github.com/sa7i/portal into develop + +commit b7c6f952999cb858d7339774e8986806e31001f9 +Merge: 2db1ffc 48cd1fc +Author: Tapasweni Pathak +Date: Sat Mar 10 09:11:18 2018 -0500 + + Merge pull request #319 from systers/Janiceilene-patch-1 + + Fixed broken links + +commit 09ad09d1322100bc3508b83ba2a64654ca051ec1 +Author: poojitha +Date: Fri Mar 9 17:34:24 2018 +0530 + + resolving codacy issues + +commit 938881da369c554f5d36aa438a99d9543ae1181b +Author: poojitha +Date: Fri Mar 9 17:22:40 2018 +0530 + + Removing community requestor group + +commit 1593f312b3e2e7211a652bbae308ad5733c0d408 +Author: sa7i +Date: Sun Feb 25 01:48:10 2018 +0530 + + modifying views and tests + +commit 8370e4d8cd65881e0626a2dccf280d754327b51f +Author: sa7i +Date: Thu Dec 28 03:51:02 2017 +0530 + + Migration file + +commit 4cf21d340b61d49e2fd31bc3bfbea879c6547d77 +Author: sa7i +Date: Thu Dec 28 03:50:26 2017 +0530 + + Template files + +commit 0882fd76f22a7b6d5d5854fb8677d2ef8e60fd25 +Author: sa7i +Date: Thu Dec 28 03:49:02 2017 +0530 + + Adding test files + +commit 7d5f40615e525d60b05b738b1f2aba24743a2f2b +Author: sa7i +Date: Thu Dec 28 03:47:22 2017 +0530 + + Adding community files + +commit 2f600d03da54c68bd06900ea2008ee2de299bc80 +Author: sa7i +Date: Sun Dec 24 21:27:14 2017 +0530 + + Adding Requests + +commit 5e5dcdc8e53a134fc97f1e8e45b2ffdce90ce0a6 +Author: imrshu +Date: Thu Mar 1 16:18:06 2018 +0530 + + Fix back-btn re-login after logout + +commit 541849f182656c2a41433039a97682791ac67478 +Merge: 2c96a3f c1b28b7 +Author: Nikhil Khandelwal +Date: Wed Feb 28 16:23:12 2018 +0530 + + Merge pull request #5 from Nik-Khandelwal/Issue-#309 + + Issue #309 + +commit c1b28b742de80af3ba174bbf62433183a87ac5ab +Merge: deca76a c9d9f0a +Author: Nikhil Khandelwal +Date: Wed Feb 28 16:21:25 2018 +0530 + + Merge pull request #4 from Nik-Khandelwal/Issue#309 + + Tests for messages written + +commit 2c96a3f2cf5fffe8a4064f0061737eeb0189c1d1 +Author: Nik-Khandelwal +Date: Wed Feb 28 11:56:56 2018 +0530 + + Bug Fixes + +commit c9d9f0a9bed253cb26b74636355ece0f2ba30d82 +Author: Nik-Khandelwal +Date: Wed Feb 28 11:38:19 2018 +0530 + + Tests for messages written + +commit deca76a9105329b2d457b5b4ea7980f72437d6f4 +Author: Nik-Khandelwal +Date: Wed Feb 28 10:12:45 2018 +0530 + + Success/Error Messages added on each view + +commit ca26142b6a671ebc4d9e21fbd5173e24dc5edb00 +Author: poojitha +Date: Tue Feb 27 10:54:28 2018 +0530 + + Updating readme after migration + +commit 48cd1fc97b124bd8a052379196e0ea26700054e1 +Author: Janice Niemeir +Date: Mon Feb 26 14:41:00 2018 -0700 + + Fixed broken links + +commit 558217d4b587459aeab2df296735756529d5838c +Merge: 6598011 2db1ffc +Author: Nikhil Khandelwal +Date: Mon Feb 26 12:44:05 2018 +0530 + + Merge pull request #1 from systers/develop + + Update + +commit 2db1ffc1854b5627423e1b76f35e0424249d078c +Merge: 359633b a897df7 +Author: Tapasweni Pathak +Date: Sun Feb 25 20:16:47 2018 +0530 + + Merge pull request #316 from Nik-Khandelwal/issue-#312 + + JoinMeetupLocation Button made visible only to non-members of the meetup. + +commit a897df73a107f7e6160694c6c354799dac209b7f +Author: Nik-Khandelwal +Date: Sun Feb 25 21:08:36 2018 +0530 + + JoinMeetupLocation Button made visible only to non-members + +commit 123125c5aaf4d7079157224a9823a330eb06d1d7 +Author: Nik-Khandelwal +Date: Sun Feb 25 20:43:26 2018 +0530 + + JoinMeetupLocation Button made visible only to non-members + +commit 359633b53dd946b7fbcfaa4a337773cc5cd4389c +Merge: 164a584 642c2b3 +Author: Tapasweni Pathak +Date: Sun Feb 25 20:13:33 2018 +0530 + + Merge pull request #315 from vigzmv/develop + + Fixed Meetup Highlight in navbar and nav dropdown + +commit 164a5846d55ed8bcb4f1827f16077a145635a518 +Merge: 5aa8af0 be0d1e0 +Author: Tapasweni Pathak +Date: Sun Feb 25 20:10:29 2018 +0530 + + Merge pull request #300 from sa7i/RequestMeetups + + Requesting a New Meetup Location + +commit 5aa8af0630901e61b12a72176135641bc4149c72 +Merge: e712a84 0b8ef36 +Author: Tapasweni Pathak +Date: Sun Feb 25 20:06:03 2018 +0530 + + Merge pull request #275 from sa7i/AddNewCommunity + + Add new community by admin + +commit 642c2b3afee067944fc962c1722405b4b375f581 +Author: vigzmv +Date: Sun Feb 25 03:28:36 2018 +0530 + + Fixed Meetup Higlight in navbar and nav dropdown + +commit be0d1e0c9c89c83eb559dc92ed7e163e6f7fb2bc +Author: sa7i +Date: Fri Jan 19 03:13:27 2018 +0530 + + squash + +commit a528c93e9363050d2da8e9392e0ff3f504b85b6a +Author: sa7i +Date: Sun Jan 14 11:14:13 2018 +0530 + + Requesting a New Meetup Location + +commit 0b8ef360d30ce9a4d145f5e9a97e015b1920bb9e +Author: sa7i +Date: Wed Dec 6 00:28:10 2017 +0530 + + Add new community by admin + +commit e712a848baebd218a6f0b6bdb494048d9bd6caea +Merge: f76e0d4 c83a73a +Author: Tapasweni Pathak +Date: Sat Feb 24 20:18:36 2018 +0530 + + Merge pull request #314 from sa7i/same-style-tabs + + Style meetups tabs like in communities + +commit f76e0d472acf3f40fde695d870fb02c4c98d5bb5 +Merge: 6598011 b7eb6a8 +Author: Tapasweni Pathak +Date: Sat Feb 24 20:03:58 2018 +0530 + + Merge pull request #313 from sa7i/main-meetup-location + + Changing add meetup location to Meetups page + +commit c83a73ab17466c7e252d5cb515d4ab094fe50235 +Author: sa7i +Date: Mon Feb 19 18:32:46 2018 +0530 + + Style meetups tabs like in communities + +commit b7eb6a8ac95141ee5c7418dbad3ccc8224b60a0a +Author: sa7i +Date: Mon Feb 19 15:00:54 2018 +0530 + + Changing add meetup location to Meetups page + +commit 659801114df6f2e7be990ffe75541f4da9dcad6a +Merge: 45dc32a 7194d24 +Author: Tapasweni Pathak +Date: Sat Feb 17 20:59:31 2018 +0530 + + Merge pull request #306 from vigzmv/develop + + Highlight current route in navbar and nav dropdown + +commit 7194d24ec7e6f871b72dfc2dc5ef401fb2baf93f +Author: vigzmv +Date: Sat Feb 17 19:07:28 2018 +0530 + + Higlight current route in navbar and nav dropdown + +commit 45dc32a33628af2a2ee0cb459e000ea827e8b041 +Merge: 57325ea c943e1e +Author: Tapasweni Pathak +Date: Sat Feb 17 17:38:13 2018 +0530 + + Merge pull request #284 from sa7i/Upcoming-Meetups + + Upcoming meetups to Meetuplocation list page + +commit 57325ea07e063bdd319bac89d922ff7b244db527 +Merge: 807b753 19aa95b +Author: Tapasweni Pathak +Date: Sat Feb 17 15:55:56 2018 +0530 + + Merge pull request #274 from sa7i/Sharebuttons + + Share buttons for a meetup + +commit 807b753761a6da41845bd5a600b4e2f562a57485 +Merge: c2cd1d4 7c6ca84 +Author: Tapasweni Pathak +Date: Sat Feb 17 15:23:32 2018 +0530 + + Merge pull request #257 from sa7i/migration + + Migrating Portal from django1.7 to 1.11 and upgrading other packages + +commit c2cd1d4baacebd094b9efa7513441de56670bef6 +Merge: 6856f3c 595d198 +Author: Tapasweni Pathak +Date: Sun Feb 4 19:10:26 2018 +0530 + + Merge pull request #303 from systers/Janiceilene-patch-1 + + Update CONTRIBUTING.md + +commit 595d19852160de280fea4ff6e45281c6f42699c7 +Author: Janice Niemeir +Date: Thu Feb 1 14:40:40 2018 -0700 + + Update CONTRIBUTING.md + +commit e47f9af92b45882beba384a6d67b0ece7d026e70 +Author: Janice Niemeir +Date: Thu Feb 1 10:39:54 2018 -0700 + + Update CONTRIBUTING.md + +commit 19aa95bae44b4ee4c63087913abcb5131349b6a2 +Author: sa7i +Date: Tue Dec 5 11:23:16 2017 +0530 + + Share buttons for a meetup + +commit 7c6ca84124c7c0df26b6fe7444ef6388df4918dd +Author: sa7i +Date: Fri Jan 19 04:52:34 2018 +0530 + + Revert "added notifications" + + This reverts commit e81652fcba9a6705f4926bb8089bf92821e03ee6. + +commit 50db45480918e33859f95c9e831071c6309439ca +Author: sa7i +Date: Mon Oct 30 03:36:45 2017 +0530 + + Migrating requirements and travis files + + In this commit, travis is set to use python 3.6 and latest versions are + entered into requirements + +commit 959d1bf11b2b5323e61fe5dc8efa7dcdce4570b7 +Author: sa7i +Date: Sun Oct 29 23:43:03 2017 +0530 + + Migrating portal tests + + In this commit, tests related to blog, common, community, meetup, + membership, users are changed. + + Some of the few changes made are + crispy_forms now uses SampleForm instead of TestForm + 'self.systers_user = SystersUser.objects.get(user=self.user)' is used + instead of 'self.systers_user = SystersUser.objects.get()' inorder to + avoid retrieving multiple objects. + +commit 383f3f31ab3301c4053a499d08b467d7879994b9 +Author: sa7i +Date: Sun Oct 29 23:03:13 2017 +0530 + + Migrating settings,urls,adapter,community/__init__ + + In this commit, Files changed are settings, urls,community/__init__.py and + users/adapter.py + settings files are changed such that it uses the new + TEMPLATE settings.[https://docs.djangoproject.com/en/1.11/ref/templates/upgrading/#the-templates-settings] + + Urls no longer uses patterns + + In users/adapter.py, user=None had to be added to the clean_password after migrating to newer + django_allauth. + + community.signals nolonger works in community/__init__.py so it had to + be removed. + +commit 6856f3c694487aabf49bc87b013e3c73a2fddf34 +Merge: 54e5699 9dc0d8d +Author: Tapasweni Pathak +Date: Thu Dec 28 22:22:15 2017 +0530 + + Merge pull request #283 from payal97/develop + + meetup - gsoc'16 work + +commit 9dc0d8d50aa5000424da28f3d8066f843c55bee5 +Author: payal97 +Date: Wed Dec 20 22:54:22 2017 +0530 + + fixed errors in permission tests + +commit 5e6d536abae42b4c93dcd254e3d8ff29a8b71843 +Author: payal97 +Date: Wed Dec 20 22:46:04 2017 +0530 + + downgrade pinax-notifications and upgrade psycopg2 + +commit 3c723adcab384823357db66414197edf2b3bfa3e +Author: payal97 +Date: Tue Aug 16 18:51:55 2016 +0530 + + completed documentation + +commit afcdc92088291c9af3af4fde34d7df0941c3e178 +Author: payal97 +Date: Tue Aug 16 13:28:06 2016 +0530 + + a user can rsvp for a meetup only once + +commit e81652fcba9a6705f4926bb8089bf92821e03ee6 +Author: payal97 +Date: Tue Aug 9 21:58:33 2016 +0530 + + added notifications + +commit a16533079c9ae27feba3c1f6cb00d343b054caff +Author: payal97 +Date: Mon Dec 11 00:35:32 2017 +0530 + + fixed support request templates and pep8 warnings + +commit 016b1daa2b959aa983f276fc95b1d530099035ba +Author: payal97 +Date: Mon Dec 11 00:28:36 2017 +0530 + + changed permissions and added permission checks to add/remove members and organizers + +commit bb95f6aee80c002ecf7d1fe242bed7be6f905d7d +Author: payal97 +Date: Sun Dec 10 23:49:43 2017 +0530 + + added test for support request model + +commit 2fabee66ddc9273b4a421ffd3fca791d543e6f21 +Author: payal97 +Date: Sun Dec 10 23:40:15 2017 +0530 + + add user who creates a meetup location as member and organizer + +commit 7c65ef285aad368e2e7dc302e2aad223194119d5 +Author: payal97 +Date: Sun Dec 10 23:27:13 2017 +0530 + + added permission checks in meetup views and meetup sidebar + +commit b241b5a18e645415d335d8003ee16a49285be352 +Author: payal97 +Date: Mon Jul 4 22:03:52 2016 +0530 + + moved validation logic of new meetup from model to form + +commit cbf4fd709baa60da6244de6956ce3e946dca97ef +Author: payal97 +Date: Sat Aug 6 11:24:55 2016 +0530 + + added permissions for rsvp and support requests and fixed some errors + +commit c7a3e2c674dc0779369ded737e78552baba1b390 +Author: payal97 +Date: Wed Aug 3 19:55:22 2016 +0530 + + test for rsvp form + +commit a8ff3630f623bbf2a8857882c6403960e5adbaef +Author: payal97 +Date: Sat Jul 30 13:36:22 2016 +0530 + + added support requests + +commit 2d1f0b14e9c10dcbe59266dc6d46e1c8246ddf5a +Author: payal97 +Date: Tue Jul 19 16:00:29 2016 +0530 + + tests for permissions and signals + +commit 1d049ef05e11106adb017430548a93fd6bc32f5c +Author: payal97 +Date: Sun Jul 17 19:55:55 2016 +0530 + + added tests and fixed errors for rsvp + +commit ef9fc02745f2dedc2c468713951d6927fb5919dc +Author: payal97 +Date: Sun Jul 17 15:05:19 2016 +0530 + + Added signals to add/remove permissions when members and organizers are added or removed + +commit 8f97d0c225458661734a6b3bdb6d45ac33aca1b9 +Author: payal97 +Date: Sat Jul 16 15:08:50 2016 +0530 + + fixed errors and added more permissions + +commit ac9c67380cce074b27ed8245861d7df6428328fe +Author: payal97 +Date: Sat Jul 9 17:11:09 2016 +0530 + + fixed rsvp view + +commit c55e04c7007da927524182c6af0871b18671c0b2 +Author: payal97 +Date: Wed Jul 6 13:50:02 2016 +0530 + + added discussion area for meetups + +commit a719529c6d46afb30452c87a68347c0f8cbcfece +Author: payal97 +Date: Sun Jul 3 17:07:41 2016 +0530 + + Added rsvp form, page for list of members going to meetup, signals, constants and utils files + +commit 54e5699379158d51dee64513d9c5a0b5d291e65b +Merge: 85dcc82 8386364 +Author: May Burgos +Date: Thu Dec 14 15:17:44 2017 -0500 + + Merge pull request #285 from systers/Janiceilene-patch-1 + + Create pull_request_template.md + +commit 8386364be416e474068a59ecf35d7a875ea2b78c +Author: Janice Niemeir +Date: Wed Dec 13 16:22:04 2017 -0700 + + Create pull_request_template.md + +commit c943e1e126abc83c2a41dcb94beff67b19cb2f30 +Author: sa7i +Date: Sat Dec 9 22:54:18 2017 +0530 + + Upcoming meetups to Meetuplocation list page + +commit 85dcc8219156cba37db2459af183723e7ddb1b3b +Merge: d27fce9 f554656 +Author: Tapasweni Pathak +Date: Sat Dec 9 20:32:45 2017 +0530 + + Merge pull request #279 from sa7i/Twitter + + Systers Twitter feed on Meetup location list page + +commit d27fce9302d98298f6ea99f91e68cfec459bb6b6 +Merge: 7d31e0f 7d485b0 +Author: Tapasweni Pathak +Date: Sat Dec 9 20:29:02 2017 +0530 + + Merge pull request #281 from systers/Janiceilene-patch-1 + + Create CONTRIBUTING.md + +commit 7d485b0a7dc5a79b4b5fd3d6f27f86ba99fdf191 +Author: Janice Niemeir +Date: Fri Dec 8 14:23:48 2017 -0700 + + Create CONTRIBUTING.md + +commit f5546567f96e241420b5c4f953f657c1f83f886a +Author: sa7i +Date: Fri Dec 8 20:36:10 2017 +0530 + + Systers Twitter feed on Meetup location list page + +commit 7d31e0f117a09d6c72971c1d612984f2fc244790 +Merge: eb136bf e8165d7 +Author: Tapasweni Pathak +Date: Fri Dec 8 08:37:58 2017 +0530 + + Merge pull request #273 from sa7i/MapMarker + + Redirecting Map Marker to a meetup location + +commit eb136bf0861484284e480cf4190c868d3abb0b20 +Merge: 27eefc1 f6849e5 +Author: Tapasweni Pathak +Date: Fri Dec 8 08:32:32 2017 +0530 + + Merge pull request #276 from payal97/develop + + Implemented join requests and added tests + +commit f6849e5b28cff40912f6813892f30d7bbd6491cb +Author: payal97 +Date: Thu Jun 16 18:29:16 2016 +0530 + + Implemented join requests and added tests + +commit 27eefc135210d9f5734a5ef2f50798184a28e2a6 +Author: Janice Niemeir +Date: Tue Dec 5 16:09:46 2017 -0700 + + Create ISSUE_TEMPLATE.md + +commit e8165d73c0b8cecad14af64179fe616acf6d0bc2 +Author: sa7i +Date: Tue Dec 5 10:43:32 2017 +0530 + + Redirecting Map Marker to a meetup location + +commit 5f8d65357263012fb42becd30df08a87f0132ab8 +Merge: 98e69c6 343b47a +Author: Tapasweni Pathak +Date: Sun Dec 3 10:17:03 2017 +0530 + + Merge pull request #262 from payal97/develop + + add, edit and delete meetup locations + +commit 343b47a2f54a21206af85ea811495d66d6522b6c +Author: payal97 +Date: Fri Jun 10 19:05:46 2016 +0530 + + add, edit and delete meetup locations + +commit 98e69c61327c6f9e819287145e6155cbc57c92fd +Author: May Burgos +Date: Wed Nov 8 01:15:02 2017 -0500 + + Create reporting_guidelines.md + +commit 8b4cf75fe1e94ad33be3461648587eb89d424bfa +Author: May Burgos +Date: Wed Nov 8 01:04:20 2017 -0500 + + Create code_of_conduct.md + +commit 2cd90b1157f78ba8f6c4a20b18d684fa6e4124ca +Author: nathalier +Date: Sat Nov 4 01:42:20 2017 +0000 + + Add 'New password must differ from the old one' check + + To esolve the issue ChangePasswordForm was redifined, namely clean_password1() method added. + + Link: https://github.com/systers/portal/issues/231 + +commit 4b3e89f913d9ff09b259b9afffb770ac73dcdd3f +Merge: 95a9577 aa0f813 +Author: Tapasweni Pathak +Date: Wed Nov 1 21:36:53 2017 +0530 + + Merge pull request #185 from payal97/develop + + Add or remove members and organizers to meetup location + +commit 95a95778897ef046f315ef677b6ed90f70826ae4 +Merge: 1f03fcb 0f9679c +Author: Tapasweni Pathak +Date: Tue Oct 31 17:37:46 2017 +0530 + + Merge pull request #253 from sa7i/SignUpAuth + + Authenticating users while signing up + +commit 1f03fcb8e94632d4af9195f86191a5b1e7fd4cb5 +Merge: cfdb0f7 118ea7f +Author: Tapasweni Pathak +Date: Wed Oct 25 07:51:41 2017 +0530 + + Merge pull request #254 from nathalier/contact-us-link + + Add 'contact us' link on verification_sent page + +commit 0f9679cf44e223bfa83871858d7e7e632268e981 +Author: sa7i +Date: Tue Oct 24 22:02:40 2017 +0530 + + Authenticating users while signing up + + Update base.py + +commit 118ea7f21a8384f9df8f469fe60fd033e5ef5b5d +Author: Nathalie Rud +Date: Tue Oct 24 17:06:22 2017 +0100 + + Add 'contact us' link on verification_sent page + +commit cfdb0f7b80fcabd31b86c3121bff77107231591f +Merge: cf7a32f 90624df +Author: Tapasweni Pathak +Date: Mon Oct 23 19:20:53 2017 +0530 + + Merge pull request #252 from nathalier/lost-username + + Save username field on new user creation + +commit cf7a32f683cba002457ebdc4afbaca868ff416e0 +Merge: 59a5c84 a2c90a8 +Author: Tapasweni Pathak +Date: Mon Oct 23 19:19:41 2017 +0530 + + Merge pull request #251 from nathalier/develop + + Always provide all password requirements to user + +commit 90624df2c4aab9ad66752a9f25dfa4432403f84a +Author: Nathalie Rud +Date: Sun Oct 22 19:07:08 2017 +0100 + + Save username field on new user creation + + clean_username() in SystersUserAccountAdapter class did not return any value for valid username. + As a result, proper usernames were ignored and substituted by first part of email address. + +commit a2c90a82c6e77ba8a18263dd2227f2c97396fc0b +Author: Nathalie Rud +Date: Sun Oct 22 18:36:55 2017 +0100 + + Always provide all password requirements to user. + + Before, if user entered password shorter than 6 chars they still weren't provided with full requirements. + + Link: https://github.com/systers/portal/issues/247 + Fixes: a0671e0b9bb7 ("Show all necessary check for password strength") + +commit 59a5c84cff1f6ee73ad3b4c39c67470125ed919a +Merge: 0d793c8 4643d08 +Author: Tapasweni Pathak +Date: Sun Oct 22 15:20:54 2017 +0530 + + Merge pull request #224 from verma-varsha/redirect_screenflow + + Fix #222 Redirect screenflow after sending/cancelling community join request + +commit 0d793c8c7637082fadf9981d0110f15f38bc72ab +Merge: 06cf778 3e673c8 +Author: Tapasweni Pathak +Date: Sun Oct 22 15:08:58 2017 +0530 + + Merge pull request #245 from sa7i/link-tooltip-2 + + 403,404 and 500 Custom Pages added with tooltip + +commit 3e673c8c1949bfa0b207ce17e1e2241a3b94ce5e +Author: sa7i +Date: Sun Oct 22 11:11:41 2017 +0530 + + Show referrer link on back button for error pages + + Modified href using JavaScript to reflect on status bar where the user + got to the error page from. Works for intra-site referrers. + + Refers from external sites are not accessible due to security reasons, + for which the empty string is set as href. + +commit 06cf778ed5eca54303ae4e21fd0d31e2bad3a2ff +Author: Tapasweni Pathak +Date: Sat Oct 21 13:13:22 2017 +0530 + + cleanup plus Travis fix [E501, W291] + +commit ce6417f31397f58722a8ca3ecbaa29cfefc7bcd8 +Merge: 14fae7d a0671e0 +Author: Tapasweni Pathak +Date: Sat Oct 21 13:02:13 2017 +0530 + + Merge pull request #248 from Himanshi-Khandelwal/sixth + + Modified password validation + +commit a0671e0b9bb75905cb14506c6ddb18b1ab70d65b +Author: himanshi +Date: Thu Oct 19 13:16:46 2017 +0530 + + Show all necessary check for password strength + +commit 14fae7db14ec8c1f54cd5c8f9325f5e8ba769712 +Merge: 97f44df bb840d7 +Author: Tapasweni Pathak +Date: Thu Oct 19 05:08:02 2017 +0530 + + Merge pull request #244 from sa7i/meetup_seed + + Seed data for meetups app for testing purposes + +commit bb840d7fa095f412cc0c1aafac976aa48e2bf3e0 +Author: sa7i +Date: Tue Oct 17 21:31:03 2017 +0530 + + Seed data for meetups app for testing purposes + + Adding a set of seed data to fixtures to enable testing systers_portal + meetups app. Work is underway to get a seed script working - but unable + to merge in due to lack of testing features. + + Generated using: + https://gist.github.com/sa7i/9b8e80f8ccb71e96e4b6fd755dba1c5d + +commit 97f44df8379cb0332fae1cc31be17b62752ef5d9 +Merge: 437ae21 a398c6d +Author: Tapasweni Pathak +Date: Sun Oct 15 18:13:04 2017 +0530 + + Merge pull request #238 from ninjakx/develop + + Added Password strength validation + +commit a398c6d0edd910a186b4d9df4f3c27d5009ec504 +Author: ninjakx +Date: Fri Oct 13 20:17:21 2017 +0530 + + Password validation + + password change + + Update adapter.py + + password change + + Update adapter.py + + password change + + Initial commit + + changes made + + changed applied + + changed msges + + final changes + + Update adapter.py + + renamed variables + +commit 437ae21762b90c188d06993da0e99a3e7ccacb82 +Merge: 235cd8f 68349fa +Author: Tapasweni Pathak +Date: Sun Oct 15 06:48:15 2017 +0530 + + Merge pull request #241 from sonakshisaxena1/password_change + + Fixes #209 Links contact page on /accounts/password/change + +commit 68349faa47abbd9d9d3d27fafabeb18f7983c4dc +Author: sonakshisaxena1 +Date: Sat Oct 14 22:55:53 2017 +0530 + + Links contact page on /accounts/password/change + +commit 235cd8ff7a6073402aee648ae18e4d11f8709ece +Merge: 55c6462 15233bc +Author: Tapasweni Pathak +Date: Sat Oct 14 11:55:03 2017 +0530 + + Merge pull request #232 from verma-varsha/embed_google_form + + Fix #206 Embed new community proposal form on new page /propose/newcommunity/ + +commit 15233bcf07da5e43f29c6ba3a4b4df85b40745a4 +Author: verma-varsha +Date: Sat Oct 14 11:35:38 2017 +0530 + + Fix #206 Embed new community proposal form on new page /propose/newcommunity/ + +commit 55c6462098487415c5a367d1cbe757877955c48c +Merge: 8ed9221 a105fc7 +Author: Tapasweni Pathak +Date: Sat Oct 14 11:19:41 2017 +0530 + + Merge pull request #239 from verma-varsha/country_dropdown + + manage.py directory fix + +commit a105fc77290152d41acc390969f417bdcb1d785d +Author: verma-varsha +Date: Sat Oct 14 10:04:12 2017 +0530 + + manage.py directory fix + +commit 8ed9221ebc8c798bf4d3fec7433d1616e0c84fec +Author: Tapasweni Pathak +Date: Thu Oct 12 22:34:34 2017 +0530 + + Add info about label "While Setting up Portal" + +commit fba9c8a69a2889ffac95611e9f66a92d8469391d +Merge: a7c30e3 01693cb +Author: Tapasweni Pathak +Date: Thu Oct 12 18:21:02 2017 +0530 + + Merge pull request #225 from verma-varsha/custom_error_views + + Fix #223 Custom 404, 403, 500 error pages + +commit a7c30e3090c007e82ee74b7657bed9902dea4409 +Merge: 6b1cd82 332492f +Author: Tapasweni Pathak +Date: Thu Oct 12 17:46:48 2017 +0530 + + Merge pull request #229 from verma-varsha/country_dropdown + + Country dropdown values in local dev environment + +commit 6b1cd827862429bc7a35ad3218bc9e39d011f460 +Merge: e999391 a91f4c9 +Author: Tapasweni Pathak +Date: Thu Oct 12 17:34:41 2017 +0530 + + Merge pull request #228 from ninjakx/develop + + Update README.md + +commit 332492fa8fb694e3ac988c505aa347384f4a03b6 +Author: verma-varsha +Date: Wed Oct 11 10:28:35 2017 +0530 + + Country dropdown values in local dev environment + +commit a91f4c99a8e0c39a6518113130020a68130158e8 +Author: ninjakx +Date: Tue Oct 10 23:04:53 2017 +0530 + + Update README.md + +commit 01693cb5492b6bcaddc64e4fde2717ee6b71eb91 +Author: verma-varsha +Date: Mon Oct 9 01:55:57 2017 +0530 + + Custom 404, 403, 500 error pages(back buttons and messages updated) + +commit 4643d083f1b1a4b329d42da4adc1ca3e4b7a714f +Author: verma-varsha +Date: Sun Oct 8 10:16:29 2017 +0530 + + Fix #222 Redirect screenflow after sending/cancelling community join request + +commit e9993913c18864de67dbab34a109cb7deb895cf0 +Author: daminisatya +Date: Mon Mar 7 23:13:50 2016 +0530 + + centered the edit profile page and made the buttons consistent with the page + +commit 968ea26c7b50e2b7386e53642704ca9bf53f2d55 +Merge: f77bb9a c076462 +Author: Tapasweni Pathak +Date: Sat Oct 7 09:59:59 2017 +0530 + + Merge branch 'softcoder32-Community_app_edits' into develop + +commit c076462238fcac161024534c47eac9ee1f88ed11 +Author: Tapasweni Pathak +Date: Sat Oct 7 09:59:20 2017 +0530 + + r/page/Page + +commit c0a11284cf5bd29393fa3c5b864754d6b5ea206f +Merge: f77bb9a 1e690cd +Author: Tapasweni Pathak +Date: Sat Oct 7 09:56:41 2017 +0530 + + Merge branch 'Community_app_edits' of git://github.com/softcoder32/portal into softcoder32-Community_app_edits + +commit f77bb9ae48836d7ee377c8a529299fd2a5aac70f +Author: Tapasweni Pathak +Date: Sat Oct 7 09:54:41 2017 +0530 + + cleanup, remove readme(hurricane) + +commit 5c7d956b78b7b2d859b18e85df742ac1db904a32 +Merge: d5077d4 90e4cfb +Author: Tapasweni Pathak +Date: Sat Oct 7 09:52:29 2017 +0530 + + Merge branch 'Hurricrane-wikiLink' into develop + +commit 90e4cfb19c55988533dcc540863fbad2a0ce88de +Merge: d5077d4 e7f79d1 +Author: Tapasweni Pathak +Date: Sat Oct 7 09:52:13 2017 +0530 + + fix merge conflict + +commit d5077d452c58f897245bc136d732ba524f13d3ac +Author: Tapasweni Pathak +Date: Sat Oct 7 09:38:36 2017 +0530 + + r/br/mt20, remove comment + +commit 30cc94925f30f69c8a4b99dce86c905f53b131df +Merge: 41583ba 9ba644e +Author: Tapasweni Pathak +Date: Sat Oct 7 09:35:28 2017 +0530 + + Merge remote-tracking branch 'prachiagrawal269/email-style-template' into develop + +commit 41583ba7af91d1d291421906092a3fcfcc41c610 +Author: Tapasweni Pathak +Date: Fri Oct 6 22:31:31 2017 +0530 + + r/icon/button in social buttons + adhere with style of the page + +commit e1e5d781c994d75447e25a57556237df9e9ef596 +Merge: 1de28dd c9c747f +Author: Tapasweni Pathak +Date: Fri Oct 6 22:19:08 2017 +0530 + + Merge branch 'develop' of github.com:systers/portal into develop + +commit 1de28dd6e80eb6d38216de9f48d320adb6ac8950 +Merge: 7acf881 1c9f0b9 +Author: Tapasweni Pathak +Date: Fri Oct 6 22:15:52 2017 +0530 + + Merge remote-tracking branch 'prachiagrawal269/colors-adding-to-social-buttons' into develop + +commit c9c747f656bf58269bda6927d278c6c3ab5295c5 +Author: Tapasweni Pathak +Date: Fri Oct 6 21:33:13 2017 +0530 + + r/speak/sneak, closes #221 + +commit a90db4979f28ac3c5a4b241294dfe76e012055da +Merge: 7acf881 dcdeb0b +Author: Tapasweni Pathak +Date: Fri Oct 6 21:11:55 2017 +0530 + + Merge pull request #219 from verma-varsha/contact_link + + Link contact page on /accounts/password/reset/ + +commit dcdeb0bb884a60eadff4cb7584c14da208daa174 +Author: verma-varsha +Date: Mon Oct 2 15:41:22 2017 +0530 + + Link contact page on /accounts/password/reset/ + +commit 7acf8817b3fd6394b7bcad92a20e0def46f1ff02 +Merge: 454a856 b18c4f5 +Author: Tapasweni Pathak +Date: Sun Oct 1 06:57:42 2017 +0530 + + Merge pull request #213 from ankita240796/fix + + Fixed wiki link + +commit b18c4f55daf266e5e9e40c29f94e39c98d7dad0e +Author: Nitish +Date: Sat Sep 30 22:57:13 2017 +0530 + + Fixed wiki link + +commit 454a856a326c43643d54ad92d92f519237af3f57 +Author: Tapasweni Pathak +Date: Sat Sep 30 18:19:24 2017 +0530 + + Update gitignore + +commit 22202ae55c1ed6f9db2fa24b172ddbc490575693 +Author: Tapasweni Pathak +Date: Sat Sep 30 17:22:42 2017 +0530 + + Remove heading for text + +commit 2884e34cef9247a02f9f85c4954e1900a42ba8f5 +Author: Tapasweni Pathak +Date: Sat Sep 30 17:22:04 2017 +0530 + + Add wiki links for Outreachy'15 applicants + +commit cb5835d12e6b0df989a78e0f9892f515ee01dd2a +Author: Namrata Bilurkar +Date: Mon Sep 25 10:39:49 2017 -0400 + + Fixed spelling error in Portal documentation (#204) + + Issue #202 + +commit 2515261b217d2591712f4be5eaef3b80aba0f312 +Merge: 2983e1d 7539d76 +Author: Tapasweni Pathak +Date: Mon Sep 25 18:15:25 2017 +0530 + + Merge pull request #167 from Gayathrimenakath/removedivider + + Removed the unnecessary divider in the community dropdown list + +commit 2983e1da8abdd4f2993c5411f67cfd6e75b17f8a +Author: Tapasweni Pathak +Date: Mon Sep 25 16:49:18 2017 +0530 + + Fix meetup migration dependency + +commit 1eab356f7dc052c483914e626cc05645c5750147 +Merge: 559158f 927ff4f +Author: Tapasweni Pathak +Date: Mon Sep 25 15:41:10 2017 +0530 + + Merge pull request #160 from shriyanka/venue_meetup + + Issue #142: Venue should be char field + +commit 559158f14f87bdc735bcd47f8d47cc5caa201f8b +Merge: 42a9d5e eb1c5b2 +Author: Tapasweni Pathak +Date: Mon Sep 25 12:14:16 2017 +0530 + + closes #156 Merge branch 'smarshy-patch-1' into develop + +commit eb1c5b211d494bebbafc7bc12d5af80dab88abbc +Merge: 42a9d5e 5790582 +Author: Tapasweni Pathak +Date: Mon Sep 25 12:13:58 2017 +0530 + + Add libpq-dev installation instruction [debian] + +commit e7f79d1e651d25487a4de1a041c23658cb3a0194 +Author: Hurricrane +Date: Thu Dec 8 08:44:52 2016 -0500 + + wiki link + +commit 0a2e178388874efeb7b6409ba560419eb030ea9e +Author: Hurricrane +Date: Wed Dec 7 19:26:09 2016 -0500 + + wiki link + +commit aa0f8133d60afa9f1d4dcbe45c75f59091a807b2 +Author: payal97 +Date: Thu Jun 2 23:57:47 2016 +0530 + + Add or remove members and organizers to meetup location + +commit 42a9d5e197b55e7852b32a3b40b759aa7a019dbe +Merge: e26aaef 7e4741e +Author: Ana Balica +Date: Mon Oct 3 21:10:41 2016 +0100 + + Merge pull request #184 from payal97/develop + + Added sponsors to meetup location + +commit 7e4741e3763b8a75e40a6c0419e5100d00352d32 +Author: payal97 +Date: Sat May 28 19:50:20 2016 +0530 + + Added sponsors to meetup location + +commit e26aaef64a444818cf63166f6d16c8c796148f51 +Author: Payal Chaudhary +Date: Sat Jul 16 16:52:03 2016 +0530 + + Meetup location - initial changes (#182) + + * Add links for 'upcoming' and 'past' meetups + + * meetups which occur on the current day will not show up under past meetups + + * While adding a new meetup, time cannot be set to one that has already passed. + + * Fixed time validation while adding meetup + + * Fixed ordering of upcoming and past meetups + + * Meetup Organisers will not show under Members + + * Fixed time validation for adding meetup + + * Modify test for past meetup view + + * Fixed PEP8 warnings + + * Added sponsors field to meetup location + + * Added view for meetup sponsors + + * Template, migrations and test for sponsors field + + * Changed order of meetup urls, updated meetup tests, added 'remove'/'make organiser' buttons + + * Changed meetup sponsors' template + + * Added url and view for removing members from meetup location + + * Made changes to add member to meetup location + + * Fixed PEP8 warnings + + * Added check to see if user bieng added to meetup location is already a member + + * Made changes for making members organizers and removing organizers + + * Added tests for adding/removing member and organizer + + * Add/edit/delete meetup locations + + * Implemented join requests and added tests + + * Fixed tests for forms + + * Fixed tests + + * Added edit meetup location form + + * Added permission checks for members and organizers + + * Added permission checks for organizers and members + + * revert commits from "Added permission checks for organizers and members" to "Added sponsors field to meetup location" + + * moved validation logic of new meetup from model to form + + * moved database queries for displaying members to view + +commit de9abd69e7f36d86c34acacde4be48a9de451f83 +Merge: 8b2a2b2 65c0241 +Author: ana-balica +Date: Sat Apr 23 15:29:57 2016 +0100 + + Merge branch 'develop' of github.com:systers/portal into develop + +commit 8b2a2b25559d3767fb8af4b9dc054fa5e98cce10 +Author: ana-balica +Date: Sat Apr 23 15:29:41 2016 +0100 + + Remove the link to gitter, we moved to Slack + +commit 65c024154d04eaf4bff4e805a8ff099de6a139ae +Merge: eeb03a5 fc59009 +Author: Ana Balica +Date: Sun Apr 10 13:44:09 2016 +0100 + + Merge pull request #176 from payal97/develop + + Included instructions in README for working behind proxy + +commit fc59009111a7efd7df6cef91add9d140f4e4d171 +Author: payal97 +Date: Thu Mar 10 11:55:50 2016 +0530 + + Included instructions for working behind proxy + +commit 1c9f0b95d0aa6b87579c1eec54d8365060258864 +Author: prachiagrawal269 +Date: Wed Mar 9 18:49:58 2016 +0530 + + colors added to social-network-buttons on contact and login page + +commit a781e8b036a07a64af58ad1122032ef5f1f21f87 +Author: prachiagrawal269 +Date: Wed Mar 9 18:45:18 2016 +0530 + + css file changed + +commit 1e690cd64acccc93596b817f3f7136bc48e6e700 +Author: Edelqueen Anyam +Date: Mon Mar 7 20:36:25 2016 +0100 + + added community landing page link to community sidebar + +commit 9ba644e99fe062de86dc0d76b3e278ab86d0bd0d +Author: prachiagrawal269 +Date: Mon Mar 7 20:54:34 2016 +0530 + + email style template added + +commit 5790582304875451f37874a8fda588648c392d22 +Author: vatsala +Date: Mon Mar 7 18:47:30 2016 +0530 + + Modified installation instructions for python3-dev + +commit 7539d761986a9c068555c5d6d7821df93b38564b +Author: Gayathrimenakath +Date: Mon Mar 7 17:49:31 2016 +0530 + + Removed the unnecessary divider in the community dropdown list + +commit 927ff4f5cfba04453c5efb2cfc584e40b14ad7cf +Author: shriyanka +Date: Mon Mar 7 10:31:05 2016 +0530 + + Issue #142: Venue should be char field + +commit eeb03a500c8315fcf16af9268887468782a0aa57 +Author: ana-balica +Date: Sun Mar 6 16:46:50 2016 +0000 + + Squash users app migrations and update deps + + Because we removed django-countries, and previous 2 migrations were + referencing them, we were getting failures. Hopefully now everything + will look better. + +commit 25df94d7a3a9d06709fe5b942d1bd0f1b4335f23 +Merge: d6127e7 5f10bc1 +Author: ana-balica +Date: Sun Mar 6 16:22:59 2016 +0000 + + Merge branch 'rm-django-countries' into develop + +commit 5f10bc10f28e83c44fc4a11a01bcc314d5cce750 +Author: ana-balica +Date: Sun Mar 6 16:21:45 2016 +0000 + + Specify the migration dependency for cities_light with __latest__ + +commit d6127e71a59b60b7d4062f4b1ebf5a93e48ad35f +Merge: 0163392 1dac225 +Author: ana-balica +Date: Sun Mar 6 16:10:46 2016 +0000 + + Merge branch 'travis-env-var' into develop + +commit 1dac2259af19ce3bb61903bc94168c5b9d9b89b4 +Author: ana-balica +Date: Sun Mar 6 16:05:32 2016 +0000 + + Remove notes about SECRET_KEY travis-ci from docs + +commit 65c5df7eb0385ce05916d68161da36004611b19d +Author: ana-balica +Date: Sun Mar 6 16:05:15 2016 +0000 + + Remove secure env var from travis.yml + + It is causing lots of confusion to contributors, since travis is failing when they make a pull request. + +commit 0163392feec157621e51f848f1ba5f981af183f9 +Merge: ac71a9f 7d67b9b +Author: ana-balica +Date: Sun Mar 6 15:40:49 2016 +0000 + + Merge branch 'TransferOwnership' into develop + +commit ac71a9f33ac35836a48ff19e3bb148fcd962322c +Merge: 9fb64da f0f4d4e +Author: Ana Balica +Date: Sun Mar 6 15:30:25 2016 +0000 + + Merge pull request #144 from exploreshaifali/timeformat + + timeformat for add meetup changed + +commit 9fb64da35dcf23c455fe02b0bbc42c81fbc81636 +Author: ana-balica +Date: Sun Mar 6 15:21:45 2016 +0000 + + Fix a test due to base class initializing an extra Meetup object + +commit ad79c51f5aac3a45663e5bee780cc1738debf12e +Merge: 96fcabe 3e65cf2 +Author: ana-balica +Date: Sun Mar 6 15:20:07 2016 +0000 + + Merge branch 'PastMeetups' into develop + +commit baf9dd842048305a50ab82e73f0e2cf7a156cac2 +Author: Kammakomati Damini Satya +Date: Thu Mar 3 11:05:13 2016 +0530 + + Fixes #153 Allows Travis to run without failures + +commit 0194d1ef2af445746486e366e6a95b31559e8553 +Author: iCHAIT +Date: Sun Feb 7 22:05:20 2016 +0530 + + removed django-countries + + Possible fix for #123 + +commit 7d67b9b5d13e983533b4de00a5397c4902461e6d +Author: shriyanka +Date: Sun Jan 3 14:11:00 2016 +0530 + + Fixing issue #126: add a url to Transfer ownership on user profile + +commit 96fcabe23d18bd4fa8ce07bab38aa9b4a23948ac +Merge: d2070ca a748341 +Author: ana-balica +Date: Sat Dec 5 19:40:46 2015 +0000 + + Merge branch 'UpcomingMeetup' into develop + +commit a74834140354fef9b1530715f3551a93f6ecfef9 +Author: ana-balica +Date: Sat Dec 5 19:25:38 2015 +0000 + + Style upcoming meetups page + +commit f0f4d4e64903e5a60d8d98c13b3bb36bff5c4cf6 +Author: Shaifali Agrawal +Date: Sat Aug 22 16:41:42 2015 +0530 + + time format displayed in 24 hour fomat + +commit d2070ca6a27bbc4dbccd4b8fbe463666167208cc +Author: ana-balica +Date: Sat Aug 22 11:50:43 2015 +0100 + + Add missing space + +commit 39dc6cf98f38ae24b2705734a2e7f5bdc944b596 +Author: Shaifali Agrawal +Date: Fri Aug 14 11:20:41 2015 +0530 + + Test edit meetup view + +commit 357dff75041e3cd3f5a923f8afc1f33567ae697c +Author: Shaifali Agrawal +Date: Fri Aug 14 11:20:25 2015 +0530 + + Test edit meetup form + +commit 185ffb8fd535ee38b45931ef76068e260798b63d +Author: Shaifali Agrawal +Date: Fri Aug 14 11:19:56 2015 +0530 + + Template to edit meetup + +commit 113c6a50f58dfe36cbb1d3161337804b00fdd8ca +Author: Shaifali Agrawal +Date: Fri Aug 14 11:19:28 2015 +0530 + + form to edit meetup + +commit 8229a326dd3b3c2d0e6277da9d9af404c13b6a22 +Author: Shaifali Agrawal +Date: Fri Aug 14 11:19:11 2015 +0530 + + EditView to edit meetup + +commit 2f2f076c0e928c2ad7453c690215b25d43e5f749 +Author: Shaifali Agrawal +Date: Fri Aug 14 11:18:55 2015 +0530 + + url to edit meetup + +commit d64fab8b9e481c5929a0860a8dc78124d0c0cb25 +Author: ana-balica +Date: Sat Aug 22 11:36:35 2015 +0100 + + Small template fixes + +commit 359693c3259b48c85fcabde63fee0dd5143e9a7a +Author: Shaifali Agrawal +Date: Wed Aug 19 03:34:15 2015 +0530 + + meetup location sidebar snippet in base template + +commit 3959ddae279eedb87eae7064d37329cc96f2434e +Author: Shaifali Agrawal +Date: Wed Aug 19 03:33:38 2015 +0530 + + separate template snippet for meetup location actions + +commit a0437eefbe81a7749e14200aaa81e642802fa9e0 +Author: Shaifali Agrawal +Date: Sun Aug 16 16:57:41 2015 +0530 + + Add and Delete Meetup link in sidebar + +commit 9c438c3399c26f4b4391ff1387cda018dcbce503 +Author: Shaifali Agrawal +Date: Sun Aug 16 16:54:36 2015 +0530 + + user login check to show meetup location actions in sidebar + +commit 4524362fb8b7046827e9779975733f33a396efee +Author: Shaifali Agrawal +Date: Tue Aug 18 17:33:06 2015 +0530 + + documented meetup architecture + +commit dbd356c27340a0702b15bbc3d85d599c47ac4ac4 +Author: ana-balica +Date: Sat Aug 22 10:25:07 2015 +0100 + + Create a simple test for Rsvp model string representation + +commit 56f386c25f7c455c09a734e7685761922ea6d91b +Author: ana-balica +Date: Sat Aug 22 10:24:39 2015 +0100 + + Adjust Rsvp model string representation + +commit 1c780155ae651b8bfa8b0aa9e29a1c0292642cdd +Author: Shaifali Agrawal +Date: Fri Aug 14 13:51:07 2015 +0530 + + Rsvp model registered to admin + +commit 38904afd8f185082bb835d150b1fe6bfb80644c4 +Author: Shaifali Agrawal +Date: Fri Aug 14 13:50:41 2015 +0530 + + migrations for RSVP model + +commit f31c1391488b530d8a645fcc3fe591cea0f0027b +Author: Shaifali Agrawal +Date: Fri Aug 14 13:47:05 2015 +0530 + + Model for RSVP + +commit 3e65cf2ac37634af5a69547c8a20ab2cce417273 +Author: Shaifali Agrawal +Date: Sun Aug 16 13:29:05 2015 +0530 + + past meetup list view test + +commit aa31fcf86742a4c23c949a8b89e9d5b2e5474b9d +Author: Shaifali Agrawal +Date: Sun Aug 16 12:40:45 2015 +0530 + + past meetups list template + +commit 3ee9bd316f8ccdc1f9f1a8de9309b640768f4998 +Author: Shaifali Agrawal +Date: Sat Aug 15 20:38:18 2015 +0530 + + Test for upcoming meetups list view + +commit c12620975b86f647633d41ec71478e9be2652689 +Author: Shaifali Agrawal +Date: Sat Aug 15 19:44:35 2015 +0530 + + base template modified for pagination + +commit 33bf3c3b04220ed14484fe1da64872a181120d80 +Author: Shaifali Agrawal +Date: Thu Aug 13 01:07:05 2015 +0530 + + template to add upcoming meetups + +commit eec56d1cb3d36b85f826d005b137a9a2464735c6 +Author: Shaifali Agrawal +Date: Sun Aug 16 12:39:58 2015 +0530 + + past meetups list view + +commit e7792dac2f60506c9808b56cb59afb6dc1bfbb40 +Author: Shaifali Agrawal +Date: Sun Aug 16 12:39:13 2015 +0530 + + past meetups list url + +commit 5c927743cc799aa3bc4975fc3751f2707d643cfc +Author: Shaifali Agrawal +Date: Thu Aug 13 01:06:41 2015 +0530 + + url to show upcoming meetups + +commit 2ee8b7c09705a6a8719f2654734dfaa938a56a46 +Author: Shaifali Agrawal +Date: Thu Aug 13 01:06:22 2015 +0530 + + view to show upcoming meetups + +commit 64013b90fbf432c426af1f87857e7265f7dc20ea +Author: Shaifali Agrawal +Date: Wed Aug 12 19:26:03 2015 +0530 + + Test of DeleteView to delete meetup + +commit ac2b7e2a09421ba43ff97f60b28d98a9a75826ac +Author: Shaifali Agrawal +Date: Wed Aug 12 19:25:27 2015 +0530 + + Template to delete meetup + +commit 120c4df7afa5061f4a66f65293c9e3d0f5d34dbf +Author: Shaifali Agrawal +Date: Wed Aug 12 19:24:57 2015 +0530 + + DeleteView to delete meetup + +commit 2b217168f9663da4bcea43234deae6ebb97d010a +Author: Shaifali Agrawal +Date: Wed Aug 12 19:24:36 2015 +0530 + + url for delete meetup + +commit c8103a65504c99837fd68765a35817b824040852 +Author: Shaifali Agrawal +Date: Sat Aug 15 01:46:28 2015 +0530 + + Modified url patterns to accept "-". + +commit 349a4638538b13616494172ccaf484dbcd99bf5b +Author: Shaifali Agrawal +Date: Sat Aug 15 01:43:19 2015 +0530 + + Add Meetup link working + +commit a857bca94c1c0e7403152312f53a4874ca051e71 +Author: Shaifali Agrawal +Date: Wed Aug 12 14:31:10 2015 +0530 + + Meetup Location button added in base template of portal + +commit 337b5e1d4ff356612cc6722557bca1855f69a213 +Author: Shaifali Agrawal +Date: Wed Aug 12 14:52:18 2015 +0530 + + Members link is added to base template of meetups. + +commit 66508adbc05e4dee1dcf47173435f3e7ded63210 +Author: Shaifali Agrawal +Date: Mon Aug 3 03:44:49 2015 +0530 + + Add Meetup Form test + +commit be9b08b4a9f61f46fc61efdfe189f6c37175366c +Author: Shaifali Agrawal +Date: Mon Aug 3 03:44:34 2015 +0530 + + Add Meetup View test + +commit 1cdcc512748ce794fd7751e00febb9b2f894a344 +Author: Shaifali Agrawal +Date: Mon Aug 3 03:23:52 2015 +0530 + + Add Meetup template + +commit 8a34b3ecb38aef0c59734072ffce851007958202 +Author: Shaifali Agrawal +Date: Mon Aug 3 03:21:43 2015 +0530 + + CSS and js for timepicker + +commit 230a77ad70ac734b034b7f70e064c5c054d87421 +Author: Shaifali Agrawal +Date: Mon Aug 3 03:20:27 2015 +0530 + + CSS and js for datepicker + +commit d8053f7e56318410efc7e91c9d87a71cf4c7ac33 +Author: Shaifali Agrawal +Date: Mon Aug 3 03:18:45 2015 +0530 + + Add Meetup form + +commit fc716d2b894c66c4bde2ab82c7035710e02afbf4 +Author: Shaifali Agrawal +Date: Mon Aug 3 03:17:43 2015 +0530 + + Add Meetup view + +commit c194fd38e3e7ad1ab6758951d04359e2f7ff88a0 +Author: Shaifali Agrawal +Date: Mon Aug 3 03:16:38 2015 +0530 + + Add Meetup url + +commit a48f335da48b06522f27d746b5907195445bc725 +Author: Shaifali Agrawal +Date: Thu Jul 30 15:06:15 2015 +0530 + + using imagekit django app to remove image squashing problem + +commit 117adf62263c0c8c2ffc652bc775d6868d4b915b +Author: Shaifali Agrawal +Date: Thu Jul 9 03:03:06 2015 +0530 + + Template snippet to show user image + +commit 2f64761cae7204ad120bf3a6bfa41e00c73befb0 +Author: Shaifali Agrawal +Date: Wed Jun 24 03:37:25 2015 +0530 + + Template for members of meetup location + +commit 7d2473dcf5674c9d1d3f5e2f67f54de417d915b3 +Author: Shaifali Agrawal +Date: Wed Jun 24 03:35:12 2015 +0530 + + CSS for image grid + +commit b78aa12e33973680aaa8bd70cb9c57cab6e0c7ba +Author: Shaifali Agrawal +Date: Wed Jun 24 03:34:13 2015 +0530 + + Default image for those who have not uploaded profile picture + +commit bc78fc9b0da1810eb677515db479630c37f9005a +Author: Shaifali Agrawal +Date: Thu Jun 18 13:43:25 2015 +0530 + + Test for members view of meetup location + +commit 0fd67ef92fa73fbbf1b31c6d80c8cc3f95f7de70 +Author: Shaifali Agrawal +Date: Thu Jun 18 13:39:23 2015 +0530 + + view for Members of meetup location + +commit 258fcd2a45ba3fedebc69896a343761b9d06f785 +Author: Shaifali Agrawal +Date: Thu Jun 18 13:37:47 2015 +0530 + + url for meetup location Members + +commit b51b1cdd0d978ddc9089f71f5f2cc93735bb8e3a +Author: Shaifali Agrawal +Date: Sun Jul 12 01:08:33 2015 +0530 + + Meetup Page view test + +commit 4da300fefa13e5de6480cbe1275ae8cb6dd95770 +Author: Shaifali Agrawal +Date: Sun Jul 12 00:02:50 2015 +0530 + + Meetup Page template and CSS + +commit 4a458ed4b10a43ff4993007bb426dccac7452b73 +Author: Shaifali Agrawal +Date: Sat Jul 11 23:48:45 2015 +0530 + + Meetup Page View + +commit 272fe49be0365148462cc1f4c39d59b0693ae808 +Author: Shaifali Agrawal +Date: Sat Jul 11 23:45:04 2015 +0530 + + Meetup Page url + +commit 176e0de022fcb9cfa4b3da7aab2d30a81cc6a517 +Author: Shaifali Agrawal +Date: Wed Jul 15 01:06:09 2015 +0530 + + Meetup Location list view test + +commit d4f3ca8f9397e4e8245258b76c23296ade5e09f3 +Author: Shaifali Agrawal +Date: Wed Jul 15 01:05:46 2015 +0530 + + Meetup Locations map template snippet + +commit 005a4bd70db8383295fbaa8f4987f86843dc3c3b +Author: Shaifali Agrawal +Date: Wed Jul 15 00:04:39 2015 +0530 + + Meetup Location list template + +commit 701cf0b2944b5e16880f883b44cdbe68cc50f667 +Author: Shaifali Agrawal +Date: Wed Jul 15 16:47:55 2015 +0530 + + Meetup Locations grid template snippet + +commit f3b54bbba2ffb9056012c7a187d426bcc4e47cad +Author: Shaifali Agrawal +Date: Tue Jul 14 14:22:27 2015 +0530 + + MeetupLocation list view + +commit 5ebfc746849b8821fa9e1117b7c0cb4d63165fbb +Author: Shaifali Agrawal +Date: Tue Jul 14 11:50:40 2015 +0530 + + MeetupLocation list url + +commit ce103a7cf191fd8c653d02e315785f6ca02f7bc8 +Author: Shaifali Agrawal +Date: Sat Jul 4 18:25:07 2015 +0530 + + views test modified to test get_meetup_location method in AboutView + +commit 957cfee51fd1025dfc3bad5f777c985b2924c61a +Author: Shaifali Agrawal +Date: Sat Jul 4 18:21:07 2015 +0530 + + Test for meetup location mixins + +commit 8bfef0147110830490cb5d9d4faaad84534ea0aa +Author: Shaifali Agrawal +Date: Sat Jul 4 14:34:55 2015 +0530 + + Meetup Location AboutView using mixin to fetch MeetupLocation instance. + +commit c6de4f077e2778dfcdb9596235e74f07a4a3cac2 +Author: Shaifali Agrawal +Date: Sat Jul 4 14:34:06 2015 +0530 + + Meetup Location templates modified to use meetup_location came using mixin rather than istance from DetailView + +commit a7691629d0f8ad2d56ab7d911c78f2cb94d111a7 +Author: Shaifali Agrawal +Date: Sat Jul 4 14:31:20 2015 +0530 + + mixin to add meetup location object + +commit 3a010b316c5719a1fa50a10c4de6e028dedc28cd +Author: Shaifali Agrawal +Date: Mon Jun 22 18:22:17 2015 +0530 + + Test for meetup model + +commit 15ad55278f56df40472bba36c5866eb5c4950717 +Author: Shaifali Agrawal +Date: Mon Jun 22 18:21:54 2015 +0530 + + meetup model registered to admin + +commit 46f3b6c1b6e19aec223a15d0f621c20837aeb3bd +Author: Shaifali Agrawal +Date: Mon Jun 22 18:07:47 2015 +0530 + + meetup model + +commit 21b100603200c13a14e4b23758548952d37182c7 +Author: Shaifali Agrawal +Date: Fri Jun 19 17:46:43 2015 +0530 + + Join button with sidebar snippet for meetup location + +commit d5e1a8666a0ba5c6098a9e8cabe94a743ddf513f +Author: Shaifali Agrawal +Date: Fri Jun 19 17:45:33 2015 +0530 + + About button with sidebar snippet for meetup location + +commit 7e466762fa6b17c58fbacf54733c6819861ecb57 +Author: Shaifali Agrawal +Date: Thu Jun 18 00:08:35 2015 +0530 + + CSS styles added for meetup location about page + +commit f6c5ee93285b53c5cc93eea87eb74326a112a1bf +Author: Shaifali Agrawal +Date: Wed Jun 17 19:22:51 2015 +0530 + + Test for AboutView of meetup location + +commit 8285850c6a2f24f7bc83637b87522305c9a68999 +Author: Shaifali Agrawal +Date: Wed Jun 17 19:07:30 2015 +0530 + + about page template for meetup location + +commit 6fbebbf5ab4f67a8505d03ed7a4f1e2ee99ea500 +Author: Shaifali Agrawal +Date: Wed Jun 17 19:07:03 2015 +0530 + + Meetup Location sidebar snippet + +commit ea015d2f9622e1d0913b0d9f87372d162d2c0362 +Author: Shaifali Agrawal +Date: Wed Jun 17 19:06:37 2015 +0530 + + Meetup Location base template + +commit e1cd79f786a72095275b45630924c960de19cdd8 +Author: Shaifali Agrawal +Date: Wed Jun 17 15:25:19 2015 +0530 + + Meetup Location AboutView + +commit aba686723ef5e383534795b3d3073d31c0d33e45 +Author: Shaifali Agrawal +Date: Wed Jun 17 15:23:50 2015 +0530 + + about url for meetup locations + +commit bdac5ecd128a7944e30eab2988e35bb2b3fc4ccf +Author: Shaifali Agrawal +Date: Wed Jun 17 15:21:54 2015 +0530 + + Meetup Location urls included in portal urls + +commit a0848439624ee9f25119377cc4537e505211eeb0 +Author: Carol Willing +Date: Mon Jun 15 20:33:54 2015 -0700 + + Update Docker installation directions + +commit 259527c0eb2cc7d8fbf8f1fa08296f494d7a762b +Author: ana-balica +Date: Fri Jun 12 19:24:30 2015 +0300 + + change max line length to 100 chars + +commit 672ee84015ffc63a928a9d298f31a6c31d73a132 +Author: Shaifali Agrawal +Date: Mon Jun 8 22:42:06 2015 +0530 + + meetup migration fix for cities_light package. + +commit 2c321eea8557ac5892eacd3d4dda41fb7b26b5c0 +Author: Shaifali Agrawal +Date: Mon Jun 8 04:13:46 2015 +0530 + + MeetupLocation model registered to admin. + Updated requirement.txt with django_cities_light. + +commit 0cd4cea7e04451d9c9ab4e8dd00440c226a621de +Author: Shaifali Agrawal +Date: Mon Jun 8 04:08:28 2015 +0530 + + Test for MeetupLocation model. + +commit 3d5c6498463a87a2cd765b15a6c4cc6dec8497f5 +Author: Shaifali Agrawal +Date: Mon Jun 8 03:33:23 2015 +0530 + + Model for MeetupLocation added, and removed unused files. + +commit acd226d0802511b44e0e4a3e52ace33698e90057 +Author: Shaifali Agrawal +Date: Mon Jun 8 03:14:12 2015 +0530 + + Meetup app added. + +commit a10804a74660774bb98ae26fd58470f7994f89f2 +Author: Carol Willing +Date: Wed Jun 10 20:08:41 2015 -0700 + + Update README.md to note that fig is deprecated. + + This commit partially fix to the outstanding fig issue. + +commit e124a61872a59bee02559d6f8daf5aad0968bde3 +Author: ana-balica +Date: Sat May 23 13:11:33 2015 +0300 + + upgrade several packages + +commit 2e68d414f40e90c7df96e1e6b6bbbe292c3b9387 +Author: ana-balica +Date: Fri May 22 16:12:27 2015 +0300 + + remove the import from signals + +commit 2f179e424da117ca417a403b8b7476021a54a4aa +Author: ana-balica +Date: Fri May 22 16:10:59 2015 +0300 + + remove null from ManyToManyField + +commit e24a390a1f2d743ea45b0218f6e056d179246646 +Author: ana-balica +Date: Fri May 22 14:47:31 2015 +0300 + + add unique_together constraints to CommunityPage, News and Resource models + +commit db60f49c978d55bade51534e0bd334a861c0a3b5 +Author: ana-balica +Date: Fri May 22 14:46:58 2015 +0300 + + rearrange fields in AddCommunityPageForm model form + +commit 3e407c74c4eeecad9d95c97bd8725deec3ef57f2 +Author: ana-balica +Date: Fri May 22 14:46:36 2015 +0300 + + fix the CommunityPageView to get the page according to the community as well + +commit c79c94c60a9c9dd42f7646b539928181435f1df6 +Author: ana-balica +Date: Tue May 5 15:17:34 2015 +0200 + + fix getting News and Resource objects in the view + +commit 0c6aa955de718946d48e091f59f52f495f799224 +Author: ana-balica +Date: Tue May 5 15:02:54 2015 +0200 + + modify Post and CommunityPage models + + remove the unique requirement for slug and order (those should be checked against the community objects, not the whole table) + +commit a0a9347029b45e6621d2d899191cd59e80984cc8 +Author: ana-balica +Date: Tue May 5 12:57:17 2015 +0200 + + fix CSS class name for share buttons for posts + +commit 1063785f5b1e5be56c259badb80af7fe0a015fbd +Author: ana-balica +Date: Mon Apr 20 14:34:17 2015 +0200 + + fix a command from README + +commit 5522e0eaae08a5ad6ab23f7ea3ce61e8f5d39d4e +Author: ana-balica +Date: Mon Apr 20 14:31:16 2015 +0200 + + show page actions even when there are no community pages created + +commit 41466e61b04587b25c2f7d1f2ec65c842c085137 +Author: ana-balica +Date: Mon Apr 20 12:23:58 2015 +0200 + + ignore staticfiles after running collectstatic + +commit 050e2086c384c50feda676096efb6d6171945bec +Author: ana-balica +Date: Mon Apr 20 12:23:39 2015 +0200 + + allow community slugs to have "-" symbol + +commit a4305dfff4d171ffff8c44e71c2c61bf5c4b4ff0 +Author: Shaifali Agrawal +Date: Thu Apr 2 21:36:57 2015 +0530 + + Update README - python3-dev is required. + +commit 6335484a376daf924702593bca94f2a9be218c88 +Author: ana-balica +Date: Thu Apr 2 20:26:11 2015 +0530 + + make 100% width for default ckeditor widget + +commit 798b620fc2cb4f8d2d26e42a0aa718b696a7acf6 +Author: ana-balica +Date: Thu Apr 2 20:25:35 2015 +0530 + + change the permissions (from staff to logged in) for file browsing and uploading + +commit eac93dae9d44b1aa445d5afafbdf13f457d7efea +Author: ana-balica +Date: Thu Apr 2 20:25:06 2015 +0530 + + remove django-wysiwyg + + Use django-ckeditor also for non-admin views using {{ form.media }} tag in templates. + +commit 3b68a6f91bece819af43620550c6e41f7a9c8e49 +Author: ana-balica +Date: Tue Mar 31 19:54:10 2015 +0530 + + use order-agnostic assertCountEqual instead of assertSequenceEqual + +commit 911efb2f2ec45cb8e043eb6071996a0880f5049a +Author: ana-balica +Date: Tue Mar 31 19:37:50 2015 +0530 + + add social buttons via sharethis + +commit bac4e33ac2ffb8179a459eefe6c23ef2bfac8f2e +Author: ana-balica +Date: Tue Mar 31 19:32:44 2015 +0530 + + fix tags to be spans and not links + +commit 9e911fffb13880e499b596a246819837d5141059 +Author: ana-balica +Date: Tue Mar 31 18:42:37 2015 +0530 + + update packages + +commit 02a76a84320afc2c6570e554d5d7714f94c9dcc7 +Author: ana-balica +Date: Thu Mar 19 23:08:14 2015 +0530 + + send travis build to a container + +commit 48f07dd256614aacf74cd6dd16f2378e8528f33d +Author: ana-balica +Date: Thu Mar 19 23:07:41 2015 +0530 + + remove trailing space + +commit 78652d6fc412e96abc15bf3393937648d5ca68e4 +Author: Carol Willing +Date: Wed Mar 18 07:57:05 2015 -0700 + + Update css and static settings in .editorconfig + +commit 1678ad1a3c5cf3457a69edc83559fce81de79db9 +Author: Carol Willing +Date: Mon Mar 16 17:47:17 2015 -0700 + + Add editorconfig file + +commit b8b3a14f6b2169d97b92308623db6106a832fd14 +Author: ana-balica +Date: Wed Mar 18 16:01:19 2015 +0530 + + move JS libs to a libs folder + +commit 3302f3eea5796b7fa2f6dda2868b42a0fa5def51 +Author: Carol Willing +Date: Mon Mar 16 06:46:02 2015 -0700 + + Add Postgres installation resource to README + +commit c7209ff48079a648f790df7d301040a10647783b +Author: ana-balica +Date: Thu Mar 12 23:37:41 2015 +0530 + + Resolves issue #100 + + Added ResourceTypeForm and respective tests + + Added resource_type template + Added AddResourceTypeView + AddResourceType can be accessed at url binding `/resource_type/add` + + redundant template deleted + tests for ResourceTypeView added + +commit b08d49f08130c9f102ba484c41b16271269d2ffb +Author: Rose Robinson +Date: Sat Mar 7 13:10:48 2015 -0800 + + Meetup Requirements + + High Level Requirements document for Meetup project. + +commit 1ec15e7b61679c983e5d503f91264a97702cc1b0 +Author: ana-balica +Date: Sat Mar 7 23:09:29 2015 +0700 + + update README to use Python 3 for running Portal + +commit 5aa43653dedee172178ceff856950f58b547877d +Author: ana-balica +Date: Sat Mar 7 23:07:58 2015 +0700 + + run travis with python 3.4 + +commit 24e733103d5ffe29b67f948ffc3aca5f55a8b9f5 +Author: ana-balica +Date: Sat Mar 7 23:07:46 2015 +0700 + + port portal to python3 + +commit 17049aa118ac94a46fce574d5ebbde579370fedf +Author: ana-balica +Date: Sat Mar 7 23:00:29 2015 +0700 + + add python3-openid package for running django-allauth with python3 + +commit a70a412b9921f01cee02db4e55e8b12f3c9f2065 +Author: Tarun Kumar +Date: Fri Mar 6 18:11:27 2015 +0530 + + 1.added snippet to show tags according to permission (django based not row based). + 2.included snippet in post.html and post_list.html + +commit 45f0f3d02ae8df75b0d444dfa5f14cf0754225c1 +Author: Tarun Kumar +Date: Fri Mar 6 17:05:11 2015 +0530 + + Specified url for transfer ownership + Fixed repeat of class in previous commit + +commit c6e39852ac11e445ed74c5a8cdd3646debd20e83 +Author: ana-balica +Date: Fri Mar 6 11:37:10 2015 +0700 + + make the tag template more generic to be used for resource types as well + +commit 57b1d1e7171afb82aa0dd625dd812c8da847c3ed +Author: Pratik Todi +Date: Sat Feb 28 21:21:28 2015 +0530 + + confirm email with token - template + +commit c5c76fff73481098b73976ab6bd15a8d9a33042d +Author: ana-balica +Date: Tue Mar 3 13:22:40 2015 +0700 + + fix docstring + +commit 6e2beac01fd2903c7293c9eb7b91b64d2abdf656 +Author: ana-balica +Date: Tue Mar 3 13:22:24 2015 +0700 + + add tag functionality + +commit 45c7389cc1fb7dd18b829e861fefd90a55f3548a +Author: ana-balica +Date: Tue Mar 3 12:40:11 2015 +0700 + + create TagForm + +commit 0a8b9524b7e934d81c13101b6540aa097696a1a6 +Author: ana-balica +Date: Tue Mar 3 12:19:59 2015 +0700 + + make tags and resource types to have unique names because they are shared between community + +commit 5d20a88130455da0b70f8efb50012c18ac6e7f33 +Author: ana-balica +Date: Mon Mar 2 18:08:16 2015 +0700 + + minor visual enhancements + +commit cb7b0121287e70c8456d69468003a058c71d8a07 +Author: ana-balica +Date: Mon Mar 2 15:01:18 2015 +0700 + + alter user permissions regarding a community functionality + +commit 82c6b686c780459905afebea2ef0b434886d98ec +Author: ana-balica +Date: Mon Mar 2 13:28:23 2015 +0700 + + override checkboxselectmultiple crispy-forms bootstrap3 template to work well with latests bootstrap + +commit 2c5b432eb631ae2b4a1e7605ea5ebbd1bdbf230d +Author: ana-balica +Date: Mon Mar 2 13:27:06 2015 +0700 + + create PermissionGroupsForm and a unittest + +commit e4ae7a92439b387bca33e9efdfc38c57a9f181b4 +Author: ana-balica +Date: Mon Mar 2 13:24:19 2015 +0700 + + fix a typo in a docstring + +commit 40cf540767c785ebbd8fe9c8417fbad22408e10f +Author: ana-balica +Date: Sun Mar 1 13:10:56 2015 +0700 + + get groups of which user is a member + +commit 11409ae7a8612a0882e1588113348d86eb02e124 +Author: ana-balica +Date: Sun Mar 1 12:48:57 2015 +0700 + + check if user is a member of a group + +commit 429e4493ca2a16cf69be69b6f6f05149339cf7f5 +Author: ana-balica +Date: Sat Feb 28 11:15:17 2015 +0700 + + travis add notification webhook to gitter + +commit e1b334ce3429db739c2446a7fb8d739c414d340b +Merge: d516447 49e5694 +Author: Alma Castillo Antolin +Date: Fri Feb 27 12:40:24 2015 +0100 + + Contact page conflicts resolved + +commit 49e56945b7cec09c60bc5824fed207aab142fe91 +Author: ana-balica +Date: Fri Feb 27 17:51:57 2015 +0700 + + join lines for readability + +commit 33e7b65e53ef33e1b2898116e40435447f4b5503 +Author: Pratik Todi +Date: Fri Feb 27 01:15:21 2015 +0530 + + rename community_admin to admin + +commit d516447f91fd7bb3a7bbb586d6f236ab71c2448e +Author: Alma Castillo Antolin +Date: Fri Feb 27 01:05:20 2015 +0100 + + Contact page amended + +commit 5d1381f0d12bba84c602fa100af7612da35295d3 +Author: Alma Castillo Antolin +Date: Tue Feb 17 11:56:48 2015 +0100 + + About us page amend + +commit dd05743c265f0b99b4fb264d2fe029b16bb30b81 +Author: ana-balica +Date: Wed Feb 25 16:56:40 2015 +0700 + + remove member of a community functionality + +commit e2b2d0f188b1aa28d84aecd3d2265ac9b0867c82 +Author: ana-balica +Date: Wed Feb 25 13:04:16 2015 +0700 + + update community users template and test + +commit 167f5eb4876b51253d2406bcad02ecff754c299f +Author: ana-balica +Date: Tue Feb 24 23:41:17 2015 +0700 + + open non-internal links in a new tab + +commit 17248b5e4a2899d1dff63a0a3ee75df2ca14c8cb +Author: ana-balica +Date: Mon Feb 23 14:29:47 2015 +0700 + + docs architecture article: about tests and migrations + +commit 7ac8357505e19723a5dfd6df4f81a1c8a56e6265 +Author: ana-balica +Date: Sun Feb 22 21:05:25 2015 +0700 + + open Systers Wiki in a new tab + +commit 4fc401e1b5305fa8dbce51eef67e4fc97fc15a46 +Author: ana-balica +Date: Sat Feb 21 00:03:19 2015 +0700 + + describe in general terms the app architecture in docs + +commit db775b351417140282d8b57fd1cbe0734e2449a4 +Author: ana-balica +Date: Sat Feb 21 00:02:57 2015 +0700 + + rewrite the "contributing" article from docs + +commit 4704bd121d1110078834d1f3c792a4276c693352 +Author: ana-balica +Date: Sat Feb 21 00:02:07 2015 +0700 + + make group names bold in docs + +commit d9ba8de24dc839399a8d6192e1e969a6ce2dbcb6 +Author: ana-balica +Date: Fri Feb 20 14:57:15 2015 +0700 + + add rtd Sphinx theme + +commit cb6fc77a9373b4a147022f6dda37111f073b9aef +Author: ana-balica +Date: Fri Feb 20 13:47:31 2015 +0700 + + set up to manage community users in template + +commit 444dc4d273cfdaa92688a6387cb567c5f68fd968 +Author: Pratik Todi +Date: Tue Feb 17 00:19:09 2015 +0530 + + 404 page template added + +commit beb09797f6a2810d64a96aba4c0c7f58366bc620 +Author: ana-balica +Date: Wed Feb 18 21:34:50 2015 +0700 + + list all community users + + Includes: + * view + * route + * template + * tests + +commit 377a034f472371d0541e94b9feae52633b501636 +Author: ana-balica +Date: Tue Feb 17 23:23:17 2015 +0700 + + update welcome intro to docs + +commit cce087d0e7f624303f98c765806ef1a71562e244 +Author: ana-balica +Date: Mon Feb 16 22:06:00 2015 +0700 + + update README with brief info about Systers Portal + +commit 92616f35b1a257553ee670dfa3d4f2b4a3ba34d4 +Author: ana-balica +Date: Sun Feb 15 20:58:15 2015 +0700 + + how to run portal using docker instructions + +commit 5b4200e2566d200b358c7f3f2914030aa5871695 +Author: ana-balica +Date: Sun Feb 15 20:09:13 2015 +0700 + + fig.yml and a docker specific settings file (for postgres) + +commit 899508f9b1f53449c36b2c1137c180e664457d46 +Author: ana-balica +Date: Sun Feb 15 20:08:03 2015 +0700 + + portal very simplistic Dockerfile + +commit 88479d9e40a33cdb465b899b0b8de4826d8f7574 +Author: ana-balica +Date: Sat Feb 14 13:48:00 2015 +0700 + + include django-nose app only when testing + +commit a5230c76cb544ccbad4ff71f58ec39b9c9919efb +Author: Alma Castillo Antolin +Date: Tue Feb 10 22:17:29 2015 +0100 + + Password reset style template + +commit f7ca3bd00871cabc5262fdea784004aebb2baa52 +Author: ana-balica +Date: Fri Feb 13 18:38:12 2015 +0700 + + transfer community ownership to a new admin + + Includes: + * view + * route + * tests + * templates + +commit 3efe6ae8b8a77007c18bd980e0281a2f9814f342 +Author: ana-balica +Date: Fri Feb 13 17:24:34 2015 +0700 + + form for transfering ownership of a community + +commit 39a3aa0f958c319bd944c01642e7e2a54a8add65 +Author: ana-balica +Date: Fri Feb 13 01:21:57 2015 +0700 + + move join_requests.html template to membership folder + +commit cc19e4f7b22c7e1048bc30740dc9f97fdb6828af +Author: ana-balica +Date: Fri Feb 13 01:20:50 2015 +0700 + + set a new community admin method + +commit da9342e5da884fd20ca537f201cfef72aacd4e84 +Author: ana-balica +Date: Thu Feb 12 22:25:39 2015 +0700 + + remove empty line + +commit af7a1c1b0b6425166b0ffc3561f75dd56c903e8f +Author: Alma Castillo Antolin +Date: Tue Feb 10 20:19:51 2015 +0100 + + Confirm email style template recommit + +commit 3a345b70fdbbf85fbdf6b0236a1cef84c45e9801 +Author: ana-balica +Date: Wed Feb 11 18:55:53 2015 +0700 + + remove the old SubmitCancelFormActions class for crispy form layout + +commit 2a96113458a4707537b5ffc14070e040cebca89a +Author: ana-balica +Date: Wed Feb 11 18:54:52 2015 +0700 + + refactor forms to inherit from ModelFormWithHelper + tests + + Only forms that need a custom helper for submit and cancel buttons. + +commit b492963afd62e9824065eaf7cd1379bb5a8e834e +Author: ana-balica +Date: Wed Feb 11 18:53:47 2015 +0700 + + create a custom ModelFormWithHelper + tests + +commit 4c6b5df926e484185227d7ccd8c0ff304b891904 +Author: ana-balica +Date: Wed Feb 11 18:52:52 2015 +0700 + + create a SubmitCancelFormHelper for crispy forms + tests + +commit 48cea3271085427cea227149dc6e0048c31b75fe +Author: ana-balica +Date: Tue Feb 10 18:52:09 2015 +0700 + + add link to New Community Proposal google form + +commit dafefa426ea989e594ddbfc22ea21c4300eecd29 +Author: Alma Castillo Antolin +Date: Mon Feb 9 11:15:25 2015 +0100 + + Password style template recommit + +commit e9bf47ce91f8674258060e8dc8159e9e3bc3c6ac +Author: Alma Castillo Antolin +Date: Mon Feb 9 10:44:43 2015 +0100 + + Inactive style template recommit + +commit 5704a26aec998f2216973a0e7130281361d35988 +Author: ana-balica +Date: Mon Feb 9 12:00:30 2015 +0700 + + remove signup button on index page if user is authenticated + +commit 4060c787260bdd91eabcb99b909eeafd01ab5d9c +Author: Alma +Date: Sun Feb 8 16:56:07 2015 +0100 + + Logout style template recommit + +commit 3dbdcb4dda925a6d20b4051e29dde829fcc92365 +Author: ana-balica +Date: Sun Feb 8 15:26:57 2015 +0700 + + rearrange apps and register membership app + +commit 8a01e47e1b13e2fff2e32bb16d13d3dbe3b14968 +Author: ana-balica +Date: Sun Feb 8 15:26:35 2015 +0700 + + remap all JoinRequest imports to membership app + +commit e5373d93e3c94d900e76b137f1d034f616adeba8 +Author: ana-balica +Date: Sun Feb 8 15:26:14 2015 +0700 + + move all JoinRequest related functionality (views, urls, tests) to membership app + +commit 6694cbc005a3d81483039b14af1220a253d537f1 +Author: ana-balica +Date: Sun Feb 8 15:24:21 2015 +0700 + + move JoinRequest model to new membership app + +commit d219eab2c51aba7cae831a541737c2963913b6d5 +Author: ana-balica +Date: Sun Feb 8 14:30:51 2015 +0700 + + leave community functionality + +commit 1ad7c511e1d8cc1b51ecfac3cdd1859c1b96d319 +Author: ana-balica +Date: Sun Feb 8 14:09:42 2015 +0700 + + SystersUser.leave_community() + test + +commit 069a130b936d7c56764f958767edc74e3c7c4865 +Author: ana-balica +Date: Sat Feb 7 22:51:28 2015 +0700 + + SystersUser.leave_groups() + test + +commit f9496acf887a328d23d9b496872f507d558f5010 +Author: ana-balica +Date: Sat Feb 7 21:55:43 2015 +0700 + + get_groups() function + +commit 584eaa2c91b6e098716d0671018ae39800a9e6c3 +Author: ana-balica +Date: Sat Feb 7 20:32:07 2015 +0700 + + pep8 ignore wsgi.py + +commit 02c932f84a410e13b5bb1a8abf3537abdf660b6c +Author: ana-balica +Date: Sat Feb 7 14:04:47 2015 +0700 + + fix line lenghts in community/constants.py + +commit f6aabcfbb371fa3b2d14c8724362aad328067c2e +Author: ana-balica +Date: Sat Feb 7 13:53:27 2015 +0700 + + cancel join request functionality + +commit 0b510962e8182ba80e9ad4982b2e8d5a827c2714 +Author: ana-balica +Date: Sat Feb 7 13:12:56 2015 +0700 + + JoinRequest.objects.cancel_join_request() method + test + +commit 8e1e3631324d3ab1451e1982fc0abb5d40d3a46b +Author: ana-balica +Date: Sat Feb 7 13:11:58 2015 +0700 + + refactor approve and delete join request methods to return the status + +commit ad37ae33d45a24735cb990e8311c9e26a6cd5867 +Author: ana-balica +Date: Fri Feb 6 15:23:24 2015 +0700 + + request to join a community functionality + +commit 54a8d1d085fe3eccee69029ad39fdc11e566fe76 +Author: ana-balica +Date: Fri Feb 6 15:22:42 2015 +0700 + + fix Approve/Reject join requests test case messages + +commit be8a90393fd1a4a66b1cfee1d689126dc4f9520b +Author: ana-balica +Date: Fri Feb 6 15:22:10 2015 +0700 + + remove initialization of a test client + +commit c6b6b08f9d0cf32ead8c8f596aa01dedceeca048 +Author: ana-balica +Date: Fri Feb 6 12:43:10 2015 +0700 + + create JoinRequest model Manager to create a join request + +commit 12d03adf8f685636fe9dc1678c8bca6c6e58ac88 +Author: ana-balica +Date: Fri Feb 6 11:51:13 2015 +0700 + + fix profile communities context for membership display + +commit c254b1f31dd12dffff70efd0b204ea1cfd9d1a86 +Author: ana-balica +Date: Wed Feb 4 19:41:16 2015 +0700 + + reject community join request functionality + +commit bbfc7e4483c4eb2dff6578585b88c9b3afdd54e2 +Author: ana-balica +Date: Wed Feb 4 08:49:29 2015 +0700 + + reject all user join requests by deleting them + +commit c5884fc5943edb0748a707d430fca3929483fef3 +Author: ana-balica +Date: Tue Feb 3 19:12:09 2015 +0700 + + approve join request functionality + +commit 5cb5217b339f886fb03c40a7e1c30770f299f484 +Author: ana-balica +Date: Tue Feb 3 19:06:54 2015 +0700 + + method to approve all user join requests to a community + +commit f3ae72e645dd44fe4714b1d6156b2265a49558a3 +Author: ana-balica +Date: Tue Feb 3 10:14:56 2015 +0700 + + implement JoinRequest.approve() + +commit 3be8e516470dbe3cc509499dd79c61ca912790bc +Author: ana-balica +Date: Tue Feb 3 10:04:11 2015 +0700 + + remove redundant commas + +commit f6df0e011c323ed3e08f2c16c6fc2820a609c78f +Author: ana-balica +Date: Tue Feb 3 10:02:56 2015 +0700 + + website-wide alert messages + +commit 809dfaa091e23cf36fdbb8699c6e3d4090434173 +Author: ana-balica +Date: Mon Feb 2 00:55:57 2015 +0700 + + update join request list with a reject button + +commit 31109df51d0ab7cce17fbc62b6fe331e547e24d2 +Author: ana-balica +Date: Mon Feb 2 00:48:29 2015 +0700 + + speed up tests with MD5 password hasher + +commit a6e465f60a1014f8e0fd065eb3da0cba23906291 +Author: ana-balica +Date: Mon Feb 2 00:48:08 2015 +0700 + + remove test runner setting from base.py + +commit e535e5db8ec907c5156028ff50f821eb7b099193 +Author: ana-balica +Date: Sun Feb 1 23:09:45 2015 +0700 + + list of not yet approved community join requests + +commit 227b4e3bc2c8a97019f88a948dfd8278745887f9 +Author: ana-balica +Date: Sat Jan 31 00:14:57 2015 +0700 + + community navigation bar urls, close #71 + +commit ec7a70866885063eeb2459afc166696426a93a65 +Author: ana-balica +Date: Fri Jan 30 22:44:11 2015 +0700 + + delete community page functionality + +commit fc0b46f03f7f06124b11d9f95049bdab21c3ad8e +Author: ana-balica +Date: Fri Jan 30 22:43:45 2015 +0700 + + move post_confirm_delete template to common + +commit d27251f3ad83210159ab63489b11f5f540260879 +Author: ana-balica +Date: Fri Jan 30 22:21:13 2015 +0700 + + edit community page + +commit f0bd42d4117e9678efd2b1135880f193ffec4d46 +Author: ana-balica +Date: Fri Jan 30 22:20:38 2015 +0700 + + move edit_post template to common folder + +commit 5ff6b67593e7425d34beb4236f73c68a3513b2c9 +Author: ana-balica +Date: Fri Jan 30 21:59:46 2015 +0700 + + edit page form and unittest + +commit c82178c157e3b9513a7b17f1c68273353ef52b6b +Author: ana-balica +Date: Fri Jan 30 21:30:59 2015 +0700 + + add community page view, route, unittests + +commit 933f7409ed4eba4dda270b489f6aca9a5f4f6fa6 +Author: ana-balica +Date: Fri Jan 30 21:30:28 2015 +0700 + + fix the AddCommunityPageForm cancel url + +commit 2a6e4d8ab263ebb50f2b69b93f94d1cfc34750e6 +Author: ana-balica +Date: Fri Jan 30 21:17:57 2015 +0700 + + CommunityLandingView + unittests + +commit 624787f8ead4f523a650471b45b23221de31c56f +Author: ana-balica +Date: Fri Jan 30 21:15:54 2015 +0700 + + community page view+template, fixed unittests + +commit a398936cfaf496965b0e25ed10ea8dc08ef607bc +Author: ana-balica +Date: Fri Jan 30 21:14:14 2015 +0700 + + page actions snippet + +commit 56761f51c836e676f8cd8f0cd4294fd87d0a7d44 +Author: ana-balica +Date: Fri Jan 30 21:13:23 2015 +0700 + + remove the point to "Manage Community Pages" from community sidebar + +commit 7963cf3f6d4039ee13060388099334567d373f8b +Author: ana-balica +Date: Fri Jan 30 21:13:03 2015 +0700 + + rename actions_sidebar to community_sidebar + +commit dc3e5c0b86836dd42e02852f18740a40c244af81 +Author: ana-balica +Date: Fri Jan 30 18:27:56 2015 +0700 + + move add_post.html template to common folder + + add_post.html is used both for creating News, Resource and CommunityPage. + +commit 0633462c1ba64fc8855dc9b3a388f0f26a809583 +Author: ana-balica +Date: Fri Jan 30 18:26:10 2015 +0700 + + add community page + unittest + +commit 04f37e60ebf1a049e5eb3cd6ad7bf2e71c3c63dd +Author: ana-balica +Date: Fri Jan 30 03:56:56 2015 +0700 + + filter resources by type + + Includes: + * updated view + * resource_types snippet + * unittest + +commit 6a131e38b9f069a70f88a4b3ec3293402a057875 +Author: ana-balica +Date: Fri Jan 30 03:56:04 2015 +0700 + + ResourceTypesMixin and unittest + +commit 38a847ce5519a22b87136156b82eef98baf168dc +Author: ana-balica +Date: Fri Jan 30 03:46:26 2015 +0700 + + fix mixin tests + +commit 04686b108f1ce4b263bfcfda2358225316538bee +Author: ana-balica +Date: Fri Jan 30 01:22:38 2015 +0700 + + delete community resource (view, route, unittests) + +commit e017cd7e98ded95a0154714e2e8fc1123e5f6b6e +Author: ana-balica +Date: Fri Jan 30 01:07:08 2015 +0700 + + edit community resource view, route, unittests + +commit 79d4cdc880ee500c03745ac0bd594c611bc9a6d6 +Author: ana-balica +Date: Thu Jan 29 23:23:46 2015 +0700 + + edit resource form + unittest + +commit 7bc9d65a6446a129762a77013d5560dbb4397b36 +Author: ana-balica +Date: Thu Jan 29 23:23:33 2015 +0700 + + fix cancel url for EditNewsForm + +commit f801764683b92fbaa6b76f79081575debd27e87f +Author: ana-balica +Date: Thu Jan 29 23:16:43 2015 +0700 + + add new community resource (view, route, unittest) + +commit 8b6f0ed0280811d4953f62537aa92b169bb1e2a9 +Author: ana-balica +Date: Thu Jan 29 23:03:22 2015 +0700 + + resource add form + unittest + +commit e33889d39bd4e0840105119ed8c6db87bc20ccf1 +Author: ana-balica +Date: Thu Jan 29 22:55:16 2015 +0700 + + resource and resourse list page views and routes + +commit 6577d217e68f63e7360a9b0d3c0f4928bfedc018 +Author: ana-balica +Date: Thu Jan 29 22:54:21 2015 +0700 + + absolute URL for Resource model and small fixes + +commit 921710eec0b46807d00cc79843eb034050984191 +Author: ana-balica +Date: Thu Jan 29 22:16:40 2015 +0700 + + generalize news template to post template + +commit 98aaece5f77a9ad11b96fc7f9a36876c1ebf711a +Author: ana-balica +Date: Thu Jan 29 19:55:22 2015 +0700 + + delete community news + + Contains: + * view + * unittests + * template + * route + * sidebar URL update to delete + +commit a386a5d86e055a3d7fc560c13bef119ef4277df8 +Author: ana-balica +Date: Thu Jan 29 19:15:07 2015 +0700 + + update news sidebar to edit/delete current news + update unittests + +commit 3b0f6862c402bd25f98c0a9832e1faa8442d1ffc +Author: ana-balica +Date: Thu Jan 29 19:14:25 2015 +0700 + + add url to user in the news template + +commit 86423ea38585eb5de5586e16cc630778f1f59e73 +Author: ana-balica +Date: Thu Jan 29 18:52:47 2015 +0700 + + make news tags spans instead of link + +commit 29259329390163a8d2b00b5d7edfd51d8c0cb292 +Author: ana-balica +Date: Thu Jan 29 18:41:39 2015 +0700 + + fix docstring for blog views + +commit e830b8e267eb745c8995415dabd6baedaee87d65 +Author: ana-balica +Date: Wed Jan 28 14:07:14 2015 +0700 + + upgrade all requirements.txt packages + +commit 97b995c6b7f1e56af05c8983879dd35eb5532bb7 +Author: ana-balica +Date: Wed Jan 28 01:52:08 2015 +0700 + + edit community news + + Includes: + * route + * view + * unittests + * template + +commit 60106d9b9539e8383ff0ad56b9c82988a1057348 +Author: ana-balica +Date: Wed Jan 28 01:45:29 2015 +0700 + + form to edit community news + +commit 5e5fc419b8b325191b7bd6c05146707536f94e5c +Author: ana-balica +Date: Wed Jan 28 01:44:36 2015 +0700 + + rename the NewsForm to AddNewsForm + +commit e1b34db1ebb7a8f0717e1042a7e84f84eb77b0b6 +Author: ana-balica +Date: Wed Jan 28 01:41:27 2015 +0700 + + rename create_news to add_news + +commit 571384958285d7a7b4f11d6ab589786d1b7e5386 +Author: ana-balica +Date: Tue Jan 27 22:19:14 2015 +0700 + + add pagination to news list + +commit 1ec92c6df5ef87991d7ebf2f9dd887c6ad4e51b7 +Author: ana-balica +Date: Tue Jan 27 22:18:54 2015 +0700 + + remove the unused context variable from CommunityNewsListView + +commit 6f8ea8cc51836b8b81a1d827e15d22615580c745 +Author: ana-balica +Date: Tue Jan 27 20:05:04 2015 +0700 + + community news actions sidebar + +commit 09ed924f275e2bb4ea82d54f693739ea7d4ae0ed +Author: ana-balica +Date: Sat Jan 24 01:37:13 2015 +0700 + + add unittests to news form and create new view + +commit 92da164f0b88f5763a35e941917da8bfd7f46d5a +Author: ana-balica +Date: Sat Jan 24 00:56:44 2015 +0700 + + configure ckeditor toolbar and load it for creating news + +commit cc29f52d7732d90772568ad47e8522aa79d52ed8 +Author: ana-balica +Date: Sat Jan 24 00:54:55 2015 +0700 + + add django-wysiwyg package + +commit 8a36a286ea8c971d0880b2f831aba6eaeded9ea3 +Author: ana-balica +Date: Fri Jan 23 22:45:00 2015 +0700 + + create news for a community + + Contains: + * route + * form + * view + * template + +commit 0bdeadac721d4d4fe1dc40515d6d48a92eea29ff +Author: ana-balica +Date: Thu Jan 22 13:13:37 2015 +0700 + + add info to README about cloning the repo + +commit eef62e23c6a34f28f3775f7643daf5697de14ccb +Author: ana-balica +Date: Wed Jan 21 21:19:10 2015 +0700 + + add urls to sigle news and news author in news list template + +commit 4f01b05f6e1c68554d50c329d80b06e4e9b09772 +Author: ana-balica +Date: Wed Jan 21 21:18:40 2015 +0700 + + single news page + + Contains: + - view + - template + - route + - unittests + +commit c32d5db2e8bf97379465bb94915a1fc0e8450b1a +Author: ana-balica +Date: Wed Jan 21 21:17:55 2015 +0700 + + add get_absolute_url() method to News model + +commit f19f61bfa2347f24b77c1b205f4559e1990118b7 +Author: ana-balica +Date: Sat Jan 17 16:14:22 2015 +0700 + + add Gitter badge to README + +commit 29408cea023628b353c200b65b2cc228c23a3322 +Author: kanika +Date: Wed Jan 14 10:30:50 2015 +0530 + + Style Sign up page #60 + +commit 9fc7301a8eeb7dc17413bfc07692480791efb70b +Author: kanika +Date: Sat Jan 10 11:55:57 2015 +0530 + + Add info about createsuperuser to docs #62 + +commit ca9be30b0046fe26df1344ff4aef6807d3752ef8 +Author: ana-balica +Date: Wed Jan 7 00:13:45 2015 +0700 + + update contributing guide in the docs + +commit f41ca24f81cfd81b377c61796923dd1d08d45ee4 +Author: ana-balica +Date: Mon Jan 5 18:28:24 2015 +0700 + + community news list functionality + + Includes: + * view + unittests + * route + * template + styling + +commit 9e5b288d9e5964d659e92bf3d01b16a6bbd4017a +Author: daisyab +Date: Sat Jan 3 03:42:29 2015 +0100 + + fix responsiveness on index page + +commit a50b60e90eddd05190804a3567e21fbd79d82dc6 +Author: ana-balica +Date: Tue Dec 30 20:26:58 2014 +0700 + + change assertListEqual to assertItemsEqual in unittest + +commit b8908b1c9779aba345151ebabd40e23fd1a7b218 +Author: ana-balica +Date: Tue Dec 30 16:42:54 2014 +0700 + + use UserDetailsMixin in CommunityPageView + +commit 0f6621ac8627dc2f72210aecfb13bf651bfdc1f2 +Author: ana-balica +Date: Tue Dec 30 16:41:54 2014 +0700 + + create UserDetailsMixin + unittests + +commit 77632c6bfd4af14c3c87a400603f02f96b2da173 +Author: ana-balica +Date: Tue Dec 30 14:07:40 2014 +0700 + + refactor CommunityPageView according to mixin changes + + * remove additional SQL query + * change get_page_slug() + +commit 5fa52259e27b9bca10389b3c0612b81742b66fa7 +Author: ana-balica +Date: Tue Dec 30 13:38:05 2014 +0700 + + add docstrings to CommunityMenuMixin unittest and fix typo + +commit ffa31f3eb70998a6b1fbe6644f42d73b8de0f6bb +Author: ana-balica +Date: Tue Dec 30 13:36:50 2014 +0700 + + change CommunityMenuMixin + + * make it to accept a page slug instead of CommunityPage object + * now it can accept an arbitrary string, like 'news' or 'resources' + * add unittest to this usecase + +commit 13a61c94a31d90e60ff0b8fecc813f80646d801f +Author: ana-balica +Date: Tue Dec 30 11:23:05 2014 +0700 + + use CommunityMenuMixin for CommunityPageView + +commit 403217b346dc2eff123069f3fc4c492816859d2e +Author: ana-balica +Date: Tue Dec 30 00:29:30 2014 +0700 + + create view mixin to add context to Community menu + unittests + +commit 47b07f51cf80ee6ee79ee37c6de52bcc118fc34a +Author: ana-balica +Date: Mon Dec 29 21:44:49 2014 +0700 + + rename community/page.html to community/base.html in templates + +commit 9d1f16c3b47e3b0693d473a6f657cbf8ca7772fb +Author: ana-balica +Date: Tue Dec 16 10:34:07 2014 +0700 + + add template context processor to list all communities in the navbar + unittest + +commit c9689d1acde1b22334b4aae083adaddb631978bb +Author: ana-balica +Date: Tue Dec 16 10:32:14 2014 +0700 + + add get_absolute_url method to Community model + +commit 40b5c4956e1c30a05a862c62a96c73e8344bdbbb +Author: ana-balica +Date: Fri Dec 5 20:48:39 2014 +0800 + + update dependencies + +commit e33b268f230fd46c4182fea7c292c68b90e3bd11 +Merge: 28accc6 16ceb8c +Author: ana-balica +Date: Fri Dec 5 20:05:49 2014 +0800 + + Merge branch 'community-pages' into develop + +commit 16ceb8cf814fbd959f19fe226afbb80ce9ec265d +Author: ana-balica +Date: Fri Dec 5 19:46:08 2014 +0800 + + show community landing page and specific community page + + Includes: + * routing + * template + * view + * unittests + +commit 75464f85de04f41c88050de1cbfeecca3935f1aa +Author: ana-balica +Date: Fri Dec 5 17:14:20 2014 +0800 + + add unicode representation to CommunityPage model + +commit 0ec168fcfc0e32a13f42681beb52f858a6749851 +Author: ana-balica +Date: Fri Dec 5 11:44:41 2014 +0800 + + fix HTML validation errors + +commit ddb71634caa20df22ef7bcc037ad779ea0abaffa +Author: ana-balica +Date: Fri Dec 5 11:40:45 2014 +0800 + + Community actions sidebar HTML snippet + +commit 05de79553e254c29eac653aa5b65f38f62fb8ce7 +Author: ana-balica +Date: Fri Dec 5 11:40:22 2014 +0800 + + fix documentation about groups and permissions + +commit b0db5fb985892aa33e2b2a8f06e90a22b8f075c9 +Author: ana-balica +Date: Fri Dec 5 11:40:02 2014 +0800 + + add "change_community_page" to content manager permissions + +commit 9065ac5856fc3f9fcf197af59717228bbc8cd2cd +Author: ana-balica +Date: Fri Dec 5 11:11:46 2014 +0800 + + Community join button html snippet + +commit 739241519574dedeb4a91ab2fbecf64d5ad1c92b +Author: ana-balica +Date: Thu Dec 4 22:54:45 2014 +0800 + + get SystersUser last join request to a community + unittest + +commit fd134c4bd8e4a173552557d36237aec5be6c4c78 +Author: ana-balica +Date: Thu Dec 4 22:54:13 2014 +0800 + + fix flake8 errors + +commit 411d6af795691418876342f9f6747f718d1cca22 +Author: ana-balica +Date: Thu Dec 4 22:40:49 2014 +0800 + + check if SystersUser is member of a community + unittest + +commit 73b3f8838338a6833ec72d1920df82e11395465a +Author: ana-balica +Date: Thu Dec 4 22:13:29 2014 +0800 + + rename community_footer.html snippet to footer.html + +commit 28accc6a7494c59922ae9e42f8a6b1918aa61a93 +Author: Rose Robinson +Date: Mon Nov 24 10:09:44 2014 -0500 + + Create LICENSE + + Initial commit. + +commit e462aab3e059eb4c4f1dd5c1e12a934cde8f9a8b +Author: ana-balica +Date: Sun Nov 16 21:37:46 2014 +0800 + + add info about coverage to "Contributing" docs + small fixes + +commit bf3dfd8dfb2d8690aca28146bf554274048758d9 +Author: ana-balica +Date: Mon Nov 10 23:20:46 2014 +0800 + + fix loading unexisting filter + +commit e245bbfa8f4187e08550f3d149c22f144f4c3af7 +Author: ana-balica +Date: Mon Nov 10 23:14:46 2014 +0800 + + edit community profile view/url/template/unittests + +commit 65924f640ee05ffc98701d90f09bfdaab51b4b78 +Author: ana-balica +Date: Mon Nov 10 23:14:19 2014 +0800 + + Community form + unittest + +commit 60707de390831e2914c6cc9f2cad26f3b8f331a9 +Author: ana-balica +Date: Mon Nov 10 23:11:21 2014 +0800 + + community profile detail view + + Includes: + * templates + * url + * view + * unittest + +commit 5cade93c82dafbf2f04f31d99ffe6d3430c9f69d +Author: ana-balica +Date: Mon Nov 10 23:01:46 2014 +0800 + + Community get_fields + unittest + +commit 9e54865690b73bf586af4a246f57db4184444235 +Author: ana-balica +Date: Mon Nov 10 23:01:19 2014 +0800 + + fix margin-bottom of tables + +commit 57e8062a026c6f050445c149bc19ba55f190d79e +Author: ana-balica +Date: Mon Nov 10 23:01:04 2014 +0800 + + small fixes to users app + +commit ef6f0539678665f3d5aa0df237ad2b2401205cb2 +Author: ana-balica +Date: Mon Nov 10 01:45:52 2014 +0800 + + add unittests for blog app models + +commit abb84d7100d370a5ffc10b635c8d63299b07ac74 +Author: ana-balica +Date: Mon Nov 10 01:36:23 2014 +0800 + + add unittest for Comment model + +commit 98c3d306cccb24e7eb6aacffe6ad020a49b94d2c +Author: ana-balica +Date: Mon Nov 10 01:18:29 2014 +0800 + + add unittest for model JoinRequest + +commit 4f9270c058f5a55e5c93a30700a510caa8844d10 +Author: ana-balica +Date: Mon Nov 10 01:04:37 2014 +0800 + + change the settings for coverage + +commit 2bee71afa0dec7165d979d89a752c3cce7e34750 +Author: ana-balica +Date: Mon Nov 10 00:50:55 2014 +0800 + + pip install specific version of coveralls + +commit db0ac706c56cdd8349a9ae7cbd0bfdc377d14210 +Author: ana-balica +Date: Mon Nov 10 00:16:42 2014 +0800 + + tackle coverage settings + +commit 2d28de03cdb0d92db380095557a4c048372819ee +Author: ana-balica +Date: Sun Nov 9 22:52:45 2014 +0800 + + remove __author__ from __init__ files + +commit d7a29fe1dd541867492ed9353f2baf7995d52e9c +Author: ana-balica +Date: Sun Nov 9 22:23:36 2014 +0800 + + community permissions unittest + +commit 159d8a99aeffba8ee6fa02bde6446f61147bcad7 +Author: ana-balica +Date: Sun Nov 9 22:23:27 2014 +0800 + + community constants unittests + +commit cfac07ffd6687707bb6a49f0f355463ea36ffcf8 +Author: ana-balica +Date: Sun Nov 9 20:48:01 2014 +0800 + + update coveragerc + +commit c47bfad930eeec8f168d80ba925cd4a4a0a5ebcf +Author: ana-balica +Date: Sun Nov 9 20:41:26 2014 +0800 + + omit tests and systers_portal folder from coverage + +commit 45dbdd25cf30520f67c6a4c4a464c66dac669505 +Author: ana-balica +Date: Sun Nov 9 20:41:11 2014 +0800 + + refactor users app tests + +commit 33eb1ffe41ebbf44ce47797a90aa4d419ef69fe1 +Author: ana-balica +Date: Sun Nov 9 20:15:28 2014 +0800 + + refactor community tests + +commit 8df9f7f228272e47f875d1ac52951eec0213e65a +Author: ana-balica +Date: Sun Nov 9 20:15:09 2014 +0800 + + remove old big community tests file + +commit af82b163700de55a5f98cde075a23f497fa737c4 +Author: ana-balica +Date: Sat Nov 8 11:51:28 2014 +0800 + + run coveralls with an rcfile + +commit 905c85b686fd0479cc25c5175d5286de56d93b94 +Author: ana-balica +Date: Sat Nov 8 11:50:21 2014 +0800 + + add .coveragerc + + Remove: + * migrations folders + * settings folder + * django default files (manage.py, wsgi.py) + +commit 85e156fea6c9d19c7550f0eb0e12143d69cc4683 +Author: ana-balica +Date: Sat Nov 8 11:27:05 2014 +0800 + + unittest verbose_name template tag + +commit 095d1fa569436004eb61bc53df63215133162e0a +Author: ana-balica +Date: Sat Nov 8 11:26:52 2014 +0800 + + create a tests package for common app + +commit 9e0f434b2e91469ed083ca888df257262bda8c96 +Author: ana-balica +Date: Sat Nov 8 11:26:18 2014 +0800 + + rename to common/templatetags/verbose_name.py + +commit 1b0589a6035efdc858b110721e5a1e3eaa3c8db0 +Author: ana-balica +Date: Sat Nov 8 11:25:34 2014 +0800 + + rename forms package from common app + +commit e2a853432d7e405fd920b80480c181eaaf2138b9 +Author: ana-balica +Date: Wed Nov 5 22:40:54 2014 +0800 + + add coveralls.io badge + +commit 0342d28c1f34ed22734aec92fd686dfee54e3873 +Author: ana-balica +Date: Wed Nov 5 22:21:05 2014 +0800 + + enable coveralls with travis-ci + +commit 0701a28e387b3171ec0b01b3a25c2a534c790762 +Author: ana-balica +Date: Wed Nov 5 22:20:35 2014 +0800 + + add coverage package for text coverage + +commit 77acbf4a9683668179fd9253e866383ba6037624 +Author: ana-balica +Date: Tue Nov 4 12:53:54 2014 +0800 + + update UserForm using custom layout object + +commit 9062addedce4b060f79fa2c508f429dfb356bca2 +Author: ana-balica +Date: Tue Nov 4 12:52:02 2014 +0800 + + custom crispy-forms layout object + unittest + +commit 7bafc7cfdf09581f4632d9b8ad2e2b3534de8383 +Author: ana-balica +Date: Mon Nov 3 11:46:32 2014 +0800 + + fix User redirect urls + +commit 4f3fd6e4437ef85e5f288c3fc126816bf6101c61 +Author: ana-balica +Date: Mon Nov 3 11:46:13 2014 +0800 + + add an admin panel link for staff users + +commit 190fa0f98a43166ab363ff2899db18a9111da638 +Author: ana-balica +Date: Sun Nov 2 17:55:42 2014 +0800 + + add user_profile URL to user page + +commit 5da87ea53435e0392a39b3f8d83b46f076237d99 +Author: ana-balica +Date: Sun Nov 2 14:34:36 2014 +0800 + + add UserProfileView TestCase (unittests) + +commit 825335afc3585ec8c8274892626c5e5265862e3b +Author: ana-balica +Date: Sun Nov 2 14:34:13 2014 +0800 + + create UserProfileView + template + route + +commit 9eab2aa06cc957463752ee63c81aea650a109427 +Author: ana-balica +Date: Sun Nov 2 14:33:02 2014 +0800 + + rename `SystersUserViewsTestCase` to UserViewTestCase + +commit c025a34ac92231ae50d8eef0e99b80dc5292cae4 +Author: ana-balica +Date: Sun Nov 2 12:24:37 2014 +0800 + + add docstring to get_context_data of UserView + +commit e36ea03ca19dd39507cec79b23d8454895dc5921 +Author: ana-balica +Date: Sun Nov 2 12:23:55 2014 +0800 + + add crispy form style to UserForm + +commit 66c1fd3b63757de1c41dd429fb754ed791d4726c +Author: ana-balica +Date: Sun Nov 2 12:23:37 2014 +0800 + + fix UserForm unittest + +commit cd44fddd0db3cb585838ae65633d80f5c2f4ce8f +Author: ana-balica +Date: Sat Nov 1 21:59:45 2014 +0800 + + add SystersUser model absolute_url method + +commit e68380e9cfce97624cb1d0a91d9696ee6f9143db +Author: ana-balica +Date: Sat Nov 1 19:02:33 2014 +0800 + + combined user form + unittest + +commit 7c40c194af29c7862a85792d47eaad21e228b0b5 +Author: ana-balica +Date: Fri Oct 31 21:39:29 2014 +0800 + + fix profile picture styling + +commit feb0b6bd91d82390e16d8e72ece59caa5f9dedd8 +Author: ana-balica +Date: Thu Oct 30 15:17:08 2014 +0800 + + documentation about Groups and Permissions + +commit 7772ba2c319e11ebd80e52edc864440fdacc6ba1 +Author: ana-balica +Date: Thu Oct 30 15:16:45 2014 +0800 + + documentation about Communities management + +commit d5492e084da948cf4d90d7078a458b8e5f654e75 +Author: ana-balica +Date: Thu Oct 30 12:26:45 2014 +0800 + + use assertSequenceEqual instead of assertListEqual + +commit 289330d07522d3d85839de4a4251dff9636ba77f +Author: ana-balica +Date: Thu Oct 30 12:25:21 2014 +0800 + + make create/rename/remove groups atomic transactions + +commit 103b6fee5ab8ada455131fdab7a1a0313178f8d6 +Author: ana-balica +Date: Thu Oct 30 12:23:24 2014 +0800 + + on Community name change rename auth groups + +commit 368954ffc93a40db522b631d9faf208347ccd505 +Author: ana-balica +Date: Thu Oct 30 12:23:04 2014 +0800 + + rename auth groups + unittest + +commit ae4984d7772a389dc930c4f3c8d9ce7b027caee8 +Author: ana-balica +Date: Thu Oct 30 00:41:00 2014 +0800 + + add permissions panel + unittest + +commit f2e0be6f40cf063b1fc89a004c976c738866cb64 +Author: ana-balica +Date: Thu Oct 30 00:09:33 2014 +0800 + + refactor Community unittests + +commit 44c5cf36e61aea130ba503ea4e9a45f898726580 +Author: ana-balica +Date: Wed Oct 29 23:06:43 2014 +0800 + + update JoinRequest unicode + +commit 3d80e7ae7c4f37891bbf8eff2aa96add3d63410e +Author: ana-balica +Date: Wed Oct 29 23:00:34 2014 +0800 + + refactor UserView tests and add tests for profile and membership panels + +commit 728f0f98b6eeefce3cc3415bb308e73317ccdc66 +Author: ana-balica +Date: Wed Oct 29 22:58:02 2014 +0800 + + rename from UserProfileView to UserView (more generic) + +commit 22b50ff2f051f45bd63be677b2281f475527fad4 +Author: ana-balica +Date: Wed Oct 29 21:57:22 2014 +0800 + + include membership panel to user page + +commit 54391a6306db019ec843d82aca908fabfb43b56a +Author: ana-balica +Date: Wed Oct 29 21:48:44 2014 +0800 + + add JoinRequest to admin panel + +commit 29339b3f52364701353bb79dbac06d6c56f8a656 +Author: ana-balica +Date: Wed Oct 29 20:44:46 2014 +0800 + + add community_admin to community members via admin panel + +commit a104c9df7a572d368e44364e5560500f5ecd09b2 +Author: ana-balica +Date: Wed Oct 29 12:11:52 2014 +0800 + + add community_admin to community members automatically + unittests + +commit c364cd1f49c31f3768e11c9bf8e98f6c67def91e +Author: ana-balica +Date: Tue Oct 28 11:23:22 2014 +0800 + + update add/remove member + +commit 97ccab196493e6dbc626f9a96ac2ba62b8547209 +Author: ana-balica +Date: Tue Oct 28 08:29:44 2014 +0800 + + remove community groups on Community delete + unittest + +commit 0fe79b1d7c91fed079b9f58ddbddd5bebd43470b +Author: ana-balica +Date: Tue Oct 28 08:15:57 2014 +0800 + + Community add/remove member + unittest + +commit bd3db3ca0d5b3f1749e966e29a09fe2e65fb2ea8 +Author: ana-balica +Date: Tue Oct 28 08:04:02 2014 +0800 + + enable objects-level-permissions for Community model in admin panel + +commit 3128352fd4ddc6f70c6a0ddc9d335a6bb3b468fb +Author: ana-balica +Date: Tue Oct 28 08:00:21 2014 +0800 + + Community init bugfix + +commit 2814e949f4297acd7ac1cf72491f1c6ffa3f9130 +Author: ana-balica +Date: Mon Oct 27 15:46:43 2014 +0800 + + test user profile view + +commit d33240074318e159d9e4ef60cf31c74f81ea4eb3 +Author: ana-balica +Date: Mon Oct 27 15:26:11 2014 +0800 + + custom account adapter for valid redirects + +commit cf30cb0010260ee5a2fe80842442985a3c56c9dc +Author: ana-balica +Date: Mon Oct 27 15:18:04 2014 +0800 + + user profile view+template+route + +commit 5ac1ee5355cf7db62fe68a3cb617c49b49fdfb95 +Author: ana-balica +Date: Mon Oct 27 12:14:50 2014 +0800 + + add verbose name templatetag + +commit 8621a0c3b812b1da412cdb147afeb1e84cb0cac5 +Author: ana-balica +Date: Mon Oct 27 12:14:16 2014 +0800 + + override Django User unicode + unittest + +commit 9f716fd68c31ea511d00ea119aa9f06e6ccdaa4a +Author: ana-balica +Date: Mon Oct 27 12:12:39 2014 +0800 + + add bootstrap3 fonts + +commit af42b65b5025416990a0cae9d06f2c51e3b04058 +Author: ana-balica +Date: Sun Oct 26 11:36:53 2014 +0800 + + set the account URLs + +commit ec380c75d860fe2165858335468eda15d1e231c2 +Author: ana-balica +Date: Sun Oct 26 11:29:44 2014 +0800 + + style login page + +commit 2e6279da3942f4f87e4d9fe5fdbb953712530575 +Author: ana-balica +Date: Sun Oct 26 11:29:22 2014 +0800 + + add django-crispy-forms with bootstrap3 stylepack + +commit 6bddfbc2eb483b552167bc422cf80aba2da46783 +Author: ana-balica +Date: Sat Oct 25 14:45:51 2014 +0800 + + contribution guidelines documentation + +commit 9379632a885ca1fb8022a3e5dd423c072fd4d6e7 +Author: ana-balica +Date: Sat Oct 25 13:51:47 2014 +0800 + + fix links from markdown to restructured text + +commit 33e5a96c30af3733a5b5d02c8320356fadf88965 +Author: ana-balica +Date: Sat Oct 25 13:47:24 2014 +0800 + + add PEP8 prerequisite + +commit 783ebacfa0bd09c90ff63eaa1ed154f327808e4e +Author: ana-balica +Date: Thu Oct 23 23:45:04 2014 +0800 + + documentation: describe development prerequisited + +commit 5e18c9f114c4e88aacf215476e4cee5b11bbb2e2 +Author: ana-balica +Date: Thu Oct 23 01:06:31 2014 +0800 + + update travis.yml to run tests using testing settings + +commit 8adfea6464ca3de6e671ccb659a81251c39d6f7e +Author: ana-balica +Date: Wed Oct 22 22:28:19 2014 +0800 + + convert systers_initiatives from png to jpg + +commit dd7dba110eb248f77f034edb9e6d3790d2506454 +Author: ana-balica +Date: Wed Oct 22 22:25:53 2014 +0800 + + fix XViewMiddleware path - RemovedInDjango18Warning + +commit a521ad3d7a08ab83f7d21f503d99edea2c58174b +Author: ana-balica +Date: Wed Oct 22 22:22:00 2014 +0800 + + index/langing page + + Includes: + * template and styling + * view + * routing + * unittest + +commit e0e11a4bd68590b2e07e2910f8369686cf4401bf +Author: ana-balica +Date: Wed Oct 22 16:09:06 2014 +0800 + + create base template file + +commit b97f0c3b17932de36559210aa8137dd3ada6865c +Author: ana-balica +Date: Wed Oct 22 16:00:34 2014 +0800 + + add static files dirs to settings + +commit 02b6964ca8acd5263b7819b19f359ae14d0cb920 +Author: ana-balica +Date: Wed Oct 22 13:58:06 2014 +0800 + + remove obsolete templates + +commit 182fd80956de79974d05d4cfa2ddbeb4b4aee851 +Author: ana-balica +Date: Sat Oct 11 22:16:58 2014 +0300 + + add bootstrap theme + +commit 0931a211036074ec896008940fa433641220e04f +Author: ana-balica +Date: Sat Oct 11 01:00:39 2014 +0300 + + implement manage_community_groups + unittest + +commit 8e0caa01a1b59a04a1eb41f30a094da5b3975d13 +Author: ana-balica +Date: Fri Oct 10 21:29:39 2014 +0300 + + add Community methods to check if name or admin changed + unittests + +commit 289e90ee0877901301113f6d75d44e538b380ffc +Author: ana-balica +Date: Fri Oct 10 20:38:10 2014 +0300 + + add remove groups util function + unittest + +commit 51d7161bb4361efbc0f9afc05b9068824ef0363e +Author: ana-balica +Date: Fri Oct 10 20:24:51 2014 +0300 + + store original name and community admin to the instance + unittests + +commit 8def2adad92d2e2dee61b317205ae6daeacb88eb +Author: ana-balica +Date: Fri Oct 10 20:20:08 2014 +0300 + + signal to manage community groups definition + +commit 712a6e9d1eaeeae1a25291bef7e8575952f90cc9 +Author: ana-balica +Date: Fri Oct 10 20:19:03 2014 +0300 + + move groups templates to constants + +commit e1293e2c2f30bba04c7158238959fc1e6d2cbe6c +Author: ana-balica +Date: Tue Oct 7 12:45:21 2014 +0300 + + SystersUser join and leave group + unittests + +commit 8765d8a2b481affebd75f9954472ea6320bc5167 +Author: ana-balica +Date: Tue Oct 7 12:12:56 2014 +0300 + + assign permissions to community groups + unittests + +commit 10f846574e7308e0052685aa89fbd6afb8386c0c +Author: ana-balica +Date: Tue Oct 7 12:12:26 2014 +0300 + + add django-guardian package for row-level permissions + +commit ed1ccd577774df8302c157458f554737da214685 +Author: ana-balica +Date: Tue Oct 7 00:57:56 2014 +0300 + + create groups according to community name + unittest + +commit c9e0165faf8512efc658c92ca40b61166dd2d799 +Author: ana-balica +Date: Tue Oct 7 00:57:28 2014 +0300 + + list community permissions and groups + +commit 45735143a1aff11184646a41a37013cc0a5f9ded +Author: ana-balica +Date: Tue Oct 7 00:23:34 2014 +0300 + + add custom permission to Community model + +commit 831c82124e45228da4a6053377c04ea61699dd12 +Author: ana-balica +Date: Tue Oct 7 00:22:54 2014 +0300 + + add JoinRequest model + +commit 56df73244776222a84f70db6c9f909482287851f +Author: ana-balica +Date: Sun Sep 28 23:50:37 2014 +0300 + + Comment model in common app + +commit 7f30b86a8a0e628d100d3f089ce782e3bd649124 +Author: ana-balica +Date: Sun Sep 28 23:50:08 2014 +0300 + + migrations for RichTextField + +commit 50f0a7673468dcc3f8fad0896ff33eea3ffb2b38 +Author: ana-balica +Date: Sun Sep 28 01:29:35 2014 +0300 + + close #23 - add to README on how to generate docs + +commit 759902a6e8f1466de47fc3c5be282ef8fe80bbf0 +Author: ana-balica +Date: Sun Sep 28 01:02:15 2014 +0300 + + ignore media files + +commit 74ca163dccfca143191cd820b9fcfb7658697026 +Author: ana-balica +Date: Sun Sep 28 01:00:29 2014 +0300 + + add and configure django-ckeditor for wysiwyg + +commit 7c404e42905a1e0cc4df9300dabed1f27ffcc7cf +Author: ana-balica +Date: Sat Sep 27 23:00:15 2014 +0300 + + remove obsolete settings and urls + +commit 1f493b4d476f7e68d823f42bdc8a3bb598efe84d +Author: ana-balica +Date: Sat Sep 27 22:58:21 2014 +0300 + + remove dashboard app + +commit 42508d4ec03f647b4a1dcfba0536c33138d05bd3 +Author: ana-balica +Date: Sat Sep 27 22:56:53 2014 +0300 + + add CommunityPage model + +commit a292937b929557782d7fd5b69db4233b5ee8cc6b +Author: ana-balica +Date: Sat Sep 27 22:56:36 2014 +0300 + + create blog app and common Post model + +commit ff218b67426a8d16d3b67168014ce58bc10bced1 +Author: ana-balica +Date: Sat Sep 27 22:21:52 2014 +0300 + + create community app with Community model + +commit 93187c061b08a51ef46e0017969aff12dae2701f +Author: ana-balica +Date: Wed Sep 24 19:10:52 2014 +0300 + + exclude migrations from flake8 linter and fix a warning + +commit db90d9196c0337ba57cfcdc3822fa7378bc4ae41 +Author: ana-balica +Date: Wed Sep 24 18:57:10 2014 +0300 + + add SystersUser tests + +commit 3d3fca1e9f9908f33f2ed32ac7242536938a739c +Author: ana-balica +Date: Wed Sep 24 18:56:40 2014 +0300 + + disable doctests options temporarily + +commit b6562dd244bf0f1549303d67a26e9892179aabdf +Author: ana-balica +Date: Wed Sep 24 18:56:10 2014 +0300 + + create users app + + * move SystersUser model + * register to admin panel + * add initial migration + +commit e4c8057d009f7c9e9ff9489b8d9bb7e6033972c4 +Author: ana-balica +Date: Wed Sep 24 09:12:32 2014 +0300 + + configure email backend for local development + +commit febf263cf3a76098c42a2a6df1f297c531dcae96 +Author: ana-balica +Date: Wed Sep 3 19:59:05 2014 +0300 + + move requirements to a folder and update to Django 1.7 + + Additionally remove django-cms which makes migrations fail with Django1.7 + +commit 1538848e65715ef38a8d6fda53b488e0485c63aa +Author: ana-balica +Date: Fri Aug 22 12:38:47 2014 +0300 + + update packages to latest versions + +commit 9a2e265018c52064f2f6da0ff67215f353ba4996 +Merge: 6e07b5c bc55f63 +Author: Lynn Root +Date: Fri Jul 11 13:14:32 2014 -0700 + + Merge pull request #22 from ana-balica/social-login-documentation + + Social login documentation + +commit 6e07b5c2ce196e43c4bfa595d5e82640ef29da41 +Merge: 9790ff5 3022a57 +Author: Lynn Root +Date: Fri Jul 11 13:08:25 2014 -0700 + + Merge pull request #18 from ana-balica/test_settings + + Update testing settings + +commit 9790ff5355ac2161cb853904d46d07b555aa4955 +Merge: cdf1f9d b63b174 +Author: Lynn Root +Date: Fri Jul 11 13:02:56 2014 -0700 + + Merge pull request #16 from ana-balica/dashboard_decorators + + Add view decorators for checking membership, authorship and admin rights + +commit cdf1f9d2625ce0d1b89ab5e001bcce33f554810f +Merge: ef83799 db5b31d +Author: Lynn Root +Date: Fri Jul 11 12:57:01 2014 -0700 + + Merge pull request #7 from ana-balica/allauth + + Add and configure django-allauth package + +commit 3022a575c9453aec3dcd275c10db0a9397252e64 +Author: ana-balica +Date: Wed Jul 9 18:27:50 2014 +0200 + + set NOSE_ARGS in testing settings and update README on running tests + +commit bc55f636970dc192af91e0d8bff88252e1526773 +Author: ana-balica +Date: Tue Jul 8 15:42:45 2014 +0200 + + configuration of social accounts documentation + +commit faf1466bd745b4a60a3f80b0b2d6504b031b2a54 +Author: ana-balica +Date: Tue Jul 8 15:41:54 2014 +0200 + + change sphinx theme + +commit b63b174ffec387c2b0a35d936b2e0bbdd8360232 +Author: ana-balica +Date: Wed Jul 2 12:40:15 2014 +0200 + + add view decorators for checking membership, authorship and admin rights + +commit db5b31d995cd3aa2d517d9d8085e24d8c617f4fa +Author: ana-balica +Date: Wed Jul 9 10:54:00 2014 +0200 + + create SysterUser on auth user signup + unittests + +commit 0e52c00ebe9707eb8e8213c86a43ebe4f65ebf57 +Author: ana-balica +Date: Wed Jul 9 10:50:32 2014 +0200 + + add django-allauth package + + Rename `base.html` used for cms pages to not conflict with general templates. + +commit ef837995a128abdcac45d1b5395bd05a16c8e4d8 +Merge: eb84c79 3f8dfca +Author: Lynn Root +Date: Tue Jul 8 12:35:35 2014 -0700 + + Merge pull request #15 from ana-balica/separate_requirements + + close #11 - create separate requirements files for prod and dev + +commit 3f8dfca1b89784e48593e2c26f174975067ac266 +Author: ana-balica +Date: Wed Jul 2 08:05:55 2014 +0200 + + close #11 - create separate requirements files for prod and dev + +commit eb84c79bf183f17e5d10a303f93fd269c0ecb755 +Merge: 5fc3552 5a08810 +Author: Lynn Root +Date: Tue Jul 8 11:09:15 2014 -0700 + + Merge pull request #14 from ana-balica/group-permissions + + Create user groups and assign permissions on post_syncdb signal + +commit 5a088100cfab42a6708070184aa5120e653b9305 +Author: ana-balica +Date: Tue Jul 8 20:05:16 2014 +0200 + + create user groups on post_syncdb signal + +commit 5fc3552db0c81d76296b855c11d68d8770dcea13 +Merge: 054ae48 583c4c6 +Author: Lynn Root +Date: Tue Jul 8 09:24:59 2014 -0700 + + Merge pull request #9 from dweep123/dashboard_models + + Dashboard models + +commit 583c4c6337f04a2d444e7db9ae2f73826aee25fd +Author: chitra +Date: Thu Jun 26 03:11:57 2014 +0530 + + Added tests for models + + Changed CommunityPages to CommunityPage + + Added tests for models + + deleted unwanted files + + Removed credentials + Added tests for models + + Run flake8 + Added tests for models + + Added tests for models + + Added tests for models + + Changed Line breaks + Added tests for models + + Added Tests for models + Added Tests for models + + requirements in alphabetical order + Added Tests for models + + requirements in alphabetical order + Added Tests for models + + Added tests for models + Added tests for models + Added tests for models + + Ignore never used flake8 errors + + Added slug field + + Added tests for models + +commit 054ae485684b9bfd7a4384b31211a88b9d6776cc +Merge: e11cab3 11d863c +Author: Lynn Root +Date: Fri Jun 27 15:46:00 2014 -0700 + + Merge pull request #13 from ana-balica/travisci-status + + Close #12 - add travis-ci status icon to README.md + +commit 343861fbb0df7438a506f26b5f0daefbdccb1881 +Author: chitra +Date: Wed Jun 25 02:17:06 2014 +0530 + + Added dashboard models + +commit 11d863c73ae56d409c284fc5ecad3562dc538d2b +Author: ana-balica +Date: Wed Jun 25 17:34:15 2014 +0200 + + close #12 - add travis-ci status icon to README.md + +commit e11cab34c1bf78f6d6e1bb49b0b9ca9be01a0e0b +Merge: e13864a 4c263ed +Author: Lynn Root +Date: Tue Jun 24 16:25:32 2014 -0700 + + Merge pull request #10 from dweep123/django-cms + + django-cms setup + +commit e13864abd9b9fa0261b95aa8495a8369b9d49e49 +Author: ana-balica +Date: Wed Jun 25 00:40:02 2014 +0200 + + set encrypted env var for travis-ci in `.travis.yml` + + @econchick said it was okay to push to master + +commit 4c263edeb75a3bc01d5b8b1f136fde81d6a134a3 +Author: chitra +Date: Wed Jun 25 02:49:06 2014 +0530 + + Removed dependencies + + Remove another dependency + + Removed dependencies + +commit 6816e8430865d69e628a681cb10f86125719905b +Author: chitra +Date: Wed Jun 25 01:04:58 2014 +0530 + + django-cms setup + + Pep8 style and removed password and username + + django-cms setup + + Changed page template + + django-cms setup + +commit 72f9ac0166a3922d20f9f29e5acc176a0e28aba4 +Merge: 68c205f 7c4d526 +Author: Rose Robinson +Date: Fri Jun 20 08:49:10 2014 -0700 + + Merge pull request #6 from ana-balica/travisci + + add .travis.yml + +commit 68c205fbf66e97d4c523a56983ad8997c821e228 +Merge: 8675771 3cf7b32 +Author: Rose Robinson +Date: Fri Jun 20 08:47:24 2014 -0700 + + Merge pull request #3 from ana-balica/django-setup + + django start project + +commit 7c4d52683adae4d298fb68fd129de85fd9fae2e0 +Author: ana-balica +Date: Fri Jun 20 00:44:52 2014 +0300 + + add .travis.yml + +commit 3cf7b32459a84047ab60d7b86f78497f722fe82a +Author: ana-balica +Date: Thu Jun 19 22:58:16 2014 +0300 + + update README with steps to setup the project + +commit 41b2998ea4a662596226acf2ee861ed2649d5e13 +Author: ana-balica +Date: Thu Jun 19 17:36:55 2014 +0300 + + add and configure django-nose + +commit c221822ba6956102eadb9882031df28fd216d037 +Author: ana-balica +Date: Thu Jun 19 17:35:08 2014 +0300 + + add flake8 + + Warning F403 "‘from module import *’ used; unable to detect undefined names" is ignored + +commit 69a201555d44860bbded02b600eb22b94a3cfaa4 +Author: ana-balica +Date: Thu Jun 19 17:34:26 2014 +0300 + + django start project + +commit 8675771bdf2a79d46a1762886bac0748026dc89d +Merge: c970fdb 690c71c +Author: Rose Robinson +Date: Mon Jun 9 07:09:00 2014 -0700 + + Merge pull request #1 from ana-balica/doc-setup + + Sphinx documentation tool setup + +commit 690c71c1bbf91dd7f2c04c10f349b6ddf00a9931 +Author: ana-balica +Date: Mon Jun 2 21:12:51 2014 +0300 + + remove wsgiref from requirements.txt + +commit a13f93e92be020618c387c739e548e34aa8feaf2 +Author: ana-balica +Date: Sun Jun 1 23:50:21 2014 +0300 + + remove dependency packages from requirements.txt + +commit a7ffcd2b5327bdc1187355feba50ffc2c40c5f28 +Author: ana-balica +Date: Mon May 5 11:22:02 2014 +0200 + + update README.md + + Include: + * instalation instructions for developers + * links to documentation + +commit 3ae7e23116b7b0c62e2438c00bb6198f69d4f1a6 +Author: ana-balica +Date: Mon May 5 11:03:22 2014 +0200 + + ignore documentation builds + +commit f09e7f102a0d2a53a1d9bdd1c4d1361bd901d2e7 +Author: ana-balica +Date: Mon May 5 10:59:38 2014 +0200 + + move requirements PDF to a new folder + +commit 78d4983502591dceb1aaf7aed77bb168a552b850 +Author: ana-balica +Date: Mon May 5 10:59:11 2014 +0200 + + set up sphinx documentation generator + +commit ba825e8fdbcc0d2ce89156969719fcf97f78b840 +Author: ana-balica +Date: Mon May 5 10:46:46 2014 +0200 + + add sphinx to venv and freeze requirements + +commit 93380ab79a0b8e4f6a4ffa7dd3e80d6259e75bbd +Author: ana-balica +Date: Mon May 5 10:42:55 2014 +0200 + + add .gitignore + + Contains: + * common binaries and autogenerated files + * virtualenv + * IDE specific files + +commit c970fdbdc9abee8247e679c2f6f437f694c89979 +Author: Rose Robinson +Date: Mon Apr 28 06:31:54 2014 -0700 + + Delete ~$sters_GSoC14_Portal_Requirements.docx + +commit 1764f61955022c1417a4536a2bba0b983252f7fa +Author: Rose Robinson +Date: Mon Apr 28 06:31:47 2014 -0700 + + Delete Systers_GSoC14_Portal_Requirements.docx + +commit 576841a03b3cdbe9b70cbf33c0d9d7e01103900e +Merge: 469352a a71f668 +Author: Rose Robinson +Date: Mon Apr 28 06:10:04 2014 -0700 + + Merge branch 'master' of https://github.com/systers/portal + +commit a71f668ba1a900f072c5b2f843694944ff5324e6 +Author: Rose Robinson +Date: Tue Apr 22 07:22:02 2014 -0700 + + Update README.md + +commit a0bd342216b078928351e1cfe38afc6d548828a2 +Author: Rose Robinson +Date: Mon Apr 21 19:56:07 2014 -0700 + + Update README.md + +commit 469352aefac707236cc850bc0e7069c7e8247967 +Author: Rose Robinson +Date: Mon Apr 21 19:49:09 2014 -0700 + + Initial version of portal requirements. + +commit 4c389d249d5269b9038ec024af79f6f2244c4ee6 +Author: Rose Robinson +Date: Mon Apr 21 19:45:17 2014 -0700 + + Initial version of portal requirements document. + +commit f8d4450eb8045d3eab30ad82774a27d33e2d359a +Author: Rose Robinson +Date: Mon Apr 21 19:29:14 2014 -0700 + + Initial commit