 Suki
|
24e0f64c06
Add the second select box with all the other custom fields
|
vor 10 Jahren |
|
Suki
|
107f491fcb
Add the before|after|unchanged select box
|
vor 10 Jahren |
|
Suki
|
9279b94858
Add the order value and a default setting for it.
|
vor 10 Jahren |
|
Suki
|
2242439ddd
Need the rest of the fields to determinate the order
|
vor 10 Jahren |
|
Suki
|
b706362955
Remove BEGIN TRANSACTION;
|
vor 10 Jahren |
|
Suki
|
4f6ad3a0f0
Merge branch 'release-2.1' of git://github.com/SimpleMachines/SMF2.1.git into cust_fields
|
vor 10 Jahren |
|
Jessica González
|
559cb150d1
Merge pull request #1463 from MissAllSunday/installer
|
vor 10 Jahren |
|
Suki
|
9e8e76df72
left a '', causing the installer to misarably fail...
|
vor 10 Jahren |
|
Suki
|
ee3dad93d5
Merge branch 'release-2.1' of git://github.com/SimpleMachines/SMF2.1.git into cust_fields
|
vor 10 Jahren |
|
Jessica González
|
b02f201900
Merge pull request #1433 from MissAllSunday/css/jsstuff
|
vor 10 Jahren |
|
Suki
|
2917c53716
Add a field order to already existing cust_fields
|
vor 10 Jahren |
 Michael Eshom
|
4b3a023aa7
Merge pull request #1423 from MissAllSunday/minor-stuff
|
vor 10 Jahren |
|
Suki
|
6a1a9c9b2a
Merge branch 'release-2.1' of git://github.com/SimpleMachines/SMF2.1.git into minor-stuff
|
vor 10 Jahren |
|
Michael Eshom
|
18e4adb57e
Merge pull request #1457 from Underdog-01/patch-13
|
vor 10 Jahren |
|
Michael Eshom
|
1521fce0ba
Merge pull request #1445 from Underdog-01/patch-2
|
vor 10 Jahren |
|
Michael Eshom
|
1d3c95ed5a
Merge pull request #1456 from Underdog-01/patch-12
|
vor 10 Jahren |
|
Michael Eshom
|
94bcbb9edb
Merge pull request #1437 from MissAllSunday/wrong_path
|
vor 10 Jahren |
|
Michael Eshom
|
c921ae8d65
Merge pull request #1461 from Oldiesmann/release-2.1
|
vor 10 Jahren |
|
Michael Eshom
|
a686226858
Finally fixed conflicts thanks to Tortoise
|
vor 10 Jahren |
|
Michael Eshom
|
bb89aac177
Still trying to resolve merge conflicts...
|
vor 10 Jahren |
|
Michael Eshom
|
a9fb565653
More merge conflict fixes
|
vor 10 Jahren |
|
Michael Eshom
|
3631f24421
Remove extraneous tab
|
vor 10 Jahren |
|
Michael Eshom
|
0c86b592d2
Fix merge conflicts
|
vor 10 Jahren |
|
Michael Eshom
|
bb448d05d2
! Squash remaining bugs
|
vor 10 Jahren |
|
Michael Eshom
|
37d3958e7c
! This should fix the remaining bugs...
|
vor 10 Jahren |
|
Michael Eshom
|
0db40c82eb
Even more tweaks and bugfixes
|
vor 10 Jahren |
|
Michael Eshom
|
a6b674965c
More bugfixes
|
vor 10 Jahren |
|
Jessica González
|
1e57aeb4ef
Merge pull request #1460 from MissAllSunday/quick-fixes
|
vor 10 Jahren |
|
Suki
|
e33e166ce7
change $txt['origin_topic'] to 'Original Topic'
|
vor 10 Jahren |
|
Suki
|
d4067e8cd3
fix #1448
|
vor 10 Jahren |
