Bart Visscher
|
0120f3fd62
|
Merge branch 'routing'
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
|
2012-10-27 11:58:02 +02:00 |
Lukas Reschke
|
a7eb56c799
|
Merge pull request #76 from fmms/master
checkstyle: some more cleanups
|
2012-10-23 23:48:27 -07:00 |
icewind1991
|
ab944094e2
|
Merge pull request #12 from scambra/fixes
check free space using folder's owner
|
2012-10-23 07:02:21 -07:00 |
Arthur Schiwon
|
6a2a915559
|
Files: urldecode urlencoded dir names, fixes oc-2111
|
2012-10-23 13:50:24 +02:00 |
Felix Moeller
|
36d0d75901
|
Codestyle: FunctionCallArgumentSpacing
|
2012-10-23 08:35:54 +02:00 |
scambra
|
2b5133a1c4
|
check free space using folder's owner
|
2012-09-19 21:31:29 +02:00 |
|
Bart Visscher
|
5eba579827
|
Merge branch 'master' into routing
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
|
2012-09-07 15:51:44 +02:00 |
Thomas Mueller
|
3829460ab8
|
adding space between) and {
|
2012-09-07 15:22:01 +02:00 |
Michael Gapczynski
|
a5211e31bc
|
Add permissions to new files/folders, bug fix for oc-1649
|
2012-09-05 21:47:09 -04:00 |
|
Bart Visscher
|
cbaf858dea
|
Merge remote-tracking branch 'gitorious/master' into routing
Conflicts:
apps/files/js/fileactions.js
apps/files_archive/js/archive.js
|
2012-08-29 20:16:39 +02:00 |
|
Michael Gapczynski
|
82d81e8d39
|
Merge branch 'share_api'
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
|
2012-08-19 22:29:01 -04:00 |
|
Lukas Reschke
|
6ef5edf5ea
|
Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.
|
2012-08-18 09:30:01 +02:00 |
Robin Appelman
|
53a888cc81
|
more path normalization
|
2012-08-17 01:22:54 +02:00 |
|
Bart Visscher
|
ddfb9de147
|
Fix linkTo calls for new routing
|
2012-08-15 18:16:06 +02:00 |
|
Michael Gapczynski
|
6f58eca534
|
Change read only check to isCreatable
|
2012-07-24 21:35:03 -04:00 |
|
Michael Gapczynski
|
0b14b4e3e8
|
Call exit() to prevent further code execution if directory does not exist
|
2012-07-11 02:33:11 +02:00 |
Jörn Friedrich Dreyer
|
e59a1806cf
|
remove superfluous ?> at the end of .php files (left out apps/*/templates)
|
2012-07-09 16:51:16 +02:00 |
|
Lukas Reschke
|
2b22c538c8
|
Make some apps compatible
|
2012-06-11 19:07:51 +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
|
baae4c741d
|
fix the breadcrumb
|
2012-05-31 21:44:05 +02:00 |
|
Thomas Mueller
|
583dce5276
|
removing executable bit - again
|
2012-05-15 00:52:00 +02:00 |
Michael Gapczynski
|
e03c5f39a8
|
Call is_writable explicitly on folders for readonly check
|
2012-05-14 16:31:00 -04:00 |
|
Arthur Schiwon
|
e9c7ecf22d
|
applying coding guideline
|
2012-05-07 17:35:23 +02:00 |
|
Arthur Schiwon
|
0ff5ab65be
|
applying coding guideline
|
2012-05-07 17:35:23 +02:00 |
|
Frank Karlitschek
|
1945cd6946
|
ported the oc_template class
|
2012-05-06 23:00:36 +02:00 |
|
Frank Karlitschek
|
8e99475886
|
first part of the config stuff
|
2012-05-02 13:28:56 +02:00 |
|
Frank Karlitschek
|
2fe646dcec
|
ported the oc_app calls
|
2012-05-02 00:50:26 +02:00 |
|
Frank Karlitschek
|
93b63cf375
|
ported the rest of the OC_Helper calls
|
2012-05-02 00:20:45 +02:00 |
|
Frank Karlitschek
|
e48f511606
|
port linkto and serverHost
|
2012-05-01 23:19:39 +02:00 |
|
Frank Karlitschek
|
31e32e3c10
|
ported checkLoggedIn and checkAdmin
|
2012-05-01 22:59:38 +02:00 |
|
Frank Karlitschek
|
e2fb094693
|
some more porting
|
2012-05-01 21:07:08 +02:00 |
|
Frank Karlitschek
|
1a2bbd2ee4
|
ported addSyript and other small stuff
|
2012-05-01 20:03:41 +02:00 |
|
Frank Karlitschek
|
e8ec999090
|
port to use the new public api
|
2012-05-01 09:49:22 +02:00 |
Georg Ehrke
|
2b10371bde
|
fix merge conflicts
|
2012-04-26 18:08:49 +02:00 |
|
Georg Ehrke
|
b44bc9f4b2
|
remove require once lib base in some more files
|
2012-04-18 17:42:11 +02:00 |
|
Georg Ehrke
|
45de7ad221
|
move files to app folder
|
2012-04-18 17:27:34 +02:00 |