Closed alex9311 closed 9 years ago
Yeah I'm good with the changes :) On 2 Apr 2015 02:00, "Alex Simes" notifications@github.com wrote:
This is a pretty big change, I moved a lot of the files around. I got everything on the front end working again with the file moves. Feel free to test here: http://54.93.120.201/alex/project/app/index.php
I also started making an admin panel that will let us easily reset/repopulate the DB see here: http://54.93.120.201/alex/project/database/repopulate/admin_page.php
I want to make sure @GizKockesen https://github.com/GizKockesen and @millenniumproof https://github.com/millenniumproof are OK with the file moves I made before merging, see issue #64
https://github.com/alex9311/TUD-Information-Retrieval-Group-02/issues/64
You can view, comment on, or merge this pull request online at:
https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65 Commit Summary
- refactored pages dir, implemented admin panel for full data mock
File Changes
- R app/crowdflower/GetJSONresultsCrowdFlower.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-0 (0)
- R app/crowdflower/crowdflower_admin_page.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-1 (0)
- R app/page_functions/submit_functions.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-2 (2)
- R app/page_functions/top_ideas_functions.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-3 (0)
- A app/page_functions/vote_functions.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-4 (52)
- M app/pages/idea.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-5 (2)
- D app/pages/print_ideas_table.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-6 (32)
- M app/pages/submit.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-7 (2)
- M app/pages/top_ideas.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-8 (2)
- M app/pages/vote.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-9 (2)
- D app/pages/vote_functions.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-10 (56)
- R database/csv_import_export/send_ideas_from_csv_to_mysql.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-11 (0)
- R database/csv_import_export/send_ideas_from_mysql_to_csv.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-12 (0)
- A database/repopulate/admin_page.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-13 (47)
- A database/repopulate/import_csv.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-14 (124)
- A database/repopulate/repopulate.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-15 (18)
- A database/repopulate/resetdb.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-16 (63)
- A database/repopulate/resources/idea_mocked_csv.png https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-17 (0)
- A database/repopulate/upload_new_csv.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-18 (41)
- A database/repopulate/upload_new_image.php https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65/files#diff-19 (74)
Patch Links:
- https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65.patch
https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65.diff
— Reply to this email directly or view it on GitHub https://github.com/alex9311/TUD-Information-Retrieval-Group-02/pull/65.
ok! And Miriam and I discussed it in the issue so I think I'm good to merge!
@millenniumproof here is the URL for that crowdflower handle now: http://54.93.120.201/alex/project/app/crowdflower/GetJSONresultsCrowdFlower.php
This is a pretty big change, I moved a lot of the files around. I got everything on the front end working again with the file moves. Feel free to test here: http://54.93.120.201/alex/project/app/index.php
I also started making an admin panel that will let us easily reset/repopulate the DB see here: http://54.93.120.201/alex/project/database/repopulate/admin_page.php
I want to make sure @GizKockesen and @millenniumproof are OK with the file moves I made before merging, see issue https://github.com/alex9311/TUD-Information-Retrieval-Group-02/issues/64