Jeremy D
|
9a0f76dc8c
Merge branch 'master' of github.com:SimpleMachines/SMF2.1
|
12 years ago |
emanuele
|
f7a8fa186b
Restored the unapprove button...
|
12 years ago |
emanuele45
|
7e4ba0b286
Merge pull request #111 from emanuele45/master
|
12 years ago |
emanuele
|
16593fc3fa
Fixed quick login after theme merge (forgot token in the hashing)
|
12 years ago |
emanuele
|
d40298396c
Remove the toggle menu entri, it is a profile option, not something that should be changed every page load
|
12 years ago |
emanuele45
|
9f866232b0
Merge pull request #109 from emanuele45/master
|
12 years ago |
emanuele
|
3a7770e996
A couple of help popups I broke while merge the new theme
|
12 years ago |
emanuele
|
e8988d8756
Show the avatar is now an option (template_init) and retrieved from the db only if the theme wants it
|
12 years ago |
emanuele
|
202bfc965a
Merged knownInt/Floats in integrate_change_member_data hook
|
12 years ago |
emanuele45
|
33e77b47fd
Merge pull request #108 from emanuele45/ant_master
|
12 years ago |
Antechinus
|
c256c61a42
Hey, new theme. Shit happens.
|
12 years ago |
Jeremy D
|
11d4bc87f5
Merge pull request #96 from emanuele45/profile_fields_validation
|
12 years ago |
Spuds
|
0539ae0587
! Some source changes for linktree and pageindex to help with themeing
|
12 years ago |
Spuds
|
bf6cc5ddce
Merge branch 'SomeFixes' of https://github.com/Spuds/Playpen
|
12 years ago |
Spuds
|
41831f4713
! do the gecko check with firefox checks
|
12 years ago |
Jeremy D
|
cae843eec3
Update .gitignore
|
12 years ago |
Jeremy D
|
01e099f9ce
By default we shouldn't try to convert non-compatible passwords. Conversions should enable this option automatically to allow proper conversion of passwords. There is no reason to attempt to fix these passwords for SMF installs that are not conversions and is just a waste of resources to do so.
|
12 years ago |
emanuele45
|
697be1996e
Merge pull request #104 from jdarwood007/master
|
12 years ago |
Jeremy D
|
f523de3321
Merge branch 'master' of github.com:SimpleMachines/SMF2.1
|
12 years ago |
emanuele45
|
5881661289
Merge pull request #70 from emanuele45/announce_topics
|
12 years ago |
emanuele
|
32cffa6bf4
Of course the topic id should be logged too... - Thanks live627 to point it out
|
12 years ago |
emanuele
|
2933d1ff8c
Logging the announce action and show a warning when editing the first message of the topic (NOT TESTED) [Topic 478383]
|
12 years ago |
emanuele45
|
0baa309f69
Merge pull request #67 from emanuele45/hooks
|
12 years ago |
emanuele
|
dba0278a6e
Let's send the announcement to the announcer too [Topic 478383]
|
12 years ago |
emanuele45
|
3038bf25a8
Merge pull request #100 from live627/comma_format
|
12 years ago |
Spuds
|
a482abc221
Merge branch 'SomeFixes' of https://github.com/Spuds/Playpen
|
12 years ago |
Spuds
|
fbffd94a73
! Div icon overlay was not showing
|
12 years ago |
Spuds
|
a6293f22df
! Remove some ie4, ie5, ie5.5 code that is no longer needed for 2.1
|
12 years ago |
Jeremy D
|
9295a4ad2d
Lets add a ignore file so we don't accidently commit certain files or changes to some files
|
12 years ago |
Spuds
|
46513d4d1e
Merge branch 'SomeFixes' of https://github.com/Spuds/Playpen
|
12 years ago |