Georg Ehrke
|
153ce2f9ab
|
Merge branch 'master' into calendar_import
|
2012-06-27 14:02:05 +02:00 |
Robin Appelman
|
12f7cb8767
|
fix running tests from cli
|
2012-06-27 13:21:45 +02:00 |
|
Robin Appelman
|
420d23a875
|
fix webdav errors for empty folders
|
2012-06-27 13:08:16 +02:00 |
Bjoern Schiessle
|
060a297260
|
enable highlighting of address in OSM.
|
2012-06-27 11:46:42 +02:00 |
Michael Gapczynski
|
79da782892
|
Improve error handling of Dropbox storage backend
|
2012-06-26 20:37:50 -04:00 |
Thomas Tanghus
|
3edc40a68a
|
Load default categories if there are none,
|
2012-06-27 02:12:53 +02:00 |
|
Thomas Tanghus
|
823bef3a09
|
Ensure event handlers are being set when adding first contact.
|
2012-06-27 02:12:53 +02:00 |
|
Thomas Tanghus
|
afd9705283
|
Add check for return value.
|
2012-06-27 02:12:53 +02:00 |
Bart Visscher
|
153ee9dcfa
|
Check if app is enabled before loading in remote and public.php
|
2012-06-27 01:05:12 +02:00 |
|
Bart Visscher
|
dab58f3464
|
Cache result of OC_App::getAppVersions
|
2012-06-27 01:05:12 +02:00 |
|
Bart Visscher
|
2f0b4983e9
|
Move app upgrade check to loading of apps
|
2012-06-27 01:05:12 +02:00 |
|
Thomas Tanghus
|
a25ae4b4b6
|
Make Categories a bit quieter.
|
2012-06-27 01:03:53 +02:00 |
|
Michael Gapczynski
|
f55f13eebc
|
Don't call getLocalFile() until you know it actually is music
|
2012-06-26 14:51:31 -04:00 |
|
Thomas Tanghus
|
cad282b73f
|
Added some error checking.
|
2012-06-26 18:15:24 +02:00 |
|
Thomas Tanghus
|
1b2d09f9ca
|
Added missing requesttoken.
|
2012-06-26 18:15:24 +02:00 |
|
Thomas Tanghus
|
d8b181cd84
|
Added error checking on all db queries.
|
2012-06-26 18:15:24 +02:00 |
|
Thomas Tanghus
|
db115429f7
|
Added createUser hook.
|
2012-06-26 18:15:24 +02:00 |
|
Bjoern Schiessle
|
de4a540ce6
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-26 16:30:34 +02:00 |
|
Thomas Tanghus
|
46e93168cd
|
Fix variable name.
|
2012-06-26 16:06:52 +02:00 |
|
Bjoern Schiessle
|
7dc72a48cc
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-26 15:48:21 +02:00 |
|
Georg Ehrke
|
b9ce4e1f40
|
add OC_Calendar_Object::createUID()
|
2012-06-26 15:20:29 +02:00 |
|
Bjoern Schiessle
|
9cb01bd093
|
xss fix
|
2012-06-26 14:27:50 +02:00 |
|
Georg Ehrke
|
4e53db3d9c
|
Merge branch 'master' into oc_error
|
2012-06-26 14:17:32 +02:00 |
|
Georg Ehrke
|
c7de74c471
|
Merge branch 'master' into calendar_export
|
2012-06-26 14:15:07 +02:00 |
|
Bjoern Schiessle
|
72b365842f
|
bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)
|
2012-06-26 12:51:32 +02:00 |
|
Bjoern Schiessle
|
18d5420744
|
typo in js statement fixed
|
2012-06-26 10:35:19 +02:00 |
|
Thomas Tanghus
|
bf756293c6
|
Added signals.
|
2012-06-26 05:26:50 +02:00 |
|
Thomas Tanghus
|
8df59852a4
|
Adjust pic width a bit.
|
2012-06-26 04:09:45 +02:00 |
|
Thomas Tanghus
|
ac4e19218e
|
All is good ;-)
|
2012-06-26 02:47:59 +02:00 |
|
Thomas Tanghus
|
b384d79bf8
|
Remove x-scrollbar from contacts list.
|
2012-06-25 23:32:03 +02:00 |
|
Bart Visscher
|
103ae6faa4
|
Media: Change includes in app.php to use the autoloader
|
2012-06-25 21:05:10 +02:00 |
|
Bart Visscher
|
c6b9f613bb
|
Cache: try to set the fast cache in the Broker
|
2012-06-25 21:05:10 +02:00 |
|
Bart Visscher
|
fe0f281b4f
|
Fix setting ETag header on cache miss
|
2012-06-25 21:05:10 +02:00 |
|
Bart Visscher
|
531c1c509c
|
Cache: Add APC and XCache to global cache handler
|
2012-06-25 21:05:10 +02:00 |
|
Bart Visscher
|
4e4a1a4274
|
Cache: Use getUserCache cache in OC_Cache
|
2012-06-25 21:05:10 +02:00 |
|
Bart Visscher
|
cae089df91
|
Cache: Create global cache in OC_Cache
|
2012-06-25 21:05:10 +02:00 |
Arthur Schiwon
|
fb53708d10
|
LDAP: compare base trees case insensitively
|
2012-06-25 20:53:45 +02:00 |
|
Thomas Tanghus
|
2250fb1159
|
Emit Completed.
|
2012-06-25 20:30:21 +02:00 |
Brice Maron
|
a52036f3ef
|
Quick fix of multi app migration. Need a better solution
|
2012-06-25 17:37:30 +00:00 |
Sam Tuke
|
f374dae233
|
Added text ACS warning to admin's user settings page, and corresponding CSS styles
|
2012-06-25 18:04:10 +01:00 |
|
Thomas Tanghus
|
dc4b891327
|
Better visual feedback and prevent drop on self.
|
2012-06-25 18:24:15 +02:00 |
|
Thomas Tanghus
|
b8d6ad0431
|
Improve styling on draggables.
|
2012-06-25 18:24:15 +02:00 |
|
Sam Tuke
|
380f41136c
|
Added placeholder msg to share with menu to clarify user list restricted to security context
|
2012-06-25 16:57:41 +01:00 |
|
Arthur Schiwon
|
9bb409d881
|
fix syntax error after merge
|
2012-06-25 17:34:28 +02:00 |
|
Thomas Tanghus
|
ef93bf223a
|
Try to conserve some memory. Should fix oc-1106 for master.
|
2012-06-25 17:26:44 +02:00 |
|
Brice Maron
|
09a9f5400e
|
Trim url and path of appsroot to have and standart type of path fix oc-1107
|
2012-06-25 15:50:27 +02:00 |
|
Arthur Schiwon
|
3f6a7859c9
|
LDAP: cheaper userExists() implementation, fixes oc-1012
|
2012-06-25 13:22:00 +02:00 |
|
Arthur Schiwon
|
d64a7716f1
|
LDAP: always sanitize DN and DN-containing attributes
|
2012-06-25 13:22:00 +02:00 |
|
Bjoern Schiessle
|
a09a01a49f
|
sanitizeHTML() has to be called later to keep the path unchanged
|
2012-06-25 12:44:54 +02:00 |
Frank Karlitschek
|
a4c47c674d
|
write sql errors into the error log for better debugging
|
2012-06-25 11:55:51 +02:00 |