a85a10b378
oc_db isn't pdo
2012-03-11 21:48:52 +01:00
f6075cc1fe
gallery migration to events system
2012-03-11 16:49:42 +01:00
d712d7f52c
Lots of fixes, improve copyRows() method and update settings page.
2012-03-10 18:18:58 +00:00
3ca76d24a9
Add OC_Migrate::copyRows() method
2012-03-10 15:52:38 +00:00
c3dfcc5b21
First basic implementation of migration.db.
2012-03-09 23:33:11 +00:00
b4ffaa9498
spaces to tabs replacement
2012-03-09 16:47:53 +01:00
ca9b4e467f
filescan by mimetype scan
2012-03-09 16:45:57 +01:00
84d6c53970
filecache search comparition fix
2012-03-09 16:28:26 +01:00
57c4d39b1e
Fix conflict.
2012-03-07 20:57:05 +01:00
75323b86d1
Contacts: UI updates and ajax methods for categories.
2012-03-07 16:39:56 +01:00
9f01533710
fix for webdav when having additional storage backends mounted
2012-03-07 15:44:46 +01:00
f06858689f
revert an accidental change
2012-03-03 22:12:17 +01:00
72947e46d1
small improvement for is_dir
2012-03-03 21:23:35 +01:00
bb97cbbb0c
fix commong filestorage for files without extention
2012-03-03 21:23:35 +01:00
0f54084305
also delete childs of folders from the cache
2012-03-03 21:23:35 +01:00
2e365658c8
better handeling of files that can behave like folder (e.g. archives)
2012-03-03 21:23:35 +01:00
691103acd5
Use json for migration data
2012-03-03 17:30:21 +00:00
34f05ba180
Udpdate bookmarks migration provider. App version included in export.
2012-03-03 14:35:17 +00:00
188a304625
Replace db on import. Update user_migration export function.
2012-03-03 13:26:01 +00:00
1794ad353d
fix file_get_content on empty files for filestorage common
2012-03-03 00:57:52 +01:00
86fed4c226
Update database.xml locations. Fix dbexport.xml.
2012-03-02 22:19:06 +00:00
9c79de4aa0
removed duplicate function
2012-03-02 21:47:20 +00:00
45ef2ecf52
Fix merge conflict
2012-03-02 21:35:48 +00:00
90e2962c91
Remove the link between the principals table and the sabre principals connector.
2012-03-02 20:37:49 +01:00
48fe85d9bd
add streamwrapper that provides a callback on stream close
2012-03-02 18:42:57 +01:00
e8afe4f158
add search implementation to filestorage common
2012-03-02 18:42:57 +01:00
b621431c11
don't try to seach apps in hidden folders
2012-03-02 18:42:57 +01:00
d1dcd7893c
Search: Change provider registration to class name, for lazy loading of search providers
2012-03-01 22:59:35 +01:00
8c7b13db70
Files: Fix wrong attribute name in OC_Search_Provider_File
2012-03-01 22:59:35 +01:00
3d3190309f
Simplify stripping the last part off WEBROOT and SERVERROOT for 3rdparty and app dir
2012-03-01 22:59:35 +01:00
5dcd9e20d0
Small cleanups
2012-03-01 21:00:23 +01:00
33c5b3a2ef
Added replaceDB method in lib/db.php
2012-03-01 19:41:14 +00:00
6ecbaf0041
load streamwrappers earlier
2012-03-01 18:44:33 +01:00
0b4607321f
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-03-01 15:21:12 +01:00
d29a02a65a
undo the change of the webroot detection. seams to be buggy
2012-03-01 15:19:44 +01:00
e76e4e7540
add touch() to all storage backands, and make parameter optional
2012-02-29 23:44:05 +01:00
b23b5aae7f
remove debug output
2012-02-29 23:17:49 +01:00
baffa03fa5
Fix opendir for folders aka Google Docs collections
2012-02-29 13:18:33 -05:00
02f15e9a03
More work on Google Docs storage backend
2012-02-28 19:16:52 -05:00
2754cac21f
dialogs library for apps
2012-02-28 23:02:30 +01:00
0a9b0ee382
change the detection of the webroot. it is simpler now and also works for app directories outside the owncloud folder. works for me and hopefully for everybody else too
2012-02-28 18:21:23 +01:00
a829ce69c5
make sure the streamwrappers are registered early
2012-02-28 17:25:15 +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
d1c3aa3112
add test case for getLocalFile
2012-02-28 12:06:34 +01:00
de37bafa5c
use in-memory files for the datase scheme during installation
2012-02-28 11:39:39 +01:00
3e0bb3e7c4
use temporary file managment
2012-02-28 11:33:59 +01:00
a76ff563d6
fix temporary file creation
2012-02-28 11:32:45 +01:00
273d7fb4fd
fix copy/paste error in common filestorage
2012-02-28 11:16:41 +01:00
77b51f03e3
add temporary file managment
2012-02-28 11:16:19 +01:00
d190ebee48
Initial work on Google Docs storage backend
2012-02-27 15:00:17 -05:00
5943af17e7
spaces -> tabs
...
Thanks to Jakob for reminding me
2012-02-27 18:01:43 +01:00
d8d4420f22
some cleanup in filestorage
2012-02-27 12:20:37 +01:00
cef230c141
extend filestorage common and provide test implementation
2012-02-27 12:04:42 +01:00
e2721fc93c
make OC_FileStorage abstract
2012-02-27 11:28:11 +01:00
ab96fa67c8
first part of the abstraction work of the apps folder. more to come
2012-02-26 18:26:41 +01:00
857535403c
add more valid fopen modes
2012-02-26 15:32:58 +01:00
d4d09b06f8
merge master into encryption
2012-02-26 14:21:06 +01:00
62cd89da14
improved password hashing based one phpass
...
old passwords are automatically upgraded on login
2012-02-26 14:12:50 +01:00
92c7b2717d
add OC_Geo class
2012-02-26 13:45:20 +01:00
6c501f90bb
hopefully a fix for webroot detection
2012-02-26 04:09:48 +01:00
c8c3b8a63e
chunked implementation for readfile
...
prevents memory issues when downloading large files
2012-02-26 03:54:21 +01:00
fe0832746b
intval() of a number seems unnecessary
...
and it could cause 32bit integer overflow issues
2012-02-26 03:31:04 +01:00
797e921b9a
improve log browsing
2012-02-26 03:10:29 +01:00
4f627c428e
some more error reporting during filesystem scan
2012-02-25 20:27:16 +01:00
dda79a90cf
don't limit ourselfs to 32bit integers
2012-02-25 16:51:59 +01:00
ea8f71a19c
Merge branch 'master' into encryption
2012-02-25 16:36:58 +01:00
8b93a9a237
add javascript bindings for OC_AppConfig
2012-02-25 16:35:40 +01:00
097ce76fc4
Merge branch 'master' into sabredav_1.6
2012-02-25 16:29:32 +01:00
0d2f1688e4
add empty methods updatePrincipal and searchPrincipals and change method getPrincipalByPath to work with sabredav 1.6
2012-02-25 16:26:47 +01:00
cc15852386
replace Sabre_DAV_Exception_FileNotFound with Sabre_DAV_Exception_NotFound
2012-02-25 09:35:35 +01:00
9dcf29ff51
fix bug in group mangement
2012-02-24 23:54:38 +01:00
9f5bce81b0
add a default user quota
2012-02-24 23:54:38 +01:00
e039015ca1
prevent errors when a user backends gives an invalid result
2012-02-24 23:54:38 +01:00
1d1dfcbc1a
replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime
2012-02-24 22:20:40 +01:00
e082d473bb
Merge branch 'master' into sabredav_1.6
2012-02-24 18:51:38 +01:00
ca874a3ad7
remove limit from configvalue for long config values
2012-02-24 14:18:09 +01:00
eae32e05c9
Merge branch 'master' into sabredav_1.6
2012-02-23 22:12:00 +01:00
a02d5d1a3d
log typo fix
2012-02-23 19:29:11 +01:00
3e756407a0
check if the tempfile was created successfully
2012-02-23 18:23:09 +01:00
95fe159914
make lib/vobject.php work with sabredav 1.6
2012-02-23 17:20:03 +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
2e05bd69f5
add javascript bindings for OC_AppConfig
2012-02-22 22:20:11 +01:00
9794e7e427
Fix merge conflict.
2012-02-22 11:20:57 +01:00
c20319d377
fix incorrect information in the filecache when using encryption
2012-02-21 20:48:49 +01:00
d9c7e4c333
proper mimetypes for encrypted files
2012-02-21 20:48:48 +01:00
325858e9e2
add stream wrapper for in-memory files and dont use global variables for the fakedir stream wrapper
2012-02-21 20:48:48 +01:00
c121a1a1e7
implement file_put_contents with stream data using fopen
2012-02-21 20:48:48 +01:00
95459d068e
non existing files can never be updated
2012-02-21 20:48:48 +01:00
1cffeefa06
move implementation of from/toTmpFile from the file storage to the filesystem
2012-02-21 20:48:48 +01:00
6658f51098
provide early file system when using webdav
2012-02-21 20:48:48 +01:00
b3a974d8bb
only trigger hooks for the default filesystem view
2012-02-21 20:48:48 +01:00
501678f981
always mount the root filesystem, sometimes we need the filesystem when not logged in
2012-02-21 20:48:48 +01:00
f1cbb9effc
initial integration of encryption
2012-02-21 20:48:48 +01:00
e53e7990c4
improve get_temp_dir() implementation
2012-02-21 20:48:48 +01:00
fd4b30ac6f
no post hooks for fopen
2012-02-21 20:48:48 +01:00
e9af218562
use streams instead of temporary files for cross-storage copy and rename
2012-02-21 20:48:48 +01:00
82394f9527
add option to dissable fileproxies
2012-02-21 20:48:47 +01:00
3d67cd51c2
encryption proxy wip
2012-02-21 20:48:47 +01:00
abc749feeb
make documentation reflect reality a bit better
2012-02-21 20:48:47 +01:00
b6ed61eab2
pass paramters to file proxies by reference so they can be modified
2012-02-21 20:48:47 +01:00
987845c312
Move the redirect_url from linkTo function to the checkLoggedIn function
2012-02-21 20:09:24 +01:00
36b7d819e5
restore redirect after checkLoggedIn
2012-02-21 10:22:17 -05:00
be948a9baa
Check for empty value in ctor and being conservative about configvalue name ;-)
2012-02-21 09:53:03 +01:00
7c7031df44
Forgot to assign param.
2012-02-21 00:02:27 +01:00
77ab89a7cb
Review changes of OC_VCategory
2012-02-20 22:32:57 +01:00
430ccef09c
Added OC_VCategories::rescan()
2012-02-20 13:16:51 +01:00
8a1b671fdd
Switch from using separate db table to use OC_Preferences.
...
There is a limitation in that the the configvalue field in the preferences table is a varchar(255).
2012-02-19 17:00:07 +01:00
adec09b075
Merge gitorious.org:owncloud/owncloud into vcategories
2012-02-19 13:11:13 +01:00
71aa36c3f1
ETags must be quoted.
2012-02-18 11:49:31 +01:00
0203f55fbf
Added first draft of OC_VCategories.
2012-02-18 11:45:36 +01:00
6f1ed85f0b
Temporary fix for sharing files
2012-02-17 21:56:20 -05:00
1fa05894d5
Move config.php writable test to update path
...
This should make it possible to use owncloud with a read-only config.php
2012-02-17 22:10:03 +01:00
45cff7b737
Move storing "last updated at" time to the app config
...
This way the config.php file is not changed every time you go to the
personal page. Step to make it possible to have a read-only config.php
most of the time
2012-02-17 22:10:03 +01:00
bd7227bb93
Spelling fix hint text
2012-02-17 22:10:02 +01:00
e8b69d45a3
Fixup use of OC_Helper::linkTo function
2012-02-17 22:07:14 +01:00
f47444e1f7
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
f54c767d72
Fix parameter of OC_Response::sendFile
2012-02-17 22:07:13 +01:00
bcbebe390b
Document OC_Response
2012-02-17 22:07:13 +01:00
496c1581d7
ETags must be quoted.
2012-02-16 23:24:23 +01:00
0e2531ba57
Added method for loading from file handle.
2012-02-16 10:38:00 +01:00
c2fb5fed02
use cached size for getting the size of a moved file
2012-02-15 14:43:06 +01:00
127c0c7033
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-02-14 16:34:33 +01:00
d53ed4b40b
make it possible to override every image and logo with a new version from within a theme. I think we have a very cool theming here. *self-praise*
2012-02-14 16:32:38 +01:00
064f87680b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-02-14 10:01:20 +01:00
60a03580ff
allow to set a files mtime through a PROPPATCH request on resource
...
'lastmodified'. Needed for syncing algorithms.
2012-02-14 09:59:54 +01:00
3c52ac7af3
make local filestorage comply with test cases
2012-02-14 01:00:41 +01:00
525306c1e2
Replace Expires and caching headers by OC_Response functions
2012-02-13 23:48:05 +01:00
29fc82c364
Send gallery album thumbnail with OC_Response::sendFile
2012-02-13 23:35:37 +01:00
594dcf13f2
Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModifiedHeader
2012-02-13 22:47:31 +01:00
0fd5252cfc
OC_Image: Move Content-Type header to show function
2012-02-13 22:41:05 +01:00
363fdc40b8
OC_Response: Set Expire and Cache-Control headers in enableCaching
2012-02-13 22:37:27 +01:00
7208abf618
OC_Response: fix var name bugs
2012-02-13 22:35:48 +01:00
a25bda8e41
Add application name to title
2012-02-12 21:56:01 +01:00
125cf79a37
OC_Response: add setExpiresHeader function
2012-02-12 20:40:52 +01:00
45bb6f5fd4
OC_Response: add redirect function
2012-02-12 20:40:52 +01:00
3579446930
use SimpleTest for unit testing
...
includes some tests for storage providers, more to come
2012-02-12 18:07:58 +01:00
0917bdecdd
Contacts: Move response caching to OC_Response
2012-02-12 17:21:33 +01:00
3eff161bbf
OC_Image: Use valid function instead of checking the resource
2012-02-12 15:14:24 +01:00
192b8906a3
Add copyright to OC_Connector_Sabre_Principal
2012-02-12 15:14:23 +01:00
6929652e14
Redirect to installer if not installed
2012-02-11 17:37:47 -05:00
26a5c13906
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-02-11 23:26:42 +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
b5418173e5
Derive the user principles from the owncloud users
...
The code for updating the principles table is still there. To make it easier to
revert this commit if that is necessary.
2012-02-11 21:09:51 +01:00
2f80df1f9e
Merge branch 'master' of gitorious.org:owncloud/owncloud into migration
2012-02-10 15:24:26 +00:00
85853f9ec2
- Added the ability to change a files mtime via webdavs propset.
...
- Added some minor debug help to fscache
2012-02-10 11:30:38 +01:00
8684e847b0
OC_Image: change static vars to object vars
2012-02-09 22:44:26 +01:00
b4d84bd9bb
dont try to remove buffers, can cause trouble with strict warnings
2012-02-09 19:53:02 +01:00
c4864b4a54
don't use PDO::inTransaction
2012-02-09 19:53:02 +01:00
25381ac5b1
fix filecache with MDB2
2012-02-08 21:39:09 +01:00
398fbe7b82
use fetchRow instead of fetch
2012-02-08 21:26:45 +01:00
eb5de4d4f7
Change gallery thumbnail generation to OC_Image
2012-02-08 21:12:30 +01:00
24748ee10f
add convinience function to get filesystem view for app storage
2012-02-08 21:01:09 +01:00
bcebfbfbe2
bugfix in searching files by mimetype
2012-02-08 17:29:54 +01:00
e50dfbc228
fix filecache when creating a new folder
2012-02-06 19:33:37 +01:00
9f3388ecbc
store writable flag for files
2012-02-05 14:04:10 +01:00
30673e4786
writable not writeable
2012-02-05 14:03:44 +01:00
25e777ef5e
watch for changes outside owncloud to the files
2012-02-05 03:06:33 +01:00
0bb48d814b
fix bug in transactions with PDO
2012-02-05 01:23:41 +01:00
1133eaa679
load bookmarks provider class
2012-02-03 21:28:58 +00:00
ee88ded463
more commenting out for debugging, added logging commands
2012-02-03 21:00:12 +00:00
0bbc9ade7d
fix syntax, add logging, debug xml output instead of zip
2012-02-03 20:48:32 +00:00
5507db9b15
Initial migration code, and basic export for bookmarks
2012-02-03 20:32:06 +00:00
05d76dcd67
allow the usage of the filecache outside of the users home folder
2012-02-02 19:04:13 +01:00
a69d3c3346
only show what folder we are scanning to save bandwith
2012-02-01 15:25:00 +01:00
371b4642bb
proper file sorting
2012-01-31 16:33:47 +01:00
f1c5dce75c
dont try to use something that isn't there
2012-01-31 16:33:36 +01:00
c46f701771
use filesystem cache for searching
2012-01-31 16:12:49 +01:00
7ff86cfebe
provide live feedback while scanning files
2012-01-31 13:56:58 +01:00
803f86e0fc
dont try to use the filesystem when it isnt setup yet
2012-01-31 12:44:01 +01:00
ffecc3e434
start of proper feedback during filessytem scan
2012-01-30 23:32:55 +01:00
1191b57b34
Merge branch 'master' into filesystem
2012-01-30 23:20:47 +01:00
6a1121ab2e
provide server side close option for EventStream
2012-01-30 23:19:58 +01:00
4522d19b4c
merge master into filesystem
2012-01-30 20:29:33 +01:00
45038af948
provide small wrapper around server side events and provide a fallback for IE
2012-01-30 20:21:16 +01:00
21bf8e99ee
increase version number to 3. YeeHaw party!!
2012-01-27 17:39:55 +01:00
05f1fffddc
fix appstore download.
2012-01-27 17:34:47 +01:00
500407dbe9
change https detection a bit, hopefully fixing an edge case
2012-01-27 00:37:11 +01:00
2f4a289782
fix non-absolute symbolic links
2012-01-27 00:21:15 +01:00
935b828427
initialize all storage backends when searching for a file, fixed searching in the Shared folder
2012-01-26 17:56:13 +01:00
5238a7812c
bump version number
2012-01-21 17:33:43 +01:00
6866165a37
make oc_image work when php_exif isn't enabled
2012-01-20 17:13:49 +01:00
3552626358
Merge branch 'master' into filesystem
2012-01-20 00:48:03 +01:00
11c848b221
initial work on filesystemview
2012-01-20 00:48:00 +01:00
941f199caf
dont complain about non existing config files
2012-01-16 20:17:45 +01:00
d7ed456f96
forgot to merge something
2012-01-16 14:36:11 +01:00
96e2f15d8a
merge master into filesystem
2012-01-16 03:06:11 +01:00
ebe10870cf
fix database upgrading for pgsql
2012-01-16 02:06:19 +01:00
907dd4d24d
some aditional feedback during database upgrade
2012-01-16 01:15:43 +01:00
ac188ec74b
properly check for write permissions to the config file
2012-01-15 23:58:00 +01:00
9c04858631
added vcards to the mimetype fix list and renamed the icon for vcards
2012-01-15 11:02:08 +01:00
0c76884f98
add icon for log app
2012-01-14 23:39:05 +01:00
ef69abd4dc
constans for signals handling
2012-01-14 23:13:01 +01:00
36a2649e37
use admin icon for log menu enty untill we have a proper icon
2012-01-14 22:02:26 +01:00
f4ce399162
fix issue with moving music files
2012-01-14 21:13:46 +01:00
7d53b6f106
remove temporary files after updating
2012-01-13 20:05:44 +01:00
6e0ea7aaae
use absolute path for db_structure.xml when updating
2012-01-13 20:05:24 +01:00
37dbf48434
Connect to the newly created database when checking if it needs to be filled.
2012-01-13 04:38:59 +01:00
e60860148c
Don't chunk_split encoded image string.
...
Don't return json error but null if card can't be parsed.
Small check for non-parsable card in index.php.
2012-01-12 22:50:12 +01:00
0fb73ec49d
fix previous change
2012-01-12 21:54:58 +01:00
a1429085ee
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-12 21:43:32 +01:00
a0ff21a232
added a file to fix wrong recognised mime-types
2012-01-12 18:26:13 +01:00
fd4b63810d
default table prefix to oc_ if not set
2012-01-10 14:41:08 +00:00
5f04b41ea6
Just a comment ;-)
2012-01-09 20:40:24 +01:00
5e40653713
Missing line return
2012-01-08 21:18:21 +00:00
fbb126cdd9
save updated version number of apps after updating
2012-01-08 19:58:20 +01:00
de3032fd00
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-08 17:02:07 +00:00
ccc43f0ea0
merge master into filesystem
2012-01-08 18:01:33 +01:00
37f5a8cdb4
improve pgsql database detection
2012-01-08 17:49:53 +01:00
e5d3666280
Merge branch 'master' of gitorious.org:owncloud/owncloud into jqueryui
2012-01-08 16:45:28 +00:00
49337e0ad1
dont create a new user when it already exists
2012-01-08 14:25:38 +01:00
ae711168c3
improve detection for mysql databases
2012-01-08 14:07:12 +01:00
a4e14b49b1
load reverse driver when updating database
2012-01-08 13:16:11 +01:00
76b193c698
don't try to upgrade what isn't installed
2012-01-08 13:01:59 +01:00
034cf19159
allow changing database backends between PDO and MDB2
2012-01-08 02:57:52 +01:00
010bfa11e3
Fix updateApp() and add extra check to updateApps()
2012-01-08 02:12:52 +01:00
fea68e08b4
update apps when their version number increases
2012-01-08 01:57:53 +01:00
001d06f2ff
fix errors during database migration
2012-01-08 01:57:53 +01:00
c6aa0f9854
set the installed version after updating the database
2012-01-08 01:57:53 +01:00
09a53170a3
fixes in the sqlite manager driver
2012-01-08 01:57:53 +01:00
ecf6f2ca2f
automatically upgrade the main database on version number increase (doesnt work with sqlite for now)
2012-01-08 01:57:53 +01:00
9a4e37483b
small fix in sqlite3 driver
2012-01-08 01:57:53 +01:00
91a9688d07
minor changes to mysql setup
2012-01-08 01:57:53 +01:00
6c09d9e0f8
some fixes in the sqlite3 driver
2012-01-08 01:57:53 +01:00
799a7db638
Merge branch 'filesystem' of gitorious.org:owncloud/owncloud into filesystem
2012-01-08 01:57:14 +01:00
d1edc360d9
merge master into filesystem
2012-01-08 01:53:40 +01:00
8f8985c3e5
Merge branch 'database'
2012-01-08 01:45:18 +01:00
0d81014fa6
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-06 19:15:29 +01:00
d485a70e7d
finish the application store feature so that users can download and install ownCloud apps from our website. there is still a small problem with write permissions. will look into this later
2012-01-06 19:08:35 +01:00
47a275f389
Use parameter
2012-01-06 18:04:24 +00:00
f9db4249a3
add a formfactor session variable which is autodetected but can also manually overwritten via a get variable.
...
currently we have:
* default -> the normal desktop browser interface
* mobile -> interface for smartphones
* tablet -> interface for tablets
* standalone -> the default interface but without header, footer and sidebar. just the application. useful to use just a specific app on the desktop in a standalone window.
In the future we should adapt the userinterface to the specific formfactor.
2012-01-06 17:21:24 +01:00
2f86a6203a
Added fixOrientation method which rotates the image based on EXIF data.
2012-01-05 17:42:40 +01:00
d80b477ab5
Wrong permission checking on file save.
2012-01-04 23:31:32 +01:00
48a8f2a793
Content type header was sent when saving image to disk.
2012-01-04 22:57:42 +01:00
b6d66c4727
Remove the keys in preferences when a user is deleted - Thanks rogerc
2012-01-04 15:19:16 -05:00
6dcabdc61c
Fixed merge conflict in /files/ajax/move.php
2012-01-04 16:31:06 +00:00
868a3b5364
Fix sqlite detection for Ubuntu 11.10
2012-01-03 15:58:48 +01:00
9e9bc1430b
don't check if the target path is writable for operations that can create a new file
...
fixes file upload
2012-01-03 15:55:38 +01:00
4c8f17ad47
don't try to use mod_rewrite when it isn't enabled
...
having a broken web/card/caldav is much better as having no ownCloud at all :)
2012-01-03 04:55:57 +01:00
b8cffbc0ee
OC_Image::__invoke didn't return anything thus causing contacts/thumbnail.php to spit out lots of error messages.
2012-01-02 23:17:15 +01:00
2a184631d1
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 19:38:10 +01:00
cc55f00481
fix is_readable and is_writable
2012-01-02 16:38:10 +01:00
6a7fbf9d13
Added more error checking and debug on missing image support.
2012-01-02 13:40:23 +01:00
c62c55fb81
Added save() to OC_Image.
2012-01-02 12:09:45 +01:00
534b6f3a09
Fix whitespace username
2012-01-02 11:49:53 +01:00
29048bf4bd
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 11:47:02 +01:00
4374d55e5e
Correct local permissions checks
2012-01-01 19:59:24 -05:00
fb4c3bd9ce
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 01:09:22 +01:00
a8789ebe29
Removed static declaration from loadFrom* methods.
2012-01-02 00:43:27 +01:00
a9bab168f5
Replace canRead()/canWrite() with is_readable()/is_writeable() for proper permission checks
2012-01-01 18:41:00 -05:00
db6738478b
Mixed up two lines :-P
2012-01-01 23:34:26 +01:00
312e7993bb
Added image type specific loading and displaying.
...
Added method 'valid()' to tell if image contains a valid resource.
Renamed imageResource() to resource().
2012-01-01 23:26:24 +01:00
a22b5feda6
Initial commit of common filestorage
2012-01-01 17:05:22 -05:00
7250dc4e98
Fix updateApp() and add extra check to updateApps()
2012-01-01 16:58:51 -05:00
782d201191
Move to branch
2012-01-01 16:25:43 -05:00
19328fd8b2
Initial commit of common filestorage
2012-01-01 15:56:33 -05:00
929ce2b566
Small fixes
2012-01-01 20:06:35 +01:00
c500c1e930
Removed some denug statements and an exception thrown.
2012-01-01 18:07:46 +01:00
6207c0444b
Added class OC_Image
2012-01-01 17:57:26 +01:00
cbb2db8622
Fix merge conflicts
2012-01-01 01:18:02 +00:00
39e67707d7
Updated jquery ui js and css. Improved color scheme.
2011-12-30 22:47:39 +00:00
eb4cd86910
Include PostgreSQL when checking for available database drivers.
...
Signed-off-by: Brice Maron <brice@bmaron.net>
2011-12-30 21:09:29 +01:00
3844fb0e4c
also use fscache when getting used space for webdav
2011-12-14 01:19:23 +01:00
835d6a9b6e
save quota in human readable format (42 MB), should prevent some of the overflow related problems
2011-12-14 01:16:14 +01:00
c67c933d3f
Merge branch 'database' into filesystem
2011-12-11 23:57:53 +01:00
9fdd1bafdc
Merge branch 'master' into filesystem
2011-12-11 23:42:22 +01:00
5e711f37ca
make filesize parsing case insensitive
2011-12-11 23:34:27 +01:00
efecb694ef
make filesize parsing case insensitive
2011-12-11 23:33:24 +01:00
a8148fa94a
update apps when their version number increases
2011-12-11 22:08:01 +01:00
7f1bb5fd78
Merge branch 'master' into database
2011-12-11 22:00:17 +01:00
1746cba249
Some small changes
2011-12-09 22:36:39 +01:00
a3cb04013e
Update OC_VObject
2011-12-09 21:56:03 +01:00
eeaf539a44
Gallery: splitout model code
2011-12-08 20:05:12 +01:00
0342b5fc43
Fix filename of log icon
2011-12-07 20:41:00 +01:00
c67ac46b6c
Use a proxy class to interface with Sabre_VObject classes
2011-12-07 20:40:58 +01:00
153029a170
increase version to trigger database upgrade
2011-11-26 01:26:01 +01:00
a8e4d2946a
Merge branch 'database' into filesystem
2011-11-26 01:25:08 +01:00
43911d9a6f
Template: output better html for select options
2011-11-24 21:36:34 +01:00
fab70cb590
removed no longer used function and exec command
...
security++
2011-11-24 13:50:29 +01:00
76bfc3b547
set http auth headers for apache+php-cgi work around if variable gets renamed by apache
2011-11-24 02:59:22 +01:00
6c4692380f
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-11-20 11:41:58 +01:00
7df9d934ca
second half of the updating stuff
2011-11-19 12:02:34 +01:00
949bd2c47a
first small step to an automatic updating system.
...
At the moment we only have a hint that a new version is avaiable and a link to a not yet existing page if updating information. This has to be improved.
2011-11-19 11:56:40 +01:00
98dc0882cb
fix errors during database migration
2011-11-15 16:08:08 +01:00
916c72b40b
set the installed version after updating the database
2011-11-15 15:59:01 +01:00
9686c5b6aa
fixes in the sqlite manager driver
2011-11-15 15:58:12 +01:00
b2f1429b75
automatically upgrade the main database on version number increase (doesnt work with sqlite for now)
2011-11-13 16:16:21 +01:00
aa7c5a971c
small fix in sqlite3 driver
2011-11-13 16:08:47 +01:00
486a31bfa3
minor changes to mysql setup
2011-11-13 16:06:29 +01:00
bf40691ace
some fixes in the sqlite3 driver
2011-11-12 18:06:07 +01:00
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
024f4375b6
keep encrypted and versioned flag in fscache
2011-11-12 01:00:04 +01:00
b2f2a87745
use cache for searching files
2011-11-10 23:50:43 +01:00
7543ffa3b1
always load the filecache
2011-11-10 16:53:08 +01:00
524e3686a0
tell the user when the files are being scanned
2011-11-10 16:40:09 +01:00
ef124c3e21
Use a function to generate select options
2011-11-09 22:19:52 +01:00
5a6aba1e11
provide caching for file metadata
2011-11-09 18:41:57 +01:00
b3a73c78e8
Fix comments/documentation
2011-11-09 11:35:50 +01:00
5cc6635eb8
remove OC_Filesystem::fromUploadedFile
2011-11-08 22:36:05 +01:00
ca6c500799
remove OC_Filesystem::fileatime
2011-11-08 22:26:03 +01:00
ec015a2e68
remove the need to register storage providers, pass the classname during mounting instead
2011-11-08 22:21:25 +01:00
878fc1d197
remove outdated remote storage prototype
2011-11-08 22:18:41 +01:00
452a463764
Make OC_Connector_Sabre_File::get() return a PHP stream instead of the file content, as is recommended by SabreDAV to handle large files.
2011-11-06 22:39:24 +01:00
3940ca3df1
Display correctly the error message when nothing is retrieved from OCS servers
2011-11-06 16:48:26 +01:00
7de591f5cc
Avoid Huge error message when unable to read log file
2011-11-06 14:37:22 +01:00
7b3ae2edd4
use database table prefix from installer, not the old configured value
2011-11-03 13:09:51 +01:00
c7d1737d47
attempt to manage some special chars in file list
...
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
e533e82bc9
Add sequence name in insertid to be more portable
2011-10-29 11:40:48 +02:00
7b01858c57
Enable php display_errors setting
2011-10-27 22:48:50 +02:00
9832a0817d
Merge branch 'master' into fullcalendar
...
Conflicts:
apps/calendar/index.php
2011-10-24 22:40:22 +02:00
f073041b0b
provide function for updating the database scheme
2011-10-23 15:25:38 +02:00
6592fbb948
improve detection of database backend
2011-10-23 12:32:33 +02:00
122fa190c6
improve mimetype detection
2011-10-23 11:35:29 +02:00
38bb503ff6
fix fopen
2011-10-23 11:35:29 +02:00
3acea2f574
change the error hint from suggesting to change the owner of a directory to changing the permissions. changing the owner of a director is not possible via ftp.
2011-10-22 19:39:05 +02:00
0011c42669
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-22 13:12:13 +02:00
7761765a4b
change licencing headers for sqlite3 driver
2011-10-22 12:31:07 +02:00
af1f0305eb
fix log level check
2011-10-22 12:22:57 +02:00
4fe48a50f0
Translation of calendar interface
2011-10-20 23:49:27 +02:00
3a937f79f7
escape filenames for getMimeType
2011-10-20 22:55:27 +02:00
8f77179d29
Merge commit 'refs/merge-requests/64' of git://gitorious.org/owncloud/owncloud
2011-10-20 01:24:23 +02:00
273972b75a
prevent sql error while initializing apps on sqlite2
2011-10-20 01:17:02 +02:00
466b41c36b
Don't use sys_get_temp_dir(), as it reports the wrong path in restricted environments
2011-10-19 23:38:35 +02:00
b975f11514
make sharing work with the new mouting mechanism
2011-10-18 21:19:13 +02:00
28ab39073a
mount filesystems on demand
2011-10-18 21:01:49 +02:00
ebd36d56ca
Remove unnecessary exec for getting timezone and fix spacings
2011-10-17 21:42:38 +02:00
595b13f1e0
prevent the remaining ob_clean related errors
2011-10-17 01:18:02 +02:00
77378fa189
fix now() function for sqlite3
2011-10-17 00:25:13 +02:00
1f6be85719
Fix bookmarks app to work with postgresql.
...
Rework the bookmark app to manage postgresql.
Add a fetchOne function into the PdoStmtWrapper
Fix a tipo in comments.
2011-10-16 23:03:03 +02:00
b0127e3918
use OC_Log instead of error_log
2011-10-16 21:42:24 +02:00
d9372ac766
make log level configurable
2011-10-16 21:11:03 +02:00
820cd0fb75
provide a logging mechanism
2011-10-16 21:11:03 +02:00
d11a8f4103
some minor tweaks to oc_db
2011-10-16 21:11:03 +02:00
90c54ade67
Fix typo in getting var from config
2011-10-16 21:08:07 +02:00
c105268a1d
Fetch prefix from config at installation instead of a hardcoded value
2011-10-16 21:06:48 +02:00
543537ef29
Fix installer for postgresql : correct table detection query
2011-10-16 20:23:43 +02:00
9ce15667d5
Merge branch 'calendar' of gitorious.org:owncloud/owncloud
2011-10-16 15:41:00 +02:00
512d226d43
merge database into master
2011-10-16 13:54:21 +02:00
a01d10e57d
Merge branch 'master' into calendar
2011-10-13 21:59:16 +02:00
db2fb38746
prevent error involving webdav workaround
2011-10-13 21:55:02 +02:00
f1fd374a6f
webdav workaround for apache+php-cgi
2011-10-13 16:33:39 +02:00
d7fa2a0f77
mimetype icon improvements
2011-10-13 16:33:39 +02:00
ffb9a0475e
webdav workaround for apache+php-cgi
2011-10-13 16:31:01 +02:00
9d3c7badb5
Fixed a bug in checkWebserverUser
...
checkWebserverUser would return the owner of the document
root instead of the owner of the web server process.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-11 21:46:14 +02:00
4cbae823eb
Merge branch 'master' into calendar
2011-10-10 21:08:11 +02:00
9ba384b9a4
merge master into database
2011-10-10 21:05:39 +02:00
8b3c4e9a52
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-10 20:57:15 +02:00
6163351ea2
master is now on the way to ownCloud 3
2011-10-10 18:48:40 +02:00
949494ccfd
mimetype icon improvements
2011-10-08 21:18:47 +02:00
538abb99f1
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:10:50 +01:00
1f562a2e83
fixes for the mimetype icons
2011-10-07 18:09:49 +02:00
65a491eabd
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:02:56 +01:00
3388381deb
Fixed the 'Undefined index "user_id"' bug when requesting a publicly shared folder and being logged-out.
...
The OC_App::navigation array contains by default only the help menu.
2011-10-05 14:31:33 +04:00
2d9c3d75f3
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-04 19:17:23 +01:00
33f24a42b8
redirect url fixed
2011-10-04 19:27:57 +02:00
02d7b1a1fc
Added breadcrumb and control bar.
2011-10-03 22:59:40 +01:00
baf2fa3a9f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-10-03 14:47:41 +02:00
6d8985ceb2
added infield labels. readded fade in of login button. updated label on install page.
2011-10-03 14:41:55 +02:00
25544d31f9
added mime type for calendar files
2011-10-03 12:16:06 +02:00
0eddc5cae2
bump version number
2011-10-02 18:15:01 +02:00
88f4f5413a
add OC_Appconfig::hasKey
2011-10-02 14:30:51 +02:00
21a88613a1
Merge branch 'lostpassword'
...
Conflicts:
core/templates/login.php
index.php
lib/util.php
2011-09-30 23:48:20 +02:00
f4782a7690
Check if the application is actually enabled
2011-09-30 23:17:18 +02:00
ccfa2dd24c
Error when only oc_remember_login cookie set fixed.
...
Filled username field when oc_username is set repaired.
Problems with "advanced settings" button in installation wizard fixed.
CSS improved - login and installation now looks more clean.
Request password link removed (email feature not implemented yet).
Database radio button bugs removed.
It is possible to have an empty database password, now ownCloud will support this "security issue".
Ignore Mac OS X ".DSstore" files.
Fade in/out of login button and remember checkbox removed due to some display errors.
2011-09-30 18:25:34 +02:00
c3b57944ac
Revert "enhance detection of un-initialized database", conflicted with setup step, needs rework
...
This reverts commit 7fb89c5386
2011-09-30 17:03:04 +02:00
7fb89c5386
enhance detection of un-initialized database
2011-09-30 14:40:17 +02:00
182333a781
use central method for checking webserver user
2011-09-29 15:54:41 +02:00
6636720d2d
enhance warning
2011-09-29 15:53:58 +02:00
19d4121763
Change json content-type to correct IANA type
2011-09-28 23:17:25 +02:00
1f74e76d83
Implemented ace-edtior as an app. Basic file editing and saving supported.
2011-09-28 15:15:04 +01:00
f14a62c875
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 13:53:51 +02:00
f2a7f230f1
add status file. useful for external administration. show the ownClopud version at least in the config dialog.
2011-09-28 13:52:26 +02:00
475dd72ea4
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 11:52:13 +02:00
0fcd765bd5
add check for ctype
2011-09-28 11:47:29 +02:00
40b47defcb
enhance errormessages on setup
2011-09-28 11:46:04 +02:00
c6f78fbe43
Add flag in info.xml to control the apps that are installed by default
2011-09-27 22:36:14 +02:00
10c5178e31
check for php modules
2011-09-27 19:08:38 +02:00
2d3c1a3f00
Fix space in comment
2011-09-26 21:18:37 +02:00
aae6881494
Move display of login page to function in OC_Util
2011-09-26 21:17:17 +02:00
bcf92badd1
dont set content type to json for Apps
2011-09-26 00:19:34 +02:00
17e631bc5e
Use OC_JSON for json responses
...
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
6c2b22406c
remove some debug statements
2011-09-25 01:33:53 +02:00
57bffdb46a
fix uploading files using webdav
2011-09-25 01:20:43 +02:00
36c31b0e83
fix warning when uploading file using webdav
...
When uploading a file using davfs php warned about a missing argument to
OC_FileProxy_Quota::preFile_put_contents(). Since we get a resource from
OC_Connector_Sabre_File->put(), we have to convert that before running
strlen because it expects a string.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:01 +02:00
c7d4e72341
set cookie secure if forcessl is enabled
...
This also moves session_start in lib/base.php down a bit because we need
OC::$SERVERROOT to get the config settings.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:00 +02:00
8648e3c43c
only call error_log() if DEBUG is true
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:47 +02:00
2267b6e97d
use jquery 1.6.4
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:43 +02:00
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +02:00
e990ef3542
Move some common code to OC_Util
...
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
2011-09-18 21:31:56 +02:00
8966ed5a00
Cleanup lib/base.php
2011-09-18 20:57:05 +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
6e980d419c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-09-18 15:06:51 +02:00
94696ea7de
remember changed not to store password in cookie
2011-09-18 15:05:53 +02:00
39fa5d1c7f
always use mdb2 for installation
2011-09-18 14:05:38 +02:00
b86367866e
merge master into database
2011-09-18 13:47:15 +02:00
0714e83a8e
fix creating groups
2011-09-18 13:35:27 +02:00
68e7666293
Changed behaviour of remember checkbox
2011-09-18 09:15:30 +02:00
8c7aa06088
dont use numRows when it's not needed since it can be expensive
2011-09-17 02:49:40 +02:00
5e3ecbbf96
dont use numRows when it's not needed since it can be expensive
2011-09-17 02:36:04 +02:00
0e2b957dac
add pdo backend to oc_db
2011-09-17 02:30:58 +02:00
b1e3961825
removed excess white space inside parentheses
2011-09-12 12:30:57 +02:00
014f4af79c
fixed translation detection thanks to Xuetian Weng
2011-09-12 12:29:43 +02:00
760b47a62f
Use OC_Helper::linkTo also for absolute urls.
...
One central place to check for https.
2011-09-09 22:19:15 +02:00
252bca5057
removed database table prefix choice, use oc_
2011-09-04 14:56:09 +02:00
ec87e2eac4
setup.php: Get 'datadirectory' from config file instead of 'datadir'
...
Signed-off-by: Aloisio Almeida Jr <aloisiojr@gmail.com>
2011-09-03 21:22:09 -03:00
3130234640
Remove execute permissions from source files
2011-09-03 22:15:23 +02:00
3972774a2e
Removed db4app and test_db
2011-09-01 15:58:47 +02:00
40d9439d4e
Merge branch 'master' of git.kde.org:owncloud
2011-09-01 15:21:27 +02:00
7fa1f8161c
do not user directories when navigating to /data. Needs more security.
2011-08-31 11:41:09 +02:00
e4f70d5bbb
files not viewable from the outside by adresses anymore
2011-08-31 11:28:18 +02:00
efa3085073
fixed picture preview broken for some, thanks to Felix on Shapado
2011-08-29 17:09:22 +02:00
b92603b3fd
Translation for date column
2011-08-28 23:11:45 +02:00
5c9178f851
Fixed a bug in appconfig, where an initially empty set value led to endless duplicates of this app/key pair.
...
Path by Elias Probst <mail@eliasprobst.eu>
2011-08-28 19:36:23 +02:00
74c7890fbb
Fix undefined index license in Apps
2011-08-27 17:56:22 -04:00
52ca447efc
Merge branch 'master' of git.kde.org:owncloud
2011-08-27 18:11:32 +02:00
e8fa2d3442
Added db4app lib, and apps test_db that shows how it works.
...
Also fixed a typo in db.php
2011-08-27 18:09:14 +02:00
11c2aff8c9
fixed installer failing due to htaccess. Thanks to Elias Probst
2011-08-27 10:19:45 +02:00
ee0954b236
fix issue with login being case insensitve
2011-08-25 21:51:13 +02:00
391e064e67
allow apps to register form for the settings and admin pages
2011-08-23 01:41:18 +02:00
d851bdac90
fix .htaccess file crashing apache+php-cgi
2011-08-22 17:18:54 +02:00
af3080402b
fix installing shipped apps
2011-08-22 14:17:38 +02:00
109302a928
add some todos
2011-08-20 11:53:14 +02:00
d9aae20003
more valid HTML, alt attributes, refactored pagenavi etc.
2011-08-20 05:07:58 +02:00
683e125042
Merge branch 'sharing'
2011-08-17 13:48:36 +02:00
cb9fc6d901
make the help section working and pretty. knowledge base entries are fetched via OCS from a different server. cool stuff
2011-08-17 00:24:50 +02:00
e4c9871299
This should actually make the 'Shared' directory automatically everytime
2011-08-15 20:45:07 -04:00
5fbed936bf
Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory
2011-08-15 20:33:02 -04:00
1ec75330ec
Merge branch 'master' into sharing
2011-08-15 17:49:36 -04:00
13cbd7f578
some filesystem fixes
2011-08-15 22:55:14 +02:00
6173c0fbc2
a bit of refactoring for oc_filesystem and implement user quota
2011-08-15 21:09:13 +02:00
2cb231d0a4
resolved merge conflict
2011-08-14 19:31:38 +02:00
9648be97fb
better error messages for installation, still need to be inline
2011-08-13 05:37:12 +02:00
4a5ee765cf
merged admin, help and settings to settings
2011-08-13 05:13:34 +02:00
122018889a
Merge branch 'master' into sharing
...
Conflicts:
files/css/files.css
2011-08-12 21:00:41 -04:00
67156f87e3
Add missing parameter to usersInGroup()
2011-08-12 20:53:36 -04:00
ffe9da91af
Add missing parameter to usersInGroup()
2011-08-12 20:51:01 -04:00
c2a5b49834
better error reporting during installation
2011-08-12 19:22:29 +02:00
0b4ed25776
fixed downloading of files with spaces in name for Firefox
2011-08-12 12:03:59 +02:00
6c4d075bd6
added jquery-tipsy for nice title tooltips
2011-08-12 11:26:13 +02:00
4830555cce
Merge branch 'master' into sharing
...
Conflicts:
.gitignore
2011-08-11 17:42:37 -04:00
99790d6805
lots of image changes, use svg EVERYWHERE POSSIBLE
2011-08-11 19:00:32 +02:00
aa582ec43a
more work on encryption
2011-08-11 17:49:36 +02:00
d75faac09e
Merge branch 'master' of git.kde.org:owncloud
2011-08-11 16:33:53 +02:00
5b9f6b4001
hide the files admin page as long as we don have settings on the page
2011-08-11 16:24:53 +02:00
50c1553c38
automaticaly login after setup
2011-08-11 16:22:25 +02:00
bc5bf18eed
bit of work on app management
2011-08-11 15:11:06 +02:00
b4e89871dd
merged master into sharing
2011-08-11 13:29:22 +02:00
bfd72501a1
add OC_Group::usersInGroup() to get a list of all users in a group
2011-08-11 10:12:17 +02:00
05f3910718
moved search box directly to template
2011-08-10 22:56:55 +02:00
f03874ac49
work on user management
2011-08-10 22:38:28 +02:00
e1bde1a78e
Merge branch 'master' into sharing
...
Conflicts:
files/templates/index.php
2011-08-10 13:40:47 -04:00
Robin Appelman
Bartek Przybylski
Tom Needham
Thomas Tanghus
Jakob Sack
Bart Visscher
Frank Karlitschek
Michael Gapczynski
Georg Ehrke
Arthur Schiwon
Robin Appelman
Alessandro Cosentino
Klaas Freitag
Daniel Köb
prcrst
Georg Ehrke
Hendrik Langer
Frank Karlitschek
Jakob Sack
Florian Vichot
Brice Maron
Georg Ehrke
Joar Wandborg
Borjan Tchakaloff
Marvin Thomas Rabe
Thomas Schmidt
Florian Pritz
Bart Visscher
Jan-Christoph Borchardt
Aloisio Almeida Jr
Côme BERNIGAUD