Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: elkarte/Elkarte
base: 08fd92971427
Choose a base ref
...
head repository: elkarte/Elkarte
compare: 19f3e23a6ad9
Choose a head ref
  • 19 commits
  • 5 files changed
  • 2 contributors

Commits on May 19, 2013

  1. Save a query for all guests on the post screen and that same saved qu… 

    …ery can also save a query in other occasions

Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    7e2ad64 View commit details
    Browse the repository at this point in the history

  2. add createPoll() 

    add addPollOptions()
Change the post controller to use these new functions
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    2069340 View commit details
    Browse the repository at this point in the history

  3. Calendar events have subs 

    Global $user_settings
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    d7f32c8 View commit details
    Browse the repository at this point in the history

  4. get rid of getTopic() in the Post controller in favor of a subs funct… 

    …ion and a little bit of code in the controller

Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    702a542 View commit details
    Browse the repository at this point in the history

  5. add is_ignored check 

    Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    d3130ee View commit details
    Browse the repository at this point in the history

  6. selectMessages() can now be used to get messages before and after a m… 

    …sg in a topic

Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    0e19d4b View commit details
    Browse the repository at this point in the history

  7. Change from $smcFunc to $db 

    Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    cc980d5 View commit details
    Browse the repository at this point in the history

  8. Forgot globals 

    Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    c0f706f View commit details
    Browse the repository at this point in the history

  9. Woops... like database() much better than a global :) 

    Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    407ba16 View commit details
    Browse the repository at this point in the history

  10. Don't use $context in subs. 

    Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    ae87844 View commit details
    Browse the repository at this point in the history

  11. Move is_ignored back to Post.controller.php 

    Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    ac4d85f View commit details
    Browse the repository at this point in the history

  12. createPoll shouldn't have so many optional parameters 

    Also, $id_member should have been used in place of $user_info
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 19, 2013
    Copy the full SHA
    4518249 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2013

  1. Need $id_poll 

    Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 20, 2013
    Copy the full SHA
    da5dd17 View commit details
    Browse the repository at this point in the history

  2. Okay, so I didn't move it per se... I copied it. 

    Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
    @joshuaadickerson
    joshuaadickerson committed May 20, 2013
    Copy the full SHA
    f1559bf View commit details
    Browse the repository at this point in the history

  3. Fix query to send the right parameter. Small reordering of new poll c… 

    …ode in Post controller.

Signed-off-by: Norv <a.w.norv@gmail.com>
    @norv
    norv committed May 20, 2013
    Copy the full SHA
    4936810 View commit details
    Browse the repository at this point in the history

  4. Calendar title was htmlspecialchar-ed twice. Remove redundant updateS… 

    …ettings()

(calendar .subs functions trigger update themselves)

Signed-off-by: Norv <a.w.norv@gmail.com>
    @norv
    norv committed May 20, 2013
    Copy the full SHA
    fb83852 View commit details
    Browse the repository at this point in the history

  5. id_member wasn't retrieved in selectMessages. 

    Fix $only_approved expression.
Fix template to display the message body.

Signed-off-by: Norv <a.w.norv@gmail.com>
    @norv
    norv committed May 20, 2013
    Copy the full SHA
    a9b2f14 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1 from norv/elkpr/425 

    Elkpr/425
    @joshuaadickerson
    joshuaadickerson committed May 20, 2013
    Copy the full SHA
    ef93a84 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #425 from joshuaadickerson/Post_new 

    Post
    @norv
    norv committed May 20, 2013
    Copy the full SHA
    19f3e23 View commit details
    Browse the repository at this point in the history