nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,695 Commits 1 Branch 0 Tags
ae707911f4ebf7b6f23dd62aa423025ee1c0aa9c
Commit Graph

12695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
535cd23d4b Add PAGE_CHECKSUM keyword and adjust keywords count. 2010-04-07 10:11:14 +02:00
Michal Čihař
16fa54b20b Merge branch 'QA_3_3' 2010-04-07 09:35:11 +02:00
Michal Čihař
c454825bca Merge remote branch 'origin/MAINT_3_3_2' into QA_3_3 2010-04-07 09:34:34 +02:00
Michal Čihař
f10f34fc6d Merge remote branch 'origin/MAINT_3_3_1' into QA_3_3 2010-04-07 09:34:01 +02:00
Michal Čihař
0ea3a3ea26 Use merge strategy that wil always prefer branch we're marking as STABLE/TESTING. 
The problem is in fact that not all branches are merged together and it
usually causes conflicts on version string (documentation, config,
changelog,...). By simply using branch we're merging to STABLE/TESTING
we will get the correct merge.
 2010-04-07 09:30:53 +02:00
Michal Čihař
08cda2f076 Merge branch 'QA_3_3' 
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
 2010-04-07 09:24:12 +02:00
Michal Čihař
0fc25ac293 Fix error handling for language from cookie. 2010-04-07 09:21:04 +02:00
Lorikeet Lee
8a7b66f3a0 Do not group if there would be one table in group. 2010-04-07 09:19:34 +02:00
Michal Čihař
8b290ea2ab Merge remote branch 'origin/master' 2010-04-06 20:40:07 +02:00
Marc Delisle
f472cb1498 3.3.3-dev 2010-04-06 13:03:58 -04:00
Marc Delisle
210b7631da 3.3.3-dev 2010-04-06 13:00:48 -04:00
Marc Delisle
a0d1071ec3 3.3.2-rc1 2010-04-06 12:52:41 -04:00
Michal Čihař
35950b34f6 Merge remote branch 'origin/master' 2010-04-06 14:40:09 +02:00
sven.erik.andersen
60147604c0 Translation update done using Pootle. 2010-04-06 14:28:14 +02:00
sven.erik.andersen
a735facb87 Translation update done using Pootle. 2010-04-06 14:27:47 +02:00
sven.erik.andersen
a66e032f6e Translation update done using Pootle. 2010-04-06 14:27:39 +02:00
sven.erik.andersen
0a72536bd5 Translation update done using Pootle. 2010-04-06 14:27:31 +02:00
sven.erik.andersen
6435e1e708 Translation update done using Pootle. 2010-04-06 14:27:25 +02:00
sven.erik.andersen
fdfcb4e0ce Translation update done using Pootle. 2010-04-06 14:27:18 +02:00
sven.erik.andersen
d78136c123 Translation update done using Pootle. 2010-04-06 14:27:11 +02:00
sven.erik.andersen
87aee336a0 Translation update done using Pootle. 2010-04-06 14:27:03 +02:00
sven.erik.andersen
5523ddf7a3 Translation update done using Pootle. 2010-04-06 14:26:53 +02:00
sven.erik.andersen
42d1788fdb Translation update done using Pootle. 2010-04-06 14:26:43 +02:00
sven.erik.andersen
ab6afd7d05 Translation update done using Pootle. 2010-04-06 14:26:20 +02:00
sven.erik.andersen
a40beba04a Translation update done using Pootle. 2010-04-06 14:26:11 +02:00
sven.erik.andersen
918a18d936 Translation update done using Pootle. 2010-04-06 14:25:52 +02:00
sven.erik.andersen
cb4a453800 Translation update done using Pootle. 2010-04-06 14:25:30 +02:00
sven.erik.andersen
1f27a0f63c Translation update done using Pootle. 2010-04-06 14:25:18 +02:00
sven.erik.andersen
54531c4d15 Translation update done using Pootle. 2010-04-06 14:25:10 +02:00
sven.erik.andersen
5215992890 Translation update done using Pootle. 2010-04-06 14:24:55 +02:00
sven.erik.andersen
c5b313676b Translation update done using Pootle. 2010-04-06 14:24:35 +02:00
sven.erik.andersen
5f78fa38a3 Translation update done using Pootle. 2010-04-06 14:24:17 +02:00
sven.erik.andersen
9a9035b0ea Translation update done using Pootle. 2010-04-06 14:24:03 +02:00
Michal Čihař
99ee848285 Czech translation update. 2010-04-06 13:55:47 +02:00
Michal Čihař
c7a6e4d2ad Czech translation update. 2010-04-06 13:52:47 +02:00
Crack
71b2eea153 Navigation frame styling 
Patch #2980495

- icon background (home, log out, ...) on mouse over now fills entire
  box
- icon border changed from 0.05em to 1px, fixes display on Chrome (it
  was rounded to 0)
- redesigned fast filter, resizes correctly with frame, reset button
  is better aligned
- decreased margin on database tree
- fixed list margin for RTL languages (that list is always in ltr so
  my change works)
 2010-04-06 12:53:29 +02:00
Ruben Barkow
5ea8761692 Add some more samples to config.sample.inc.php. 
rfe#2937840
 2010-04-06 09:39:37 +02:00
Michal Čihař
00774b1405 Whitespace cleanup. 2010-04-06 09:33:07 +02:00
Philip Frank
18b435fed8 Use jQuery to bind click events on table rows 
Patch #2982132
 2010-04-06 09:32:57 +02:00
Marc Delisle
06bcb3ecfd author names removal 2010-04-05 17:00:42 -04:00
Marc Delisle
6c1b328ef2 XHTML compliance 2010-04-05 10:26:21 -04:00
Brian Douglass
6e68e2d149 Patch #2981165 Optionally disable the Type column 2010-04-05 10:06:36 -04:00
Marc Delisle
3ca82375d5 continue removing author names in code 2010-04-05 09:16:36 -04:00
Marc Delisle
6b5f3b9962 finish conversion of Replication feature from Mootools to jQuery 2010-04-05 09:09:35 -04:00
Marc Delisle
360101dbfb bug #2973949 SQL History broken (need to revert patch #2899969) 2010-04-04 17:30:36 -04:00
Marc Delisle
1f62ea1932 bug #2973949 SQL History broken (need to revert patch #2899969) 2010-04-04 17:21:48 -04:00
Marc Delisle
44ec2ede95 add locale to .gitignore for this branch too 2010-04-04 17:04:41 -04:00
Michal Čihař
97ee9b6754 Merge remote branch 'origin/master' 2010-04-03 14:40:15 +02:00
Marc Delisle
40f0926df3 Must not load the full common.inc.php in a PHP script that only generates js 2010-04-03 07:45:54 -04:00
hitowerdigit
aa4ff27445 Translation update done using Pootle. 2010-04-03 11:44:39 +02:00