wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5088 commits 157 branches 562 tags 714 MiB
Commit graph

499 commits

Author SHA1 Message Date
Michael Gapczynski
ccb5e99395 Generate random token for private links (more entropy than past private links) 2012-07-11 12:18:59 -04:00
Michael Gapczynski
b148256233 Get rid of sneaky error_log() that got left behind 2012-07-10 21:30:52 -04:00
Michael Gapczynski
c0e1b8e7e7 Sanitize POST and GET in ajax/share 2012-07-10 19:54:03 -04:00
Michael Gapczynski
7c908a0016 Sharing files working using share API 2012-07-10 18:56:22 -04:00
Michael Gapczynski
1ad5e3e39f Add parameter to showDropDown to not show private link UI, only files can be shared as private links 2012-07-03 17:00:23 -04:00
Michael Gapczynski
db33765e36 Add share with to list in dropdown after sharing 2012-07-03 16:52:53 -04:00
Michael Gapczynski
5e8ef33190 Clean up in the dropdown for unsharing 2012-07-03 14:00:09 -04:00
Michael Gapczynski
dd56416a39 Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead 2012-07-02 14:23:13 -04:00
Michael Gapczynski
f456cee9d8 Fix fetching item type from share class element, comment out the auto hider for now since it doesn't work outside of the Files app 2012-06-30 21:06:04 -04:00
Michael Gapczynski
cb19fdd55b Show users and groups shared with in dropdown 2012-06-27 01:05:37 +02:00
Michael Gapczynski
578b8a9da1 $_POST variables should be $_GET for fetch 2012-06-27 01:05:36 +02:00
Michael Gapczynski
b5961635ea Fix ajax share file and replace 'User or Group' select form with a textbox 2012-06-27 01:05:36 +02:00
Michael Gapczynski
f21fdf14f9 Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead 2012-06-27 01:05:36 +02:00
Michael Gapczynski
bc68f14c4b Prepare drop down UI for share API 2012-06-27 01:05:36 +02:00
Michael Gapczynski
945565f420 Move ajax and js files to core 2012-06-27 01:05:36 +02:00
Bjoern Schiessle
18d5420744 typo in js statement fixed 2012-06-26 10:35:19 +02:00
Sam Tuke
f374dae233 Added text ACS warning to admin's user settings page, and corresponding CSS styles 2012-06-25 18:04:10 +01:00
Georg Ehrke
a113ee9e9f add x-webkit-speech to searchbox 2012-06-24 00:42:16 +02:00
Brice Maron
df60d6d5d2 Fixes for multi app dir : 
Url should be given as relative path (to webroot)
Correct link construction from js
 2012-06-22 12:24:56 +02:00
Brice Maron
e5c56b2433 Merge branch 'master' into multi_app_dir 
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
 2012-06-21 17:15:35 +00:00
Bjoern Schiessle
34739b7ec5 use new sanitizeHTML() function 2012-06-21 13:57:18 +02:00
Florian Hülsmann
c3cd3f3571 CSS class headerAction -> header-action 2012-06-18 23:22:52 +02:00
Florian Hülsmann
0132b80282 added CSS class .headerAction 2012-06-18 23:18:32 +02:00
Bart Visscher
2f00384b51 Use TemplateLayout functions for finding js and css files in minimizer 2012-06-18 15:40:48 +02:00
Florian Hülsmann
4a50c15a8e corrected header width and floating (can now dynamically add stuff to header); someone may test this in IE 2012-06-18 13:36:49 +02:00
Bart Visscher
617de811f7 Cache the minimized output also on the server 2012-06-18 11:11:46 +02:00
Bart Visscher
99a68abbd5 Add session_write_close to the minimizer 2012-06-16 20:52:10 +02:00
Brice Maron
4753cc3ebd Merge branch 'master' into multi_app_dir 
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
 2012-06-14 21:16:59 +00:00
Thomas Tanghus
f0b87bc421 Make requesttoken global. 2012-06-14 18:13:01 +02:00
Michael Gapczynski
b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
 2012-06-13 15:17:46 -04:00
Thomas Tanghus
89464721c7 Added JSON methods for CSRF prevention. Make request token accessible from template and add js var. 2012-06-13 17:33:19 +02:00
Bjoern Schiessle
b9d5f510c3 urlencode link fort password reset (bug #970) 2012-06-13 17:22:28 +02:00
Lukas Reschke
6defbc7f4d Removed some unessecary sanitizations 2012-06-11 19:20:48 +02:00
Lukas Reschke
2b22c538c8 Make some apps compatible 2012-06-11 19:07:51 +02:00
Robin Appelman
cfe219fbb9 fix potential xss in multiselect 2012-06-09 15:07:16 +02: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
cf02f3c107 Merge branch 'master' into multi_app_dir 2012-06-07 19:11:55 +00:00
Michael Gapczynski
3c3a2b9b27 Remove old internal mail call for password reset, fixes bug oc-934 2012-06-07 09:25:50 -04:00
Brice Maron
5c2b2fc842 Change app path logic in templates 2012-06-06 20:24:16 +00:00
Brice Maron
cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Robin Appelman
f7d221f5f0 update translations 2012-06-06 00:29:28 +02:00
Bart Visscher
eed0450351 Fix remap dir for CSS minimizer 2012-06-05 18:09:32 +02:00
Bart Visscher
7e017253f5 Load apps before minimizing the core css and js 2012-06-04 23:17:50 +02:00
Bart Visscher
4a5973662c Merge branch 'unstable' 
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
 2012-06-04 23:02:05 +02:00
Frank Karlitschek
d4ea853fcf use our own serverHost call so that ownCloud works with reverse proxy servers 2012-05-31 20:26:09 +02:00
Frank Karlitschek
a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Thomas Mueller
ede89ee405 oc-657: icons for M$ office file types 2012-05-21 09:35:31 +02:00
Michiel de Jong
fc536c3491 add htmlentities() call into login form 2012-05-18 16:12:49 +02:00
Michael Gapczynski
cbfbbe672c Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115 
Conflicts:
	apps/files/templates/index.php
 2012-05-17 15:38:28 -04:00
Robin Appelman
58adeaa80a only check our own input fields when determining to show the login button 
fixes a problem with browser plugins adding hidden inputs
 2012-05-17 01:17:44 +02:00