Commit Graph

5318 Commits

Author SHA1 Message Date
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
Arthur Schiwon f70615106f typo in var 2012-06-08 14:57:27 +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 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 f91ad08613 fixed broken lines in user table 2012-06-08 11:37:04 +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 c2f557f1dd LDAP: cache the results, reduce LDAP searches 2012-06-07 18:55:32 +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 3c3a2b9b27 Remove old internal mail call for password reset, fixes bug oc-934 2012-06-07 09:25:50 -04:00
Arthur Schiwon 44880ab3fa ldap: remove unused private functions 2012-06-07 13:39:42 +02:00
Arthur Schiwon 6894882ca9 ldap: correct query condition and determining of success 2012-06-07 13:39:42 +02:00
Arthur Schiwon 470cb17f90 ldap: check index carefully, can be 0 2012-06-07 13:39:42 +02:00
Thomas Tanghus 312536dbf9 Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511 2012-06-07 13:08:42 +02:00
Thomas Tanghus e1f4978150 Calendar: Added more explicit sync links and fixed indentation. 2012-06-07 12:21:24 +02:00
Thomas Tanghus 3804f68ff5 Contacts: Import upload button was obscured on Android browser. 2012-06-07 10:55:40 +02:00
Thomas Tanghus 9c84149119 A bit of pixel-pushing. 2012-06-07 10:55:40 +02:00
Bartek Przybylski 8fd6cdf407 adding title when fancybox is displayed 2012-06-06 23:29:23 +02:00
Bartek Przybylski 5417d803c4 replace spaces with tabs, use const and linkTo instead of static path 2012-06-06 23:23:49 +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
Brice Maron cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Brice Maron 6832aec60f Correct installer 2012-06-06 20:23:17 +00:00
Brice Maron b6c5ca126b First almost working version 2012-06-06 20:23:17 +00:00
Bartek Przybylski a90089c792 hack for file download 2012-06-06 22:20:56 +02:00
Bartek Przybylski 7c88081acb removing test image 2012-06-06 22:13:49 +02:00
Bartek Przybylski aa0fc3c69a aviod incorrect image size returning in gallery listing 2012-06-06 22:13:49 +02:00
Bartek Przybylski 671fe49809 use fancybox to display image preview 2012-06-06 22:13:49 +02:00