Commit graph

7977 commits

Author SHA1 Message Date
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
Jörn Friedrich Dreyer
3b83fe1530 fix checkstyle for files app 2012-11-29 18:33:15 +01:00
Erik Sargent
b6e3460871 documentation 2012-11-29 10:21:20 -07:00
Erik Sargent
fd4aecf525 cleanup 2012-11-29 10:18:34 -07:00
Robin Appelman
bcb27c81d4 use new obEnd function instead of ob_end_clean 2012-11-29 18:01:21 +01:00
Robin Appelman
59d5aa2cb7 add function to safely end output buffering 2012-11-29 17:58:24 +01:00
Georg Ehrke
c38a75e03f Merge pull request #620 from owncloud/fix_600
Fix #600
2012-11-29 05:39:45 -08:00
Georg Ehrke
e5af24d084 use attr instead of data 2012-11-29 13:56:07 +01:00
Georg Ehrke
1d1ab2a911 Revert "fix group and subadmin managing for 'ajax-loaded' users"
This reverts commit a5774229a1.
2012-11-29 13:37:37 +01:00
blizzz
77ad5dc92e Merge pull request #617 from samtuke/fix_docblocks
Cleaned up docblock comments
2012-11-29 01:53:07 -08:00
Erik Sargent
dafe028c11 Rename 2012-11-28 21:00:11 -07:00
Erik Sargent
a73a263543 Enter 2012-11-28 19:58:42 -07:00
Erik Sargent
8802dac02a Arrow key navigation 2012-11-28 17:32:05 -07:00
Jenkins for ownCloud
6c3f43b061 [tx-robot] updated from transifex 2012-11-29 00:04:57 +01:00
Thomas Müller
1ac6d885e6 Merge pull request #540 from Raydiation/master
More tests for lib/group.php
2012-11-28 14:29:23 -08:00
Thomas Mueller
f99497a05a test for search and unregister added 2012-11-28 23:10:30 +01:00
Thomas Mueller
2d597c2238 first unit tests implemented 2012-11-28 23:10:00 +01:00
Thomas Mueller
5b1dea56e5 change name to IAddressBook 2012-11-28 23:08:15 +01:00
Thomas Mueller
fba8c776e1 plugin mechanism implemented 2012-11-28 23:07:09 +01:00
Georg Ehrke
4c83a4c918 add a client side check 2012-11-28 18:40:58 +01:00
Georg Ehrke
a5774229a1 fix group and subadmin managing for 'ajax-loaded' users 2012-11-28 18:40:00 +01:00
Erik Sargent
8722d3751c Keys array 2012-11-28 10:36:54 -07:00
Bernhard Posselt
37e524dc6d added more unittests for the group file 2012-11-28 18:30:47 +01:00
Erik Sargent
b78dc3f48a keycode naming 2012-11-28 10:22:20 -07:00