contrib
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
js
adapted patch #3050492 to new code
2010-08-28 08:57:27 -04:00
libraries
remove author names as per our policy
2010-08-29 08:54:12 -04:00
pmd
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
po
Fix format string.
2010-08-29 12:28:06 +02:00
scripts
Remove .gitignore files on release.
2010-08-29 11:17:52 +02:00
setup
allow proper nesting of option groups in user preferences
2010-08-29 01:49:18 +02:00
test
Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
2010-08-28 01:53:52 +05:30
themes
user preferences: improve styling of fieldset headers, change Export form layout
2010-08-29 12:35:02 +02:00
.gitignore
Add category tabs to preferences page
2010-06-05 15:42:55 +02:00
browse_foreigners.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
bs_disp_as_mime_type.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
bs_play_media.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
ChangeLog
3.3.6 release
2010-08-28 10:46:02 -04:00
changelog.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
chk_rel.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
config.sample.inc.php
Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
2010-08-28 01:53:52 +05:30
CREDITS
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
db_create.php
Added documentation, fixed some minor bugs/typos
2010-08-13 23:34:10 +05:30
db_datadict.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
db_export.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
db_import.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
db_operations.php
Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
2010-08-28 01:53:52 +05:30
db_printview.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
db_qbe.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
db_search.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
db_sql.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
db_structure.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
db_tracking.php
Added documentation, fixed some minor bugs/typos
2010-08-13 23:34:10 +05:30
docs.css
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
Documentation.html
Credits for Ninad Pundalik
2010-08-27 17:50:20 -04:00
enum_editor.php
Better to use format strings.
2010-08-19 11:26:34 +02:00
error.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
export.php
Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
2010-08-28 01:53:52 +05:30
favicon.ico
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
import_status.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
import.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
index.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
INSTALL
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
LICENSE
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
license.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
main.php
Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
2010-08-28 01:53:52 +05:30
navigation.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
phpdoctor.ini
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
phpinfo.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
phpmyadmin.css.php
restore cache'ing in phpmyadmin.css.php
2010-08-06 14:46:01 +02:00
pmd_common.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
pmd_display_field.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
pmd_general.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
pmd_help.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
pmd_pdf.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
pmd_relation_new.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
pmd_relation_upd.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
pmd_save_pos.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
prefs_forms.php
second part of error message display changes
2010-08-08 22:10:48 +02:00
prefs_manage.php
Add missing dot.
2010-08-25 09:50:48 +02:00
print.css
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
querywindow.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
README
3.3.7-dev
2010-08-20 13:03:13 -04:00
README.VENDOR
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
robots.txt
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
schema_edit.php
Better file name for schema edit page.
2010-08-23 10:55:19 +02:00
schema_export.php
Better name for schema export script.
2010-08-23 10:55:57 +02:00
server_binlog.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_collations.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_databases.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
server_engines.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_export.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
server_import.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
server_privileges.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
server_processlist.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_replication.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_sql.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_status.php
Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
2010-08-28 01:53:52 +05:30
server_synchronize.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_variables.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
show_config_errors.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
sql.php
Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
2010-08-28 01:53:52 +05:30
tbl_addfield.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_alter.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_change.php
Function is_null seems to be now working properly on empty blobs.
2010-08-25 15:28:29 +02:00
tbl_chart.php
Changed text to tooltip, and elaborated.
2010-08-25 17:16:18 +02:00
tbl_create.php
Added documentation to PHP files
2010-08-15 01:50:47 +05:30
tbl_export.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
tbl_get_field.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
tbl_import.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
tbl_indexes.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_move_copy.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_operations.php
Resolved a Merge Conflict
2010-08-17 18:25:03 +05:30
tbl_printview.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_relation.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_replace.php
Merge remote branch 'origin/master'
2010-08-03 18:25:19 +05:30
tbl_row_action.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_select.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_sql.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
tbl_structure.php
Removed the inline call to confirmLink() and instead attached the jQuery call to it. jQuery call attached to the proper class
2010-08-26 20:20:51 +05:30
tbl_tracking.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
themes.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
TODO
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
transformation_overview.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
transformation_wrapper.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
translators.html
3.3.7-dev
2010-08-20 13:03:13 -04:00
user_password.php
Added documentation to PHP files
2010-08-15 01:50:47 +05:30
view_create.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
view_operations.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
webapp.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30