Bart Visscher
|
4b6f6291c5
|
Remember result of OC_User::isLoggedIn, can be very expensive to check
|
2012-06-19 17:54:19 +02:00 |
Bjoern Schiessle
|
089ae980c4
|
use new sanitize HTML function
|
2012-06-19 17:24:55 +02:00 |
Bjoern Schiessle
|
d2936bd90c
|
introducing a sanitize HTML function for the internal and the public API. This
allows to easily convert strings to HTML before displaying them on the web page
to reduce the risk of xss vulnerabilities.
|
2012-06-19 17:20:19 +02:00 |
Thomas Tanghus
|
0b9a48b4b6
|
Re-add missing loadhandlers() call.
|
2012-06-19 14:56:21 +02:00 |
Thomas Tanghus
|
33aec973df
|
Loading of contacts was placed outside of $(document).ready() function.
|
2012-06-19 14:55:14 +02:00 |
Georg Ehrke
|
5ce0097b6f
|
Calendar: only run ->expand if the event is repeating
|
2012-06-19 13:30:45 +02:00 |
Georg Ehrke
|
2b2da6fe35
|
Calendar: js fix
|
2012-06-19 13:26:55 +02:00 |
Georg Ehrke
|
c8c105df33
|
Calendar: fix modifying of end DateTime object
|
2012-06-19 13:04:11 +02:00 |
Georg Ehrke
|
ccacb6f918
|
Merge branch 'master' into oc_error
|
2012-06-19 11:30:18 +02:00 |
Georg Ehrke
|
a38463d41a
|
Merge branch 'master' into calendar_repeat
|
2012-06-19 11:30:12 +02:00 |
Georg Ehrke
|
8a8dda726c
|
Merge branch 'master' into calendar_export
|
2012-06-19 11:30:06 +02:00 |
Bjoern Schiessle
|
1b142a1155
|
quota calculation fixed
|
2012-06-19 09:36:50 +02:00 |
Bjoern Schiessle
|
0469f529fa
|
quota calculation fixed
|
2012-06-19 09:35:13 +02:00 |
Arthur Schiwon
|
244920aeb0
|
LDAP: only map users within the User Base Tree
|
2012-06-19 01:15:58 +02:00 |
Victor Dubiniuk
|
db7542b640
|
Reverting 249190c89b . Fixed in master
|
2012-06-19 00:56:48 +03:00 |
Thomas Mueller
|
c1df0539a0
|
fixes oc-668
|
2012-06-18 23:33:02 +02:00 |
Florian Hülsmann
|
c3cd3f3571
|
CSS class headerAction -> header-action
|
2012-06-18 23:22:52 +02:00 |
Victor Dubiniuk
|
249190c89b
|
Fix mime-type detection
|
2012-06-19 00:20:33 +03:00 |
Florian Hülsmann
|
c723e1107d
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-18 23:19:15 +02:00 |
Florian Hülsmann
|
0132b80282
|
added CSS class .headerAction
|
2012-06-18 23:18:32 +02:00 |
Georg Ehrke
|
8c8a0cca75
|
Merge branch 'master' into calendar_export
|
2012-06-18 23:10:01 +02:00 |
Bart Visscher
|
d4044d0283
|
Delay loading of translations until they are used
|
2012-06-18 23:07:32 +02:00 |
Thomas Mueller
|
a1364c9726
|
fixes oc-1026
|
2012-06-18 22:48:52 +02:00 |
Brice Maron
|
b31962fdc2
|
Hide image with no source (avoid placeholder img)
|
2012-06-18 20:15:20 +00:00 |
Brice Maron
|
cfb3b633f5
|
Force sanitize function to use UTF8 (for php lower than 5.4)
|
2012-06-18 19:52:05 +00:00 |
Robin Appelman
|
debd9c8dfb
|
fix problem with encryption flag not being saved correctly in the filecache
|
2012-06-18 18:18:10 +02:00 |
Bjoern Schiessle
|
92bb59c95d
|
fixed broken function call
|
2012-06-18 17:30:21 +02:00 |
Bjoern Schiessle
|
814cab97cf
|
ignore "Shared"-directory when calculating free space
Conflicts:
lib/fileproxy/quota.php
|
2012-06-18 17:27:42 +02:00 |
Bjoern Schiessle
|
e6384251eb
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-18 17:25:00 +02:00 |
Bjoern Schiessle
|
d496a5e19f
|
ignore "Shared"-directory when calculating free space
|
2012-06-18 17:23:54 +02:00 |
Georg Ehrke
|
6bd0a158f7
|
Merge branch 'master' into oc_error
|
2012-06-18 15:59:39 +02:00 |
Georg Ehrke
|
16560fe5c1
|
Merge branch 'master' into calendar_repeat
|
2012-06-18 15:59:26 +02:00 |
Georg Ehrke
|
6e405513ab
|
Merge branch 'master' into calendar_export
|
2012-06-18 15:59:21 +02:00 |
Georg Ehrke
|
13aad8f06d
|
some little fixes for repeating events caching
|
2012-06-18 15:58:01 +02:00 |
Bart Visscher
|
2f00384b51
|
Use TemplateLayout functions for finding js and css files in minimizer
|
2012-06-18 15:40:48 +02:00 |
Bart Visscher
|
3000e8f9d5
|
Prepare template js and css functions for use in the js and css minimizers
|
2012-06-18 15:40:48 +02:00 |
Bart Visscher
|
180243d92a
|
Move page layout handling to its own class
|
2012-06-18 15:40:48 +02:00 |
Bart Visscher
|
332603a263
|
Move formfactor code to OC_Template
|
2012-06-18 15:40:48 +02:00 |
Bart Visscher
|
79f9d61ec8
|
Allow apps to load before login, needed for user_openid
|
2012-06-18 15:40:48 +02:00 |
Bjoern Schiessle
|
ca41f2e96a
|
don't add the "Shared"-directory size to users quota
|
2012-06-18 15:38:38 +02:00 |
Bjoern Schiessle
|
405ac36e0c
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-18 15:38:24 +02:00 |
Bjoern Schiessle
|
2fd7df57d9
|
don't add the "Shared"-directory size to users quota
|
2012-06-18 15:35:22 +02:00 |
Georg Ehrke
|
beed6e0f0e
|
Revert "Revert "create OC_Calendar_Object::generateStartEndDate function""
This reverts commit e3b58f6783 .
|
2012-06-18 14:47:58 +02:00 |
Georg Ehrke
|
e3b58f6783
|
Revert "create OC_Calendar_Object::generateStartEndDate function"
This reverts commit aa7ce480f4 .
|
2012-06-18 14:47:09 +02:00 |
Georg Ehrke
|
e31c9a7b6f
|
Merge branch 'master' into oc_error
|
2012-06-18 14:34:49 +02:00 |
Georg Ehrke
|
6b6d3d68d4
|
Merge branch 'master' into calendar_repeat
|
2012-06-18 14:34:43 +02:00 |
Georg Ehrke
|
c2b7d05188
|
Merge branch 'master' into calendar_export
|
2012-06-18 14:34:38 +02:00 |
Florian Hülsmann
|
7064f3a8a8
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-18 13:37:25 +02:00 |
Florian Hülsmann
|
4a50c15a8e
|
corrected header width and floating (can now dynamically add stuff to header); someone may test this in IE
|
2012-06-18 13:36:49 +02:00 |
Bart Visscher
|
977cd0df6b
|
Fix errors for minimizer
|
2012-06-18 11:33:24 +02:00 |