Georg Ehrke
|
17e289aef2
|
Merge branch 'master' into calendar_export
|
2012-06-23 19:54:12 +02:00 |
Florian Hülsmann
|
7109c7ea1c
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-23 17:01:28 +02:00 |
|
Florian Hülsmann
|
d450560b39
|
remove trailing slash in %appswebroot% placeholder
|
2012-06-23 16:59:55 +02:00 |
Tom Needham
|
6e5573acb5
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-23 14:42:54 +00:00 |
|
Tom Needham
|
5323983fc7
|
Text editor: Waste less space for line numbers
|
2012-06-23 14:42:37 +00:00 |
Frank Karlitschek
|
2c1c1ba88c
|
close only if exist
|
2012-06-23 16:21:47 +02:00 |
|
Frank Karlitschek
|
7c5ff900d0
|
work with non existing apps directory. thanks to Antonio for the hint
|
2012-06-23 16:17:59 +02:00 |
Brice Maron
|
d39d7fb9ff
|
Remove references to /apps/ and correct inclusion of settings
|
2012-06-22 22:05:39 +00:00 |
|
Brice Maron
|
33165e3915
|
Do not close php tag on config file
|
2012-06-22 21:01:12 +00:00 |
|
Brice Maron
|
b5e3e150eb
|
Correction of path looking for apps and css
|
2012-06-22 20:58:52 +00:00 |
Bart Visscher
|
ded9ea5ad3
|
Spelling fixes
|
2012-06-22 22:57:35 +02:00 |
|
Bart Visscher
|
ea3a6d9fcf
|
Merge resource error-suppressing fix
|
2012-06-22 22:54:25 +02:00 |
|
Bart Visscher
|
2e6e154475
|
Gallery: Fix opening folders with a ' in the name
|
2012-06-22 22:46:12 +02:00 |
|
Georg Ehrke
|
0939b1b0ab
|
Merge branch 'master' into calendar_export
|
2012-06-22 21:36:51 +02:00 |
|
Bart Visscher
|
f4b937c6fe
|
Simplify search result js code
|
2012-06-22 20:31:59 +02:00 |
Michael Gapczynski
|
618a3c1d94
|
Fix removing personal mounts
|
2012-06-22 12:22:42 -04:00 |
|
Michael Gapczynski
|
b650f46698
|
Fix variable checks for mounting Google Drive
|
2012-06-22 12:22:42 -04:00 |
|
Tom Needham
|
41cfd55f55
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-22 16:17:23 +00:00 |
|
Bart Visscher
|
ebfc5b2762
|
Add compatability function for APC cache
|
2012-06-22 17:21:57 +02:00 |
|
Bart Visscher
|
f655981baf
|
Fix initialization of OC_Filesystem setup from DAV
|
2012-06-22 17:21:56 +02:00 |
|
Bart Visscher
|
96ec7a66bb
|
More session_write_close
|
2012-06-22 17:21:56 +02:00 |
|
Bart Visscher
|
50667dcb82
|
Convert OC_L10N_String to a string in OC_JSON::encodedPrint
|
2012-06-22 17:21:56 +02:00 |
|
Bart Visscher
|
432aa58bab
|
Spelling fixes
|
2012-06-22 17:21:56 +02:00 |
|
Tom Needham
|
0aafc717ec
|
Text Editor: fix editor positioning
|
2012-06-22 15:02:03 +00:00 |
Bjoern Schiessle
|
036530b2fd
|
log messages are looking nicer if html code gets interpreted. (xss prevention happens on another place)
|
2012-06-22 17:00:56 +02:00 |
Thomas Mueller
|
aade44471d
|
pdf viewer no longer 'eats' keyboard input
|
2012-06-22 16:10:25 +02:00 |
|
Brice Maron
|
2d2366bb57
|
Avoid fetch ocs info if the appstore is disabled
|
2012-06-22 16:06:46 +02:00 |
|
Brice Maron
|
06e20fe4b8
|
Correct css inclusion with minimizer
|
2012-06-22 15:21:44 +02:00 |
Thomas Tanghus
|
1f06cdf81f
|
Small js fix.
|
2012-06-22 14:27:46 +02:00 |
|
Thomas Tanghus
|
07124ee38d
|
Cast translation to string.
|
2012-06-22 14:27:46 +02:00 |
|
Bjoern Schiessle
|
e1fa9c282b
|
xss vulnerabilities fixed
|
2012-06-22 14:11:57 +02:00 |
|
Bjoern Schiessle
|
033d372f98
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-22 14:03:59 +02:00 |
|
Bjoern Schiessle
|
5b46734a40
|
xss vulnerability fixed
|
2012-06-22 13:58:15 +02:00 |
|
Brice Maron
|
115c30bdb4
|
Enhance hint about writable app directory
|
2012-06-22 13:57:54 +02:00 |
|
Brice Maron
|
8c2803a7c1
|
Correct image path and apps path replacement
|
2012-06-22 13:12:03 +02:00 |
Arthur Schiwon
|
19931e2008
|
remove unnecessary closing PHP tag
|
2012-06-22 12:49:56 +02:00 |
|
Brice Maron
|
72fe463f7f
|
Correct OC_Config writer. Use var_export (has support for array,...)
|
2012-06-22 12:46:21 +02:00 |
|
Arthur Schiwon
|
bef9b671ee
|
LDAP: cheaper userExists() implementation
|
2012-06-22 12:42:07 +02:00 |
|
Brice Maron
|
df60d6d5d2
|
Fixes for multi app dir :
Url should be given as relative path (to webroot)
Correct link construction from js
|
2012-06-22 12:24:56 +02:00 |
|
Bjoern Schiessle
|
8c28aec664
|
date don't change correctly in the view list (bug #973) fixed
|
2012-06-22 11:30:40 +02:00 |
|
Thomas Mueller
|
ba2d203a54
|
some path fixes for multi-dir app
|
2012-06-22 09:56:54 +02:00 |
|
Brice Maron
|
b5953e7a83
|
Provide solution for smoother migration for apps to multi-app dir
|
2012-06-21 22:22:36 +00:00 |
|
Brice Maron
|
fcaf04cad9
|
Add little more doc about app folders
|
2012-06-21 22:00:48 +00:00 |
|
Bart Visscher
|
82f39d3292
|
Contacts: Fix name and carddav-url encoding
|
2012-06-21 23:30:04 +02:00 |
|
Bart Visscher
|
fd23c286ef
|
Calendar: Fix caldav url encoding
|
2012-06-21 23:30:04 +02:00 |
|
Bart Visscher
|
4a22f4ca78
|
Calendar: convert choosecalendar.rowfields template from plain php to html+php
|
2012-06-21 23:30:04 +02:00 |
|
Bart Visscher
|
1d07b9e291
|
Calendar: Missing userid in allCalendars call
|
2012-06-21 23:30:04 +02:00 |
|
Bart Visscher
|
c047fdafdb
|
Calendar: Fix missing template parameter 'shared' for new and update calendar
|
2012-06-21 23:30:04 +02:00 |
|
Brice Maron
|
f46623da6c
|
Do not search apps if oc is not yet installed
|
2012-06-21 21:29:18 +00:00 |
|
Brice Maron
|
95b5202893
|
Correct usage of approot
|
2012-06-21 21:13:12 +00:00 |