 Michael Eshom
|
a686226858
Finally fixed conflicts thanks to Tortoise
|
10 years ago |
|
Michael Eshom
|
bb89aac177
Still trying to resolve merge conflicts...
|
10 years ago |
|
Michael Eshom
|
a9fb565653
More merge conflict fixes
|
10 years ago |
|
Michael Eshom
|
3631f24421
Remove extraneous tab
|
10 years ago |
|
Michael Eshom
|
0c86b592d2
Fix merge conflicts
|
10 years ago |
|
Michael Eshom
|
bb448d05d2
! Squash remaining bugs
|
10 years ago |
|
Michael Eshom
|
37d3958e7c
! This should fix the remaining bugs...
|
10 years ago |
|
Michael Eshom
|
0db40c82eb
Even more tweaks and bugfixes
|
10 years ago |
|
Michael Eshom
|
a6b674965c
More bugfixes
|
10 years ago |
 Jessica González
|
1e57aeb4ef
Merge pull request #1460 from MissAllSunday/quick-fixes
|
10 years ago |
|
Suki
|
e33e166ce7
change $txt['origin_topic'] to 'Original Topic'
|
10 years ago |
|
Suki
|
d4067e8cd3
fix #1448
|
10 years ago |
|
Suki
|
22f493a2f3
Make the "Download new packages" to be hidden by default and make the title to be clickable to show the entire section
|
10 years ago |
|
Suki
|
4cb28d528e
Move the "Upload a Package" block to the top so users don't get confused
|
10 years ago |
|
Suki
|
a2e14e3c76
re-direct users to themes list page
|
10 years ago |
|
Michael Eshom
|
0ed10792da
! Fix a bunch of bugs found while testing
|
10 years ago |
|
Michael Eshom
|
7b4809e105
+ The rest of the 'report members' stuff (I hope)
|
10 years ago |
|
Michael Eshom
|
5de4360220
Actually notify users of reported profiles
|
10 years ago |
|
Michael Eshom
|
365e01f7b9
Merge pull request #1436 from MissAllSunday/im_fields
|
10 years ago |
|
Michael Eshom
|
7b75ad3647
SendTopic => ReportToMod
|
10 years ago |
|
Michael Eshom
|
726f9ca149
+ Initial 'report this user' functionality
|
10 years ago |
|
Michael Eshom
|
392d23dbc7
Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 into release-2.1
|
10 years ago |
|
Michael Eshom
|
b443bb82ae
! Kill the 'email user' functionality (fixes #1403)
|
10 years ago |
|
Jessica González
|
16b12fd8b7
Merge pull request #1430 from live627/a
|
10 years ago |
|
Michael Eshom
|
a55060356e
Merge pull request #1442 from Oldiesmann/release-2.1
|
10 years ago |
|
Michael Eshom
|
9449bd8d8f
! Include COPPA accounts in the count of unapproved members (fixes #1385)
|
10 years ago |
|
Michael Eshom
|
5e454244e3
Merge pull request #1441 from Oldiesmann/release-2.1
|
10 years ago |
|
Michael Eshom
|
3011df06e6
! Remove a couple of lines of now-unused code
|
10 years ago |
|
Michael Eshom
|
abf15f25e6
Merge pull request #1440 from Oldiesmann/release-2.1
|
10 years ago |
|
Michael Eshom
|
b1cb2b0f93
Accidentally killed a }
|
10 years ago |
