Bjoern Schiessle
0ea29398c7
remember username and provide autocomplete feature
2012-07-18 12:22:30 +02:00
Georg Ehrke
4e53db3d9c
Merge branch 'master' into oc_error
2012-06-26 14:17:32 +02:00
Georg Ehrke
a113ee9e9f
add x-webkit-speech to searchbox
2012-06-24 00:42:16 +02:00
Georg Ehrke
243f910ae4
Merge branch 'master' into oc_error
2012-06-22 21:37:03 +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
Georg Ehrke
ccacb6f918
Merge branch 'master' into oc_error
2012-06-19 11:30:18 +02:00
Florian Hülsmann
c3cd3f3571
CSS class headerAction -> header-action
2012-06-18 23:22:52 +02:00
Georg Ehrke
e31c9a7b6f
Merge branch 'master' into oc_error
2012-06-18 14:34:49 +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
Georg Ehrke
2c8a61ae9c
Merge branch 'master' into oc_error
2012-06-15 20:48:37 +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
Thomas Tanghus
5b1a14f9ea
Contacts: Implement CSRF prevention.
2012-06-14 18:00:13 +02:00
Thomas Tanghus
625cd822c3
Backport CSRF prevention.
2012-06-14 13:52:22 +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
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
Georg Ehrke
f43fd1765e
fix merge conflicts
2012-06-08 11:23:58 +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
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
Georg Ehrke
fa0c45b005
Merge branch 'master' into oc_error
2012-06-06 10:12:54 +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
Georg Ehrke
79bf933319
Merge branch 'master' into oc_error
2012-05-25 10:30:44 +02:00
Michiel de Jong
fc536c3491
add htmlentities() call into login form
2012-05-18 16:12:49 +02:00
Georg Ehrke
3d713e711b
Merge branch 'master' into oc_error
2012-05-17 22:17:31 +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
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
Michael Gapczynski
198b73ddd1
Sanitize search queries, thanks to Lukas Reschke
2012-05-13 15:57:46 -04:00
Georg Ehrke
a5f0ac811f
Merge branch 'master' into oc_error
2012-05-13 19:13:31 +02:00
Bart Visscher
20499e336b
Remove duplicate line
2012-05-11 22:13:05 +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
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
Georg Ehrke
c536e930f4
add appswebroot to the guest template
2012-05-02 16:41:23 +02:00
Frank Karlitschek
051cb7d96b
show the username in the title. good idea.
2012-04-30 13:08:32 +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
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
Georg Ehrke
a85d49833b
fix position of Semicolon
2012-04-24 21:52:44 +02:00
Georg Ehrke
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
Georg Ehrke
6b9072de58
fix merge conflicts
2012-04-22 13:20:25 +02:00
Robin Appelman
cfd0140e2f
fix 2 potential xss problems
2012-04-16 12:59:38 +02:00
Jan-Christoph Borchardt
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
Georg Ehrke
c8cb870a27
Merge branch 'master' into oc_error
2012-04-15 22:27:47 +02:00
Jan-Christoph Borchardt
5868199e85
fixed settings hover, now whole row sensitive and fading not jerky
2012-04-15 13:34:30 +02:00
Georg Ehrke
e5e7d4a73a
fix merge conflicts
2012-04-13 16:44:31 -04:00
Frank Karlitschek
56bc2c4591
add a title attribute to the logout button
2012-04-12 20:34:56 +02:00
Robin Appelman
d01b78a4b4
prevent an possible xss exploit
2012-04-01 00:55:49 +02:00
Georg Ehrke
e45e48ff3d
Merge branch 'master' into oc_error
2012-03-29 23:18:47 +02:00
Georg Ehrke
d049d9bd0c
initial commit for OC_Exception
2012-03-29 23:16:19 +02:00
Arthur Schiwon
e2fd0bbf02
IE 8: fix appeareance of checkboxes on login and files pages
2012-03-29 18:32:25 +02:00
Georg Ehrke
ec40f69c9e
add error 403 site
2012-03-25 14:16:39 +02:00
Thomas Tanghus
03eb5197b6
Added category editor for apps using OC_VObjects.
2012-03-12 14:13:03 +01:00
Marvin Thomas Rabe
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
Bart Visscher
a25bda8e41
Add application name to title
2012-02-12 21:56:01 +01:00
Robin Appelman
039bbfde2d
automatically show advanced options when no sqlite is available
2012-01-29 18:00:55 +01:00
Brice Maron
c0b011e714
Initialise hasOtherDB var when not true in installation
2011-10-14 18:04:50 +02:00
Jan-Christoph Borchardt
71caa4a20c
added code and license links next to version number
2011-10-08 10:10:29 +02:00
Marvin Thomas Rabe
33f24a42b8
redirect url fixed
2011-10-04 19:27:57 +02:00
Bart Visscher
e8c6252a4c
Move lostpassword to core dir
2011-10-03 20:44:01 +02:00
Marvin Thomas Rabe
6d8985ceb2
added infield labels. readded fade in of login button. updated label on install page.
2011-10-03 14:41:55 +02:00
Marvin Thomas Rabe
481a37fcf3
Show database only in advanced
2011-10-03 13:32:16 +02:00
Marvin Thomas Rabe
c943f48547
fixed link to password recovery. removed duplicated and unused code out of index.php.
2011-10-01 11:08:49 +02:00
Bart Visscher
21a88613a1
Merge branch 'lostpassword'
...
Conflicts:
core/templates/login.php
index.php
lib/util.php
2011-09-30 23:48:20 +02:00
Marvin Thomas Rabe
e2251a4b38
show typed in username when log in has failed
2011-09-30 20:27:31 +02:00
Marvin Thomas Rabe
0541728404
added text to localisation
2011-09-30 20:23:59 +02:00
Marvin Thomas Rabe
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
Jan-Christoph Borchardt
8d14c489eb
changed short description and styled unobtrusively
2011-09-28 17:14:37 +02:00
Bart Visscher
950d4e1da4
Move lostpassword code to own app
2011-09-26 21:17:26 +02:00
Bart Visscher
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
Jan-Christoph Borchardt
75383a8308
small wording changes
2011-09-04 18:13:53 +02:00
Jan-Christoph Borchardt
14bbd6f976
updated translations
2011-09-04 18:12:58 +02:00
Jan-Christoph Borchardt
a47f22a275
clarified what we do
2011-09-04 16:38:45 +02:00
Jan-Christoph Borchardt
2fed316efa
hid localhost field for SQLite
2011-09-04 15:03:25 +02:00
Jan-Christoph Borchardt
252bca5057
removed database table prefix choice, use oc_
2011-09-04 14:56:09 +02:00
Jan-Christoph Borchardt
5700d8d6b1
added labels for the other advanced fields, thanks to Elias Probst for the suggestion
2011-08-30 09:17:25 +02:00
Michael Gapczynski
427747abba
Cleanup in login templates and link to lost password reset
2011-08-29 15:01:05 -04:00
Michael Gapczynski
1c955606a1
Initial work on resetting forgotten passwords. It works, but still need to email a token to allow reset
2011-08-29 14:37:18 -04:00
Jan-Christoph Borchardt
897bc55d46
Revert "Style searchbox like other textboxes"
...
The search box style is a design decision, search boxes are always styled differently from other inputs.
This reverts commit 9d48ca75ff
.
2011-08-27 20:02:11 +02:00
Michael Gapczynski
9d48ca75ff
Style searchbox like other textboxes
2011-08-27 13:42:03 -04:00
Jan-Christoph Borchardt
d9aae20003
more valid HTML, alt attributes, refactored pagenavi etc.
2011-08-20 05:07:58 +02:00
Jan-Christoph Borchardt
0db5c734bc
some header fixes
2011-08-19 22:53:07 +02:00
Frank Karlitschek
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
Jan-Christoph Borchardt
4a52886728
updated why we do this
2011-08-15 17:02:26 +02:00
Jan-Christoph Borchardt
7bb261f810
more fixes for Personal and Tipsy
2011-08-14 16:12:31 +02:00
Jan-Christoph Borchardt
9be059aced
removed subnavigation code
2011-08-13 05:31:56 +02:00
Jan-Christoph Borchardt
b2768637d2
updated translations
2011-08-13 05:13:35 +02:00
Dawid Opis
8aac43c12b
fixed width for three database type buttons, more highlighted when selected
2011-08-11 19:50:44 +02:00
Jan-Christoph Borchardt
99790d6805
lots of image changes, use svg EVERYWHERE POSSIBLE
2011-08-11 19:00:32 +02:00
Dawid Opis
ef5e253bf5
changed radiobuttons to jQuery UI buttons (restyled) on installation page
2011-08-11 18:18:50 +02:00
Dawid Opis
952d88a28c
fixed mysql/sqlite selection labels in installation screen
2011-08-11 16:37:20 +02:00
Jan-Christoph Borchardt
a8cb411a92
restyle logout
2011-08-11 00:47:21 +02:00
Jan-Christoph Borchardt
05f3910718
moved search box directly to template
2011-08-10 22:56:55 +02:00
Jan-Christoph Borchardt
fbf86c6683
made sliding settings more awesome
2011-08-10 17:31:01 +02:00
Robin Appelman
9059b55979
make more strings translatable
2011-08-10 14:03:54 +02:00
Jan-Christoph Borchardt
74be4644ed
fixed some styling again, the dirty way
2011-08-09 23:34:10 +02:00
Jan-Christoph Borchardt
ec2dd5be3a
removed some autocompletion
2011-08-09 22:51:08 +02:00