a53a946c20
[tx-robot] updated from transifex
2012-12-04 00:07:11 +01:00
a310dcb0ff
Fix a dirty function preventing showing errors
2012-12-03 22:53:06 +00:00
be30b1a8de
merge master into filesystem
2012-12-03 18:02:22 +01:00
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
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
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
f4d7955fe6
[tx-robot] updated from transifex
2012-12-03 00:05:40 +01:00
6a211f3fa1
Check if we have an array with data. Fix #487
2012-12-02 23:54:54 +03:00
3d5ffebb52
Clean KB entries processing code
2012-12-02 23:54:53 +03:00
b6396bc07b
rebase on latest master
2012-12-02 12:51:57 +01:00
f66ebea5ca
fix typo in variable name
2012-12-02 12:50:07 +01:00
bafb78ac94
fix regression in file versioning for shared files
2012-12-02 12:46:07 +01:00
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
18663100d9
fixing syntax error + reformat the code
2012-12-02 12:12:20 +01:00
87003e4608
Merge pull request #672 from irosenb/patch-1
...
Update lib/image.php
2012-12-01 19:05:36 -08:00
01eb5d2790
fix some edge cases while scanning the root of a storage
2012-12-02 03:43:51 +01:00
d3ea7feb6b
Update lib/image.php
...
Corrected simple typo
2012-12-01 21:13:08 -05:00
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
702444b242
fail gracefully when no old filecache is present during upgrade
2012-12-01 00:59:49 +01:00
c7c5e2a2e2
[tx-robot] updated from transifex
2012-12-01 00:03:27 +01:00
47fa3a8fe0
event.ctrlKey
2012-11-30 10:11:25 -07:00
5d13b0533d
event.ctrlKey
2012-11-30 10:10:00 -07:00
2160663309
ctrl issue fix
2012-11-30 08:43:24 -07:00
92df70b6e5
fix checkstyle for files_external app, add whitespace for readability
2012-11-30 16:27:11 +01:00
df21ebeaf7
fix checkstyle for files_encryption app, add whitespace for readability
2012-11-30 16:26:04 +01:00
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
8aba5874db
Merge pull request #644 from butonic/checkstyle_fixes
...
fix checkstyle for files app
2012-11-30 04:10:31 -08:00
d527bb6c54
fix regression in file versioning for shared files
2012-11-30 13:04:15 +01:00
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
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
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
48d6f33135
Revert "initial setup"
...
This reverts commit e1478117b1
2012-11-29 19:20:51 -07:00
dbbb357f62
add upgrade path from old cache to preserve file id's
2012-11-30 01:41:30 +01:00
6060d063a9
Cleanup
2012-11-29 16:52:41 -07:00
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
16a630024c
[tx-robot] updated from transifex
2012-11-30 00:05:16 +01:00
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
3b83fe1530
fix checkstyle for files app
2012-11-29 18:33:15 +01:00
b6e3460871
documentation
2012-11-29 10:21:20 -07:00
fd4aecf525
cleanup
2012-11-29 10:18:34 -07:00
bcb27c81d4
use new obEnd function instead of ob_end_clean
2012-11-29 18:01:21 +01:00
59d5aa2cb7
add function to safely end output buffering
2012-11-29 17:58:24 +01:00
c38a75e03f
Merge pull request #620 from owncloud/fix_600
...
Fix #600
2012-11-29 05:39:45 -08:00
e5af24d084
use attr instead of data
2012-11-29 13:56:07 +01:00
1d1ab2a911
Revert "fix group and subadmin managing for 'ajax-loaded' users"
...
This reverts commit a5774229a1
2012-11-29 13:37:37 +01:00
77ad5dc92e
Merge pull request #617 from samtuke/fix_docblocks
...
Cleaned up docblock comments
2012-11-29 01:53:07 -08:00
dafe028c11
Rename
2012-11-28 21:00:11 -07:00
a73a263543
Enter
2012-11-28 19:58:42 -07:00
8802dac02a
Arrow key navigation
2012-11-28 17:32:05 -07:00
Jenkins for ownCloud
Brice Maron
Robin Appelman
Arthur Schiwon
Björn Schießle
Victor Dubiniuk
Björn Schießle
icewind1991
Isaac Rosenberg
Erik Sargent
Jörn Friedrich Dreyer
Bart Visscher
Georg Ehrke