Thomas Müller
76625e9ba5
Merge pull request #647 from owncloud/fix_app_settings_navigation
...
Move loading of all the apps to setting the active navigation entry.
2012-12-05 01:48:20 -08:00
Thomas Müller
521b6c7b04
Merge pull request #700 from eMerzh/fix_error_display
...
Quick Fix a dirty function preventing showing errors
2012-12-05 01:37:27 -08:00
Jan-Christoph Borchardt
b6fca70ee4
add primary action button in fitting subtle dark blue
2012-12-05 00:37:00 +01:00
Jan-Christoph Borchardt
56dae06528
move inline warning styles into CSS, clean up and fix #270
2012-12-05 00:25:58 +01:00
Jenkins for ownCloud
524f3c3c0b
[tx-robot] updated from transifex
2012-12-05 00:04:55 +01:00
Jan-Christoph Borchardt
13e0287b74
better layout for installation page elements, centered and subdued legend text
2012-12-04 23:55:31 +01:00
Jan-Christoph Borchardt
5ccea4cc2f
small fixes: toggle color adjustment, remove colon, prevent label wrapping
2012-12-04 23:09:30 +01:00
Sam Tuke
bc3550b37b
Development Snapshot
...
Opening short files via webdav, that were saved via webdav, now works
2012-12-04 19:53:13 +00:00
Brice Maron
4df61c3e45
Simplify has sqlite test
2012-12-04 19:34:24 +00:00
Thomas Müller
39e37fa9c6
Enabling unit testing for apptemplate_advanced
2012-12-04 19:28:46 +01:00
Brice Maron
e6ec0e8a5e
Remove support of sqlite2 at installation
2012-12-04 17:36:23 +00:00
Erik Sargent
93208d0fe9
Remove rename
2012-12-04 09:40:17 -07:00
Jan-Christoph Borchardt
855a011697
group related input fields visually
2012-12-04 16:58:42 +01:00
Jan-Christoph Borchardt
9e6ffece64
Merge pull request #707 from owncloud/fix_infield_autofill
...
Fix infield autofill
2012-12-04 05:56:52 -08:00
Thomas Mueller
e65abb8054
minified version no longer available
2012-12-04 14:49:19 +01:00
Jörn Friedrich Dreyer
e72f95f643
merge changes discussed in dcneiner pull number 4 'fix for autocomplete issue' including firefox password overlay
2012-12-04 13:32:55 +01:00
Jörn Friedrich Dreyer
3e519945c3
replace minified infieldlabel with dcneiners version
2012-12-04 13:30:13 +01:00
Jenkins for ownCloud
a53a946c20
[tx-robot] updated from transifex
2012-12-04 00:07:11 +01:00
Brice Maron
a310dcb0ff
Fix a dirty function preventing showing errors
2012-12-03 22:53:06 +00:00
Brice Maron
4327ed8382
Revoke DB rights on install only if the db is newly created
2012-12-03 20:20:17 +00:00
Arthur Schiwon
4cb760a924
LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. Fixes different problems, esp. with non-ascii characters in the dn ( #631 )
2012-12-03 12:55:42 +01:00
Björn Schießle
171e669dda
Merge pull request #650 from schiesbn/fix_fileVersioningForSharedFiles_master
...
fix regression in file versioning for shared files
2012-12-03 02:45:39 -08:00
Thomas Müller
cee92bde20
Merge pull request #682 from VicDeo/master
...
Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
2012-12-03 02:18:04 -08:00
Jenkins for ownCloud
f4d7955fe6
[tx-robot] updated from transifex
2012-12-03 00:05:40 +01:00
Victor Dubiniuk
6a211f3fa1
Check if we have an array with data. Fix #487
2012-12-02 23:54:54 +03:00
Victor Dubiniuk
3d5ffebb52
Clean KB entries processing code
2012-12-02 23:54:53 +03:00
Björn Schießle
b6396bc07b
rebase on latest master
2012-12-02 12:51:57 +01:00
Björn Schießle
f66ebea5ca
fix typo in variable name
2012-12-02 12:50:07 +01:00
Björn Schießle
bafb78ac94
fix regression in file versioning for shared files
2012-12-02 12:46:07 +01:00
Thomas Müller
475fe281a4
Merge pull request #654 from butonic/checkstyle_fixes
...
fix checkstyle for files_encryption & files_encryption app, add whitespace for readability
2012-12-02 03:14:30 -08:00
Thomas Mueller
35e55214e2
[Contacts API] example for searching added
2012-12-02 11:54:30 +01:00
icewind1991
87003e4608
Merge pull request #672 from irosenb/patch-1
...
Update lib/image.php
2012-12-01 19:05:36 -08:00
Isaac Rosenberg
d3ea7feb6b
Update lib/image.php
...
Corrected simple typo
2012-12-01 21:13:08 -05:00
Jenkins for ownCloud
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
Jenkins for ownCloud
c7c5e2a2e2
[tx-robot] updated from transifex
2012-12-01 00:03:27 +01:00
Erik Sargent
47fa3a8fe0
event.ctrlKey
2012-11-30 10:11:25 -07:00
Erik Sargent
5d13b0533d
event.ctrlKey
2012-11-30 10:10:00 -07:00
Erik Sargent
2160663309
ctrl issue fix
2012-11-30 08:43:24 -07:00
Jörn Friedrich Dreyer
92df70b6e5
fix checkstyle for files_external app, add whitespace for readability
2012-11-30 16:27:11 +01:00
Jörn Friedrich Dreyer
df21ebeaf7
fix checkstyle for files_encryption app, add whitespace for readability
2012-11-30 16:26:04 +01:00
Bart Visscher
a3f18d4b5a
Merge pull request #603 from owncloud/store_plain_groupname
...
Group name doesn't need to be sanitized before storing it in the database
2012-11-30 04:13:36 -08:00
Bart Visscher
8aba5874db
Merge pull request #644 from butonic/checkstyle_fixes
...
fix checkstyle for files app
2012-11-30 04:10:31 -08:00
Björn Schießle
d527bb6c54
fix regression in file versioning for shared files
2012-11-30 13:04:15 +01:00
Bart Visscher
f820596825
Merge pull request #605 from owncloud/fix_false_positive_share_2
...
Sharing: Fix false positived v. 2
2012-11-30 04:02:18 -08:00
Bart Visscher
8ce3aca331
Move loading of all the apps to setting the active navigation entry.
...
We can't do the loading before matching the route, because some routes
need to do the loading after matching of the route. For example the
navigation detection of the app settings page.
2012-11-30 12:47:44 +01:00
Bart Visscher
4db53f9d8e
Merge pull request #619 from samtuke/versions_cache
...
OC_FSV->copy now only caches files which are copied from data/user/files
2012-11-30 03:25:06 -08:00
Erik Sargent
48d6f33135
Revert "initial setup"
...
This reverts commit e1478117b1
.
2012-11-29 19:20:51 -07:00
Erik Sargent
6060d063a9
Cleanup
2012-11-29 16:52:41 -07:00
Jenkins for ownCloud
16a630024c
[tx-robot] updated from transifex
2012-11-30 00:05:16 +01:00
Thomas Müller
9b709fa95d
Merge pull request #635 from owncloud/ob_end
...
provide a safe way to end output buffering
2012-11-29 13:50:49 -08:00