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

458 commits

Author SHA1 Message Date
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
Robin Appelman
ac8bfc218e update translations 2012-05-17 00:36:21 +02:00
Bart Visscher
ce1e4425c2 Combine and minimize core and default app js files 2012-05-16 18:53:46 +02:00
Bart Visscher
f71fec8cdc Combine and minimize core and default app css files 2012-05-16 18:53:46 +02:00
Michiel de Jong
4c6d11e223 move auth.css and remoteStorage-big.png to assets folders From where they can be included 2012-05-14 17:05:35 +02:00
Michael Gapczynski
198b73ddd1 Sanitize search queries, thanks to Lukas Reschke 2012-05-13 15:57:46 -04:00
Robin Appelman
ee0294bbb1 update translations 2012-05-13 20:00:34 +02:00
Robin Appelman
9eb91a111d update to jquery 1.7.2 2012-05-12 00:37:19 +02:00
Bart Visscher
20499e336b Remove duplicate line 2012-05-11 22:13:05 +02:00
Jan-Christoph Borchardt
00e1d174a9 fixed settings text not being clickable 2012-05-11 12:24:49 +00:00
Michael Gapczynski
59a2616105 Fix music file action i.e. click to play, make OC.filePath act like OC_Helper::linkTo() for index.php links 2012-05-10 23:04:27 -04:00
Jan-Christoph Borchardt
d1e5a56bc6 fixing upload icon color 2012-05-10 21:40:22 +02:00
Tom Needham
bf93b9e98a Make select_all checkbox more central 2012-05-10 18:08:46 +00:00
Jan-Christoph Borchardt
20f8137ca0 upload button goes MJ 2012-05-10 20:05:30 +02:00
Vitaly Kuznetsov
6f981738bb Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example) 2012-05-10 09:10:53 +00:00
Robin Appelman
588b51d88a update translations 2012-05-09 12:41:01 +02:00
Michael Gapczynski
52d113b9e1 Prevent extra '/' from being added to url if app is not defined 2012-05-07 12:35:02 -04:00
Simon Birnbach
df6b15445d Fix bug on browsers like rekonq which stopped execution of javascript 2012-05-07 17:35:23 +02:00
Georg Ehrke
936c8ba1cc improve remote.php and create public.php 2012-05-07 15:39:17 +02:00
Bart Visscher
2facf509cc Merge branch 'tasks' for Tasks app 2012-05-05 18:26:13 +02:00
Florian Hülsmann
4a7591d0ab Custom icons for contacts app 2012-05-05 16:31:58 +02:00
Thomas Tanghus
2580d8540d Dialogs: Clean indentation. Add some missing brackets. 2012-05-05 13:49:47 +02:00
Bart Visscher
a004759230 Tasks: Really correct icon 2012-05-04 20:44:11 +02:00
Thomas Tanghus
d9592ddcb0 Tried to make settings/apps more keyboard/screenreader friendly. 2012-05-04 17:56:00 +02:00
Bart Visscher
1e47156226 Merge branch 'master' into tasks 2012-05-04 17:04:11 +02:00
Thomas Tanghus
27da29525a Made the global settings icon accessable via keyboard. 
Bug http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-561
 2012-05-04 09:53:36 +02:00
Thomas Tanghus
8d1754041e VCategories: Check if any categories are selected before json call. Add Close button. Remove log calls. 2012-05-04 01:33:47 +02:00
Thomas Tanghus
a4a3d62a55 Check for callback in OC.dialogs.alert. 2012-05-04 00:13:35 +02:00
Bartek Przybylski
5611e6c9d3 fix incorrect dialog computing in ff 2012-05-03 12:32:37 +02:00
Bartek Przybylski
8feb7dd9d9 fix filepicker in webkit 2012-05-03 12:09:59 +02:00
Bart Visscher
71f9b1968e Tasks: Make it possible to close the details area 2012-05-02 17:28:19 +02:00
Georg Ehrke
c536e930f4 add appswebroot to the guest template 2012-05-02 16:41:23 +02:00
unknown
98e0db15a2 correction of bug oc-393 in using owncloud V2, V3, V4 with android browser : 
JSON.parse(null) results in 'Uncaught illegal access' and not 'null' (see google for details)

solved

Signed-off-by: bourgeoa
 2012-05-01 23:46:51 +02:00
Frank Karlitschek
051cb7d96b show the username in the title. good idea. 2012-04-30 13:08:32 +02:00
Thomas Mueller
07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Thomas Tanghus
9c520c70a8 Various file path fixes. 2012-04-30 01:48:01 +02:00
Georg Ehrke
993d655aad Merge branch 'master' into movable_apps_2 2012-04-27 10:30:50 +02:00
Frank Karlitschek
74b5e22a68 some more csrf fixes 2012-04-26 23:17:46 +02:00
Georg Ehrke
6930af4c0f Merge branch 'master' into movable_apps_2 2012-04-26 21:27:22 +02:00
Frank Karlitschek
6bdefef31e csrf protection 2012-04-26 19:35:33 +02:00
Georg Ehrke
2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke
40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00