Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Join develop & RSR v3 #991

Closed
kardan opened this issue Jan 6, 2015 · 1 comment
Closed

Join develop & RSR v3 #991

kardan opened this issue Jan 6, 2015 · 1 comment
Assignees
@kardan
Milestone
3.0 Douglas

Comments

@kardan
Copy link
Contributor

kardan commented Jan 6, 2015

We need to join the feature/rsr_v3 and develop to get one line of development.
@kardan kardan self-assigned this Jan 20, 2015
@kardan kardan changed the title Merge develop into RSR v3 Join develop & RSR v3 Jan 20, 2015
@kardan
Copy link
Contributor Author

kardan commented Jan 20, 2015

Created a stable/2.x branch for latest 2.x release

@KasperBrandt KasperBrandt added this to the RSR v3 milestone Jan 20, 2015
kardan added a commit that referenced this issue Jan 21, 2015
@kardan
[#991] Project list widget fix + small issues
9e6befb 
- Fixed markup on project list widget to use the new project.last_update
- Removed old views.py file
kardan added a commit that referenced this issue Jan 28, 2015
@kardan
[#991] Fixed sorl.thumbnails after new vagrant box
4ad7cdc
kardan added a commit that referenced this issue Jan 28, 2015
@kardan
[#991] Reorganised migrations
2facec3
kardan added a commit that referenced this issue Feb 9, 2015
@kardan
[#991] Small changes to fix empty db status
d5be33c 
- Made sure to add auth_groups if the required onces
  are not there in save() on Employmen.
- Updated type checks in permissions
- Changed order on permission middleware
- Added a setting for required auth_groups
- In the add update template moved JS from the head to
  the jq block where $ is defined.
kardan added a commit that referenced this issue Feb 9, 2015
@kardan
[#991] Added docs for test data accounts
0b70b77
kardan added a commit that referenced this issue Feb 9, 2015
@kardan
[#991] Added new vagrant box name
2e76425
kardan added a commit that referenced this issue Feb 9, 2015
@kardan
[#991] Updated local settings template
06e9b8d
kardan added a commit that referenced this issue Feb 9, 2015
@kardan
[#991] Updated Vagrantfile
bc4f5b9
kardan added a commit that referenced this issue Feb 9, 2015
@kardan
[#991] Updated box URL to a temp one
255f044
kardan added a commit that referenced this issue Feb 9, 2015
@kardan
[#991] Updated README + fixed config issue
0a31fe3 
- Updated README with quick instructions on how to get started.
- Fixed a typo in the Vagrantfile
kardan added a commit that referenced this issue Feb 10, 2015
@kardan
[#991] Added load.sh and update Vagrant file
0d92931
kardan added a commit that referenced this issue Feb 10, 2015
@kardan
[#991] Changed . for : in chown call
f88882c 
Since some BSDs allow . (dot) in the username & we can just as well
use the more common : between group and user.
kardan added a commit that referenced this issue Feb 10, 2015
@kardan
[#991] Progress on load script
2258af3 
To be able to load and dump user images (db folder) and database content
we need two matching script. The dump script should be used to create
what we want to host on files.akvo-ops.org.
kardan added a commit that referenced this issue Feb 11, 2015
@kardan
[#991] Updated load.sh and dump.sh + used load.sh
cf3837e 
- Updated load.sh and dump.sh to now work properly
- Updated load_test_db.sh provisioning script to use load.sh
- Added short README text
kardan added a commit that referenced this issue Feb 11, 2015
@kardan
[#991] Sorl-thumbnail + load_test_db updates
4ea781f 
- Updated to latest sorl-thumbnail to get clear_delete_all management
  command.
- Updated curl to follow redirects (for Dropbox).
kardan added a commit that referenced this issue Feb 11, 2015
@kardan
[#991] Changed to use akvo-ops server
4e64874 
- Now downloading data from akvo-ops server
- Removed old code
kardan added a commit that referenced this issue Feb 11, 2015
@kardan
[#991] Updated remote data file.
6961b98 
- Generated new datafile, that is now referenced.
- Enabled migrations at the end of load_test_db.
kardan added a commit that referenced this issue Feb 12, 2015
@kardan
[#991] Cleaned up code + docs
9941155 
- Removed commented code
- Updated local settings template
- Documented how to get started.
- Added Copyright headers
- Changed to more portable shebang in load/dump scripts
kardan added a commit that referenced this issue Feb 12, 2015
@kardan
[#991] Merge branch 'feature/rsr_v3' into 991/join
ef7400a
@kardan kardan mentioned this issue Feb 12, 2015
Closed
3 tasks
KasperBrandt added a commit that referenced this issue Feb 12, 2015
@KasperBrandt
[#991] Added 'Project.last_update' to all v3 migrations
2bafed4
KasperBrandt added a commit that referenced this issue Feb 12, 2015
@KasperBrandt
Merge pull request #1090 from akvo/991/join
a04cdab 
[#991] Join 'develop' with 'feature/rsr_v3'
KasperBrandt added a commit that referenced this issue Feb 12, 2015
@KasperBrandt
Merge pull request #1091 from akvo/feature/rsr_v3
7395e8f 
[#991] Merge 'feature/rsr_v3' into 'develop'
KasperBrandt added a commit that referenced this issue Feb 12, 2015
@KasperBrandt
[#991] Disable emails
967cd23
KasperBrandt added a commit that referenced this issue Feb 12, 2015
@KasperBrandt
[#991] Disabled emails
f5b3753
KasperBrandt added a commit that referenced this issue Feb 12, 2015
@KasperBrandt
[#991] Comment out permissions
f9163e9
KasperBrandt added a commit that referenced this issue Feb 12, 2015
@KasperBrandt
[#991] Updated migrations
c59ae1b
KasperBrandt added a commit that referenced this issue Feb 12, 2015
@KasperBrandt
[#991] Added missing default values
497ef46
KasperBrandt added a commit that referenced this issue Feb 13, 2015
@KasperBrandt
[#991] Merge branch 'develop' into 1075_admin_reorder
7ebf9cf
KasperBrandt added a commit that referenced this issue Feb 13, 2015
@KasperBrandt
[#991] Updated migrations
aef2da9
@MichaelAkvo MichaelAkvo moved this to Done in RSR Dec 8, 2022
@MichaelAkvo MichaelAkvo added this to RSR Dec 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@kardan kardan

Labels
None yet
Projects
RSR
Archived in project
Milestone
3.0 Douglas
Development

No branches or pull requests
2 participants
@kardan @KasperBrandt