Bartek Przybylski
|
9e434dea60
|
tabs for spaces, removing thumbnail on file removal
|
2012-06-08 21:44:31 +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 |
Thomas Tanghus
|
23533a763a
|
Don't fix bugs not present in this branch ;-)
|
2012-06-08 20:44:58 +02:00 |
Thomas Tanghus
|
5eb5d23ac1
|
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
Conflicts:
apps/contacts/ajax/uploadphoto.php
|
2012-06-08 20:43:42 +02:00 |
Thomas Tanghus
|
0a49bae87a
|
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
|
2012-06-08 20:39:54 +02:00 |
Georg Ehrke
|
4f2993cb1d
|
remove buggy when
|
2012-06-08 19:59:12 +02:00 |
Georg Ehrke
|
e83e30a8a9
|
Merge branch 'master' into calendar_repeat
|
2012-06-08 19:54:42 +02:00 |
Michael Gapczynski
|
8fcdccdcdc
|
Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage
|
2012-06-08 13:48:38 -04:00 |
Michael Gapczynski
|
4b3ae60558
|
Working UI for external storage mount configuration
|
2012-06-08 11:42:29 -04:00 |
Bjoern Schiessle
|
eb192ff4f3
|
code cleanup from previous commit
|
2012-06-08 16:31:12 +02:00 |
Bjoern Schiessle
|
cf1430df45
|
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
|
2012-06-08 16:27:07 +02:00 |
Bjoern Schiessle
|
0722ff6e32
|
fix for bug #872: Folders not holding any images are ignored, even if they hold subfolders with images
|
2012-06-08 16:24:31 +02:00 |
Arthur Schiwon
|
0dc371f579
|
typo in var
|
2012-06-08 14:58:07 +02:00 |
Arthur Schiwon
|
f70615106f
|
typo in var
|
2012-06-08 14:57:27 +02:00 |
Frank Karlitschek
|
a7a861b2c6
|
backport the password salting fix.
a salt is generated during setup and used to salt the user password hases in the database backend
|
2012-06-08 12:42:35 +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 |
Arthur Schiwon
|
8c7fa15aaf
|
Sharing, fix: connect to hooks from the correct classes
|
2012-06-08 11:58:00 +02:00 |
Arthur Schiwon
|
4d3b7574f3
|
Sharing, fix: connect to hooks from the correct classes
|
2012-06-08 11:55:16 +02:00 |
Frank Karlitschek
|
6a24e8279f
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-08 11:50:08 +02:00 |
Frank Karlitschek
|
f568b7ccb4
|
add spacing lines to our awesome new sample config file. readability++
|
2012-06-08 11:49:14 +02:00 |
Bjoern Schiessle
|
4a15cf28a9
|
fixed broken lines in user table
Conflicts:
settings/css/settings.css
|
2012-06-08 11:44:04 +02:00 |
Bjoern Schiessle
|
f91ad08613
|
fixed broken lines in user table
|
2012-06-08 11:37:04 +02:00 |
Georg Ehrke
|
f43fd1765e
|
fix merge conflicts
|
2012-06-08 11:23:58 +02:00 |
Georg Ehrke
|
65cd15ca15
|
fix merge conflicts
|
2012-06-08 11:21:55 +02:00 |
Georg Ehrke
|
1d93a8fcfe
|
Merge branch 'master' into calendar_export
|
2012-06-08 11:20:17 +02:00 |
Robin Appelman
|
4768510923
|
split share and root config for smb backend, also sanitize config a bit more
|
2012-06-08 01:29:55 +02:00 |
Bart Visscher
|
4afcae8d56
|
Gallery: Fix database creation on update, also only from version less then 0.5
|
2012-06-07 23:38:50 +02:00 |
Brice Maron
|
dd98afc56c
|
Add doc about multi app dir in sample config
|
2012-06-07 20:56:21 +00:00 |
Bart Visscher
|
0575d149b4
|
Use the default parameter of OC_Config::getValue to set defaults
|
2012-06-07 22:49:50 +02:00 |
Bart Visscher
|
e867edd1c8
|
Add help texts to config options in config.sample.php
|
2012-06-07 22:47:18 +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
|
d4f6f3e935
|
Contacts: Attempt to make file upload work in ICS Chrome.
|
2012-06-07 20:29:16 +02:00 |
Thomas Tanghus
|
33c802dcaa
|
Break text to fit in dialog.
|
2012-06-07 20:29:15 +02:00 |
Tom Needham
|
1f409ec524
|
Protect the help page
|
2012-06-07 17:43:26 +00:00 |
Arthur Schiwon
|
0f68276921
|
LDAP: cache the results, reduce LDAP searches
|
2012-06-07 18:56:06 +02:00 |
Arthur Schiwon
|
c2f557f1dd
|
LDAP: cache the results, reduce LDAP searches
|
2012-06-07 18:55:32 +02:00 |
Arthur Schiwon
|
4beabe23e7
|
ldap: enable the destructor
|
2012-06-07 18:15:11 +02:00 |
Arthur Schiwon
|
6626598435
|
ldap: enable the destructor
|
2012-06-07 18:13:41 +02:00 |
Thomas Tanghus
|
c696f449a2
|
Make it easier to subclass OC_L10N.
|
2012-06-07 17:26:28 +02:00 |
Bartek Przybylski
|
14e1be56a0
|
pictures: update script and removal some all stuff
|
2012-06-07 17:08:04 +02:00 |
Thomas Tanghus
|
d2a8746c49
|
Edited combobox to adhere to coding standards and added a dblclick handler.
|
2012-06-07 16:44:54 +02:00 |
Michael Gapczynski
|
d28e0f4d5b
|
Remove old internal mail call for password reset, fixes bug oc-934
Conflicts:
core/lostpassword/index.php
|
2012-06-07 09:36:23 -04:00 |