Michael Gapczynski
|
60feaf9abf
|
Merge branch 'master' into share_expiration
Conflicts:
core/js/share.js
lib/util.php
|
2012-09-12 01:06:57 -04:00 |
|
Michael Gapczynski
|
54d4e556fe
|
Add lock and clock icon for sharing
|
2012-09-12 01:02:08 -04:00 |
|
Michael Gapczynski
|
8f0354bcdd
|
Temporarily disable sharing with contacts and emails, will come in next release
|
2012-09-12 01:02:08 -04:00 |
|
Michael Gapczynski
|
b194ac3dde
|
Add expiration column to share table and bump version number
|
2012-09-12 01:01:45 -04:00 |
Jenkins for ownCloud
|
8c9c095d48
|
[tx-robot] updated from transifex
|
2012-09-12 02:02:58 +02:00 |
|
Thomas Mueller
|
5c1a79210f
|
added hint to restart the web server in case recetly installed php modules are still not available
|
2012-09-11 23:51:12 +02:00 |
Jörn Friedrich Dreyer
|
b6a106a920
|
allow using only dbname for oracle
|
2012-09-11 18:12:38 +02:00 |
|
Jörn Friedrich Dreyer
|
bf2d1e78f2
|
don't set values with oc_appconfig when oc is not installed yet, allows to render guest page for installation again
|
2012-09-11 13:16:34 +02:00 |
|
Michael Gapczynski
|
37f0b85d3f
|
Fix problem with non share collection item types being treated as collections
|
2012-09-11 00:37:31 -04:00 |
|
Michael Gapczynski
|
ff6141b1e9
|
Change version number update occurs on to prevent problem with betas, users using the 4.5 betas will have to manually trigger the update if they want to get their old shared files back again
|
2012-09-10 21:57:13 -04:00 |
|
Jenkins for ownCloud
|
6a29bbda7a
|
[tx-robot] updated from transifex
|
2012-09-11 02:03:53 +02:00 |
Georg Ehrke
|
463b48b2e1
|
fix file upload
|
2012-09-10 14:41:27 +02:00 |
|
Jörn Friedrich Dreyer
|
86c3f9b8fe
|
Merge branch 'master' of github.com:owncloud/core
|
2012-09-10 14:14:49 +02:00 |
|
Jörn Friedrich Dreyer
|
db7a18455f
|
use tabs for indentation
|
2012-09-10 14:14:36 +02:00 |
|
Thomas Müller
|
5a65c5a46c
|
Respect coding style
|
2012-09-10 14:59:08 +03:00 |
|
Thomas Müller
|
0444877218
|
Respect coding style
|
2012-09-10 12:35:15 +03:00 |
|
Thomas Müller
|
c6cd1b77d3
|
Respect coding style
|
2012-09-10 12:32:49 +03:00 |
|
Thomas Müller
|
5721bd2786
|
Respect coding style
|
2012-09-10 12:31:57 +03:00 |
|
Thomas Müller
|
1a10955644
|
Respect coding style
|
2012-09-10 12:29:35 +03:00 |
|
Thomas Müller
|
2271a97992
|
Respect coding style
|
2012-09-10 12:28:09 +03:00 |
|
Thomas Müller
|
9a2bc5255b
|
Respect coding style
|
2012-09-10 12:26:20 +03:00 |
|
Thomas Müller
|
23f348c99f
|
Respect coding style
|
2012-09-10 12:25:42 +03:00 |
|
Thomas Müller
|
87e1a27fde
|
Respect coding style
|
2012-09-10 12:23:55 +03:00 |
|
Thomas Müller
|
f34588d1ff
|
Respect coding style
|
2012-09-10 12:21:54 +03:00 |
|
Jenkins for ownCloud
|
bd720bdf4c
|
[tx-robot] updated from transifex
|
2012-09-10 02:04:59 +02:00 |
|
Michael Gapczynski
|
deb1fbf9a1
|
Provide update script for files sharing
|
2012-09-09 18:29:47 -04:00 |
|
Michael Gapczynski
|
5c5955b31f
|
Disable link sharing for folders temporarily - next release
|
2012-09-09 14:52:03 -04:00 |
|
Michael Gapczynski
|
6c17a4cb77
|
Don't display actions for children in shared collections, show the parent collection the child is shared in
|
2012-09-09 14:44:08 -04:00 |
|
Michael Gapczynski
|
13d513c17c
|
Fix shared collection item searching
|
2012-09-09 11:50:12 -04:00 |
|
Michael Gapczynski
|
3e7951e1e6
|
Normalize the file path for shared children as a precaution
|
2012-09-08 23:42:24 -04:00 |
|
Michael Gapczynski
|
fe7f095b08
|
Insert id for unique user group share rows
|
2012-09-08 23:09:58 -04:00 |
|
Michael Gapczynski
|
b163bd514f
|
Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder
|
2012-09-08 23:09:57 -04:00 |
Robin Appelman
|
a050915167
|
move breadcrumb css to core so we can reuse it
|
2012-09-09 03:00:01 +02:00 |
|
Robin Appelman
|
0b2633a787
|
add breadcrumb controll to js
|
2012-09-09 03:00:01 +02:00 |
|
Michael Gapczynski
|
f23f719d99
|
Fix unsharing from self for group shares and add test for it
|
2012-09-08 20:15:47 -04:00 |
|
Jenkins for ownCloud
|
5e790368bc
|
[tx-robot] updated from transifex
|
2012-09-09 02:03:35 +02:00 |
|
Robin Appelman
|
9beb958845
|
forgot a ,
|
2012-09-09 00:35:02 +02:00 |
|
Robin Appelman
|
b14265b5c3
|
add js versions of basename and dirname
|
2012-09-08 23:59:02 +02:00 |
|
Robin Appelman
|
46422e6dbe
|
don't use regular expresions for a simple string replace
|
2012-09-08 23:40:23 +02:00 |
|
Robin Appelman
|
697061fa9f
|
add OC_Image::fitIn
|
2012-09-08 23:26:19 +02:00 |
Thomas Tanghus
|
abc930c57c
|
Suppress error message which would send headers for hosted sited where disk_free_space() has been disabled for security.
|
2012-09-08 17:58:59 +02:00 |
|
Georg Ehrke
|
2b42893fa9
|
style fixes for public util api
|
2012-09-08 16:18:47 +02:00 |
|
Georg Ehrke
|
89f3afe2fe
|
style fixes for public user api
|
2012-09-08 16:17:01 +02:00 |
|
Georg Ehrke
|
439ede2a1d
|
style fixes for public response api
|
2012-09-08 16:15:42 +02:00 |
|
Georg Ehrke
|
a16565a7fa
|
style fixes for public json api
|
2012-09-08 16:14:06 +02:00 |
|
Georg Ehrke
|
89e5b85fa7
|
style fixes for public files api
|
2012-09-08 16:02:11 +02:00 |
|
Georg Ehrke
|
6b2b8b10ee
|
style fixes for public db api
|
2012-09-08 16:00:32 +02:00 |
|
Georg Ehrke
|
221257d2fb
|
style fixes for public config api
|
2012-09-08 15:58:28 +02:00 |
|
Georg Ehrke
|
eca24f74f7
|
style fixes for public app api
|
2012-09-08 15:54:30 +02:00 |
|
Georg Ehrke
|
c692dfc1ab
|
style fixes for public app api
|
2012-09-08 15:52:29 +02:00 |