Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Saarang production merge to master #113

Open
shahidhk wants to merge 249 commits into
base: master
Choose a base branch
from
Open

Saarang production merge to master #113

shahidhk wants to merge 249 commits into from

Conversation

@shahidhk
Copy link
Contributor

@shahidhk shahidhk commented Mar 28, 2015

Any thoughts?

saarangwebadmin and others added 30 commits July 31, 2014 18:28
@saarangwebadmin
Some changes
794c00e
@arun2596
added contacts to mobile api
4c1f760
@shahidhk
Fixed some permission and finace portal not visible to non cores issue
9c348db
@shahidhk
Fixed merge conflicts
9bad460
@shahidhk
Merge branch 'saarang_production' of github.com:The-WebOps-Club/fest-…
b22de38 
…api into saarang_production
@akshay-balaji
Intial commit, rendering hospi_home using dajaxice
597ecac
@shahidhk
Merge branch 'master' into saarang_production
e83db45 
Conflicts:
	apps/api/mobile.py
	configs/urls.py
@shahidhk
Merge branch 'saarang_production' of github.com:The-WebOps-Club/fest-…
f240012 
…api into saarang_production
@shahidhk
Added requirements properly
8a5d858
@shahidhk
Merge branch 'saarang_production' of github.com:The-WebOps-Club/fest-…
3c4c24f 
…api into saarang_production
@shahidhk
Changed migration in events, dont know how it will affect shaastra pr…
e9086a4 
…oduction
@akshayutture
events coords now allowed to access the edit events tab
decfc54
@akshayutture
Merge branch 'events_portal' of https://github.com/The-WebOps-Club/fe…
b21937f 
…st-api into events_portal
@akshayutture
Revert "events coords now allowed to access the edit events tab"
8cda584 
This reverts commit decfc54.
@akshayutture
Date picker and coords multiselect added. pre tag used to display eve…
09a2381 
…nt tab description in multiple lines. Now only thing left is to fix the edit tab button for multiline tab description. Idk why it is breaking
@akshayutture
events portal fully functional. only problem is that edit event canno…
a278838 
…t take html. i.e links cannot be posted
@akshayutture
minor bug fix
23a40ee
@arun2596
merged events portal
34d5cb9
@arun2596
Merge branch 'events_portal' of https://github.com/The-WebOps-Club/fe…
36d3097 
…st-api into events_portal
@shahidhk
Merge branch 'events_portal' of github.com:The-WebOps-Club/fest-api i…
a20c639 
…nto events_portal
@shahidhk
Merge branch 'events_portal' into saarang_production
9b2b239
@akshayutture
Revert "minor bug fix"
dfe8f9a 
This reverts commit 23a40ee.
@akshayutture
3 new models and delete event feature added
ac42f4b
@akshayutture
events_portal 100% functional finally. events_description, etc fixed
f505e35
@akshayutture
small bug fix. events_portal is fixed
62eab8e
@shahidhk
Merge branch 'saarang_production' of github.com:The-WebOps-Club/fest-…
82d4ad7 
…api into saarang_production
@arun2596
Merge branch 'events_portal' of https://github.com/The-WebOps-Club/fe…
a449371 
…st-api into events_portal
@shahidhk
Added short name for categories
7573185
@arun2596
added event api
296da79
@shahidhk
Fixed conflicts
84506f1
akshay-balaji and others added 22 commits January 6, 2015 19:28
@akshay-balaji
partial feedbacks added
f461f69
@akshay-balaji
added ajax.py
2217986
@akshay-balaji
Hospi
95e42ec
@shahidhk
Merge branch 'saarang_production' of github.com:The-WebOps-Club/fest-…
5b5193b 
…api into saarang_production
@akshay-balaji
intermediate
46a2fa1
@akshay-balaji
Merge branch 'saarang_production' into hospi_portal
2ee6ef0
@akshay-balaji
Added Add a Team(Improved)
d9f7760
@shahidhk
Edited template
6bc3fcf
@akshay-balaji
hospi again
b00f9ce
@akshay-balaji
hospi_merge
1338ed8
@akshay-balaji
form_correct
89ec472
@shahidhk
Changed header bill
3881dd8
@shahidhk
Edited bill template
c276b0b
@shahidhk
Merge branch 'saarang_production' of github.com:The-WebOps-Club/fest-…
e2e1a19 
…api into saarang_production
@shahidhk
Merge branch 'saarang_production' of github.com:The-WebOps-Club/fest-…
f5ac0a9 
…api into saarang_production
@akshayutture
branch field fix
aebaecb
@akshayutture
Merge branch 'qmsportal2' into saarang_production
46140ad
@shahidhk
Server edits
164a761
@shahidhk
Merge branch 'saarang_production' of github.com:The-WebOps-Club/fest-…
7ff9abb 
…api into saarang_production
@akshay-balaji
Added OHM
97b0810
@shahidhk
server edits
6929e66
@shahidhk
Merge branch 'saarang_production' of github.com:The-WebOps-Club/fest-…
5743510 
…api into saarang_production
@shahidhk
Copy link
Contributor Author

shahidhk commented Mar 28, 2015

@AbdealiJK We will merge these?

@AbdealiLoKo
Copy link
Contributor

AbdealiLoKo commented Mar 28, 2015

I am so not gonna review this :P
:D I suggest you make a fork and try it there first.

On Sat, Mar 28, 2015 at 2:41 PM, Shahidh K Muhammed <
[email protected]> wrote:

@AbdealiJK https://github.com/AbdealiJK We will merge these?

Reply to this email directly or view it on GitHub
#113 (comment)
.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@shahidhk @AbdealiLoKo @saarangwebadmin @arun2596 @akshay-balaji @akshayutture