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: 3a692092fe3d
Choose a base ref
...
head repository: elkarte/Elkarte
compare: 06996bb8deba
Choose a head ref
  • 13 commits
  • 19 files changed
  • 2 contributors

Commits on May 30, 2013

  1. Rework of retrieveMemberData, approveMembers and enforceReactivation … 

    …to make them more flexible

Signed-off-by: emanuele <emanuele45@gmail.com>
    @emanuele45 @norv
    emanuele45 authored and norv committed May 30, 2013
    Copy the full SHA
    538a273 View commit details
    Browse the repository at this point in the history

  2. No, this is correct like this, otherwise the last check is broken 

    Signed-off-by: emanuele <emanuele45@gmail.com>

I should learn read my own functions... lol

Okay, that should fix that darn function...
    @emanuele45 @norv
    emanuele45 authored and norv committed May 30, 2013
    Copy the full SHA
    b77feba View commit details
    Browse the repository at this point in the history

  3. Fixed topic announcement, added group_name to the query in getGroups … 

    …and removed the redundant query in Announce_Controller->action_selectgroup

Signed-off-by: emanuele <emanuele45@gmail.com>
    @emanuele45 @norv
    emanuele45 authored and norv committed May 30, 2013
    Copy the full SHA
    c51946c View commit details
    Browse the repository at this point in the history

  4. Reworked retrieveMemberData to add other two conditions, allow limit … 

    …and used the function in Announce_Controller->action_send to remove a query from the controller

Signed-off-by: emanuele <emanuele45@gmail.com>
    @emanuele45 @norv
    emanuele45 authored and norv committed May 30, 2013
    Copy the full SHA
    9d67077 View commit details
    Browse the repository at this point in the history

  5. getEventProperties can query only the properties from the calendar ta… 

    …ble, used getEventProperties in Calendar_Controller instead of the query

Signed-off-by: emanuele <emanuele45@gmail.com>
    @emanuele45 @norv
    emanuele45 authored and norv committed May 30, 2013
    Copy the full SHA
    8ca4427 View commit details
    Browse the repository at this point in the history

  6. A function that creates a report or updates an existing one 

    Signed-off-by: emanuele <emanuele45@gmail.com>
    @emanuele45 @norv
    emanuele45 authored and norv committed May 30, 2013
    Copy the full SHA
    619902f View commit details
    Browse the repository at this point in the history

  7. splitTopic refactor, the function was already in Topics.subs.php 

    Signed-off-by: emanuele <emanuele45@gmail.com>
    @emanuele45 @norv
    emanuele45 authored and norv committed May 30, 2013
    Copy the full SHA
    71bb8e0 View commit details
    Browse the repository at this point in the history

  8. Some re-working of getBoardModerators to accomodate also the return o… 

    …f only the ids + created the function allBoardModerators to get the moderators of all the boards

Signed-off-by: emanuele <emanuele45@gmail.com>
    @emanuele45 @norv
    emanuele45 authored and norv committed May 30, 2013
    Copy the full SHA
    a1e02ef View commit details
    Browse the repository at this point in the history

  9. Another bunch of refactoring: board moderators and membergroups 

    A $user_info left around... Thanks Norv!

Signed-off-by: emanuele <emanuele45@gmail.com>
    @emanuele45 @norv
    emanuele45 authored and norv committed May 30, 2013
    Copy the full SHA
    2dea778 View commit details
    Browse the repository at this point in the history

  10. Another getGroupModerators 

    Fixed wrong variable name - Thanks Norv

Signed-off-by: emanuele <emanuele45@gmail.com>
    @emanuele45 @norv
    emanuele45 authored and norv committed May 30, 2013
    Copy the full SHA
    c6d6830 View commit details
    Browse the repository at this point in the history

  11. Created a membergroupById that retrieves only 1 group and used the ne… 

    …w function

Signed-off-by: emanuele <emanuele45@gmail.com>
    @emanuele45 @norv
    emanuele45 authored and norv committed May 30, 2013
    Copy the full SHA
    3ec4125 View commit details
    Browse the repository at this point in the history

  12. Missed separator. 

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

  13. Merge pull request #482 from norv/ema_r 

    reorg_function (Ema)
    @norv
    norv committed May 30, 2013
    Copy the full SHA
    06996bb View commit details
    Browse the repository at this point in the history