e5c56b2433
Merge branch 'master' into multi_app_dir
...
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
2012-06-21 17:15:35 +00:00
902c649dad
use new sanitize HTML function backported
...
Conflicts:
lib/template.php
2012-06-20 16:59:51 +02:00
f11e4d7cd6
removing sanitizeHTML() function from template.php since I moved it to util.php
...
to make it more generic.
2012-06-19 19:29:43 +02:00
089ae980c4
use new sanitize HTML function
2012-06-19 17:24:55 +02:00
cfb3b633f5
Force sanitize function to use UTF8 (for php lower than 5.4)
2012-06-18 19:52:05 +00:00
180243d92a
Move page layout handling to its own class
2012-06-18 15:40:48 +02:00
332603a263
Move formfactor code to OC_Template
2012-06-18 15:40:48 +02:00
4753cc3ebd
Merge branch 'master' into multi_app_dir
...
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
2012-06-14 21:16:59 +00:00
625cd822c3
Backport CSRF prevention.
2012-06-14 13:52:22 +02:00
b5889d6ffe
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
...
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
2012-06-13 15:17:46 -04:00
89464721c7
Added JSON methods for CSRF prevention. Make request token accessible from template and add js var.
2012-06-13 17:33:19 +02:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
6d68b7620c
Check for string
2012-06-11 18:12:46 +02:00
18e44ba2f3
Some updates...
2012-06-11 15:03:45 +02:00
b63795ccb8
Handling arrays
2012-06-11 14:36:11 +02:00
c009bc4b87
Revert
2012-06-11 13:27:32 +02:00
6817a6b102
First try of implementing assignHTML
2012-06-11 12:45:07 +02:00
9ec68c819b
Change parameter 'web' to 'url' and take array of array in config instead of : separated values
2012-06-07 20:36:55 +00:00
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
6a250d0d20
Correct css file inclusion
2012-06-06 20:24:15 +00:00
cc494259d3
Unit path and webpath, correct some more
2012-06-06 20:24:15 +00:00
b6c5ca126b
First almost working version
2012-06-06 20:23:17 +00:00
4a5973662c
Merge branch 'unstable'
...
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
2012-06-04 23:02:05 +02:00
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
c645a7d0f8
Fix empty jsfiles and cssfiles in layout template
2012-05-16 18:53:46 +02:00
2faae817f1
Template: Fix var name
2012-05-16 18:53:46 +02:00
6d20fe4012
Template: Make getFormFactorExtension function public
2012-05-16 18:53:46 +02:00
bda2dbec1f
Prevent Clickjacking by adding additional headers:
...
header('X-Frame-Options: Sameorigin');
header('X-XSS-Protection: 1; mode=block');
header('X-Content-Type-Options: nosniff');
Thanks to Lukas Reschke for reporting this issue (and many more).
2012-05-14 15:34:28 +02:00
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
632b3cbbbb
Cleanup the template code for redundant code
2012-03-19 21:56:55 +01:00
5e9d268c21
never try to load an non existing template,css,img.
...
do propper checking, error reporting and motivate the developerto fix it ;-)
2012-02-28 16:14:12 +01:00
5943af17e7
spaces -> tabs
...
Thanks to Jakob for reminding me
2012-02-27 18:01:43 +01:00
ab96fa67c8
first part of the abstraction work of the apps folder. more to come
2012-02-26 18:26:41 +01:00
a62e109e8c
make the location of the 3rdparty folder flexible.
...
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
2012-02-23 15:37:38 +01:00
a25bda8e41
Add application name to title
2012-02-12 21:56:01 +01:00
340b6bf3ad
add themeing support and support for autoselection of mobile/tablet and standalone css/jss files and templates
2012-02-11 23:25:35 +01:00
dd7a411f9a
Disable save button while saving. Streamlined code.
2011-11-29 22:11:42 +00:00
595b13f1e0
prevent the remaining ob_clean related errors
2011-10-17 01:18:02 +02:00
82c7598861
Remove global vars and use the OC static version.
...
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
b92603b3fd
Translation for date column
2011-08-28 23:11:45 +02:00
d9aae20003
more valid HTML, alt attributes, refactored pagenavi etc.
2011-08-20 05:07:58 +02:00
05f3910718
moved search box directly to template
2011-08-10 22:56:55 +02:00
962907ee6f
Merge branch 'master' of git://anongit.kde.org/owncloud
...
Conflicts:
lib/template.php
2011-08-08 23:16:30 +02:00
4b967a9414
Minor improvements
2011-08-08 23:14:47 +02:00
d1d47eb5eb
do proper styling for settings pages
2011-08-08 22:38:42 +02:00
e6f6d3dabc
dont use a different navigation page for settings stuff
2011-08-08 21:43:31 +02:00
d9ccbe96dd
fix template.php ;-)
2011-08-06 17:00:06 +02:00
501b767e6e
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-06 11:38:49 +02:00
5f7c040ec0
Add principals, minor changes in base.php
2011-08-06 11:36:56 +02:00
faf6c0e8e1
fix some forgotten quotes around strings
2011-08-05 11:19:46 +02:00
6d5cb13018
fixed relative time calculation
2011-08-05 08:19:51 +02:00
bafd684eb6
Renaming classes :-)
2011-07-29 21:36:03 +02:00
2ff8d7a8bc
One class per file!
2011-07-29 21:03:53 +02:00
f1616b0e62
implemented relative file size and coloring
2011-07-29 00:46:20 +02:00
e3fd72dc16
introducing simple file size, only MB as unit, details on hover
2011-07-07 01:27:16 +02:00
155f62bcf6
allow plugins/apps to add custom headers to all pages
2011-06-24 22:09:55 +02:00
4d11e920be
provide an option to add custom elements to the header of templates
2011-06-24 18:02:19 +02:00
91c37bbb76
moved core stuff to /core
2011-06-20 20:29:30 +02:00
baa00a589f
l10n added
2011-06-19 14:27:52 +02:00
7d3ae7ae9b
fix settings page for non-admin users
2011-06-14 16:03:57 +02:00
b7aba15f17
add search functionality, for now only searches files but plugins/apps can extend that
2011-04-24 16:09:27 +02:00
08cfe4b6ff
stylesheets have .css as extention, not .js
2011-04-23 02:30:34 +02:00
3e47ce3cef
properly load css and js files for apps
2011-04-23 02:28:12 +02:00
47223ae2d9
Working subnavigation
2011-04-17 19:38:04 +02:00
f2e37e0018
Completely removing personalMenu
2011-04-16 18:06:23 +02:00
af1e48df80
Changes in the user experience
2011-04-16 17:49:57 +02:00
16e4a1dd17
Fix template.php
2011-04-16 09:51:46 +02:00
f36f453dd2
apps are now stored in /apps
2011-04-16 09:46:58 +02:00
0f494970d1
Fix a couple of minor coding errors
2011-03-18 14:15:38 +01:00
a3070405d9
OC_HELPER, OC_LOG and OC_TEMPLATE prepared for refactoring
2011-03-13 17:25:34 +01:00
94b405b64f
Make it possible to use several datadirs.
...
This could be useful if the user does not want his gallery images on the webdav storage.
2011-03-03 21:25:22 +01:00
61ffa182ee
Application "files" is able to list the files again, start of splitting css files
2011-03-02 23:06:23 +01:00
e5ea0a3daa
Added helper for filesize, fixed wrong name for mimetypeIcon()
2011-03-02 22:28:32 +01:00
dfa6b749ba
Introducing OC_HELPER for small helper functions; making setup of filesystem optional
2011-03-02 22:18:22 +01:00
ede34c17dd
Make the templates working again.
2011-03-02 18:21:08 +01:00
66ac355f78
Getting rid of Smarty, using our own template system
2011-03-02 11:56:48 +01:00
015ab0eb64
Say Smarty to only use one compile directory. Makes setup somewhat easier.
2011-03-02 00:16:43 +01:00
132695ceb1
Start of the refactoring. Commit is quite big because I forgot to use git right from the beginning. Sorry.
2011-03-01 23:20:16 +01:00
Brice Maron
Bjoern Schiessle
Bart Visscher
Thomas Tanghus
Michael Gapczynski
Lukas Reschke
Frank Karlitschek
Thomas Mueller
Georg Ehrke
Jan-Christoph Borchardt
Robin Appelman
Frank Karlitschek
Tom Needham
Robin Appelman
Bart Visscher
Côme BERNIGAUD
Jan-Christoph Borchardt
Jakob Sack
Jakob Sack