Brice Maron
|
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 |
Brice Maron
|
6da5a2fdd4
|
Add possibility to choose the installation folder
|
2012-06-14 21:00:02 +00:00 |
Thomas Tanghus
|
8fd9cbcc54
|
White-space fix.
|
2012-06-14 13:23:12 +02:00 |
Thomas Tanghus
|
a34db3fbe0
|
Don't add slash if it's there already.
|
2012-06-14 13:23:12 +02:00 |
Bart Visscher
|
12b34d2dda
|
Whitespace fix
|
2012-06-13 21:39:12 +02:00 |
Michael Gapczynski
|
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 |
Thomas Tanghus
|
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 |
Frank Karlitschek
|
9e9c40eabd
|
fix time call
|
2012-06-13 17:27:49 +02:00 |
Bartek Przybylski
|
db1353655b
|
check for view before trying to invoke method on object
|
2012-06-13 00:32:44 +02:00 |
Thomas Mueller
|
521294d0bf
|
fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987
|
2012-06-12 23:16:26 +02:00 |
Michael Gapczynski
|
790ae70e32
|
Create directory for mount point if it doesn't already exist
|
2012-06-12 15:25:34 -04:00 |
Lukas Reschke
|
2b22c538c8
|
Make some apps compatible
|
2012-06-11 19:07:51 +02:00 |
Lukas Reschke
|
6d68b7620c
|
Check for string
|
2012-06-11 18:12:46 +02:00 |
Thomas Tanghus
|
2ee809fd86
|
Allow same host redirects (/somepath).
|
2012-06-11 15:21:37 +02:00 |
Lukas Reschke
|
18e44ba2f3
|
Some updates...
|
2012-06-11 15:03:45 +02:00 |
Lukas Reschke
|
b63795ccb8
|
Handling arrays
|
2012-06-11 14:36:11 +02:00 |
Lukas Reschke
|
c009bc4b87
|
Revert
|
2012-06-11 13:27:32 +02:00 |
Lukas Reschke
|
6817a6b102
|
First try of implementing assignHTML
|
2012-06-11 12:45:07 +02:00 |
Frank Karlitschek
|
cd16c5e479
|
implement a simple request token session garbage collector
|
2012-06-11 12:13:08 +02:00 |
Thomas Tanghus
|
1cb1980d62
|
Categories: Turned the debugging down a bit.
|
2012-06-11 03:05:33 +02:00 |
Michael Gapczynski
|
3c57fb935b
|
Mount personal mount points into filesystem
|
2012-06-10 16:34:44 -04:00 |
Bartek Przybylski
|
c11f6cc3f9
|
fix variable name and undefined index notice
|
2012-06-10 17:25:50 +02:00 |
Frank Karlitschek
|
3947aa3ef7
|
apps paging is not yet implemented. increase pagesize to 100 as a quickfix
|
2012-06-09 22:00:28 +02:00 |
Frank Karlitschek
|
897bfa8814
|
finally fix the updater. next is an automatic updater. but this is a bit more tricky.
|
2012-06-09 17:43:02 +02:00 |
Robin Appelman
|
601bac746d
|
use absolute path for file proxies
|
2012-06-09 17:34:13 +02:00 |
Thomas Tanghus
|
b16136642b
|
Bump version to trigger db update.
|
2012-06-09 16:05:21 +02:00 |
Bartek Przybylski
|
43501309e3
|
add function in filesystem to strip webroot
|
2012-06-09 15:26:26 +02:00 |
Bartek Przybylski
|
120997112c
|
handle encrypted images files in oc_image
|
2012-06-09 15:22:18 +02:00 |
Bartek Przybylski
|
001293a702
|
removing app access check, fix title for links in tiles
|
2012-06-09 15:12:50 +02:00 |
Frank Karlitschek
|
344299a074
|
add two csrf check calls. Review and lot´s of porting needed.
|
2012-06-09 15:05:14 +02:00 |
Robin Appelman
|
76de92477f
|
fix infinite redirect during setup for windows hosts
|
2012-06-09 14:38:05 +02:00 |
Georg Ehrke
|
bdd12df4a2
|
fix loading of OC::$REQUESTEDAPP if WTFE the app parameter is given but empty aka /?app
|
2012-06-08 22:31:44 +02:00 |
Bart Visscher
|
ac36512102
|
Don't use substr to get first char of string
|
2012-06-08 21:38:10 +02:00 |
Bart Visscher
|
b9a1524508
|
Smarter code for OC_FileProxy
|
2012-06-08 21:38:10 +02:00 |
Bart Visscher
|
6af980c20c
|
Add cache for getStorage and getInternalPath functions.
These are called for almost every file operation.
|
2012-06-08 21:38:10 +02:00 |
Bart Visscher
|
d9d6876be9
|
Add stat cache to OC_Connector_Sabre_Node and OC_Connector_Sabre_File
Speeds up access of directories with large number of files.
|
2012-06-08 21:38:10 +02:00 |
Bart Visscher
|
7c5c257bf6
|
Comment layout and spelling fixes
|
2012-06-08 21:38:10 +02:00 |
Frank Karlitschek
|
6119f05ac0
|
generate a random salt during installation and store it in the config.php. use it to salt the password hashing.
|
2012-06-08 12:31:37 +02:00 |
Bart Visscher
|
0575d149b4
|
Use the default parameter of OC_Config::getValue to set defaults
|
2012-06-07 22:49:50 +02:00 |
Brice Maron
|
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 |
Bart Visscher
|
4260dce826
|
Better handling of core.css and core.js
Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
|
2012-06-07 21:35:40 +02:00 |
Brice Maron
|
9f1c46b6f6
|
Correct Minizer inclusions
|
2012-06-07 19:22:43 +00:00 |
Brice Maron
|
0f7fdd4148
|
ReAdd possibility to load existing app folders
|
2012-06-07 19:15:31 +00:00 |
Brice Maron
|
cf02f3c107
|
Merge branch 'master' into multi_app_dir
|
2012-06-07 19:11:55 +00:00 |
Thomas Tanghus
|
c696f449a2
|
Make it easier to subclass OC_L10N.
|
2012-06-07 17:26:28 +02:00 |
Brice Maron
|
e8447e0bda
|
Rework to fit with minizer
|
2012-06-06 21:11:15 +00:00 |
Bart Visscher
|
8dba47d466
|
Add layer to select fast or slow cache for storing values
|
2012-06-06 22:41:36 +02:00 |
Brice Maron
|
5c2b2fc842
|
Change app path logic in templates
|
2012-06-06 20:24:16 +00:00 |
Brice Maron
|
6a812644e4
|
Correct remote and public, and last occurence of OC::
|
2012-06-06 20:24:15 +00:00 |
Brice Maron
|
6a250d0d20
|
Correct css file inclusion
|
2012-06-06 20:24:15 +00:00 |