3430dcd367
[tx-robot] updated from transifex
2012-07-30 02:05:41 +02:00
e18639551d
Tweak appearance of undo delete notification
2012-07-29 18:02:08 -04:00
db72ce398b
Add support for configuring which permissions are possible for items
2012-07-27 10:13:23 -04:00
680eed6bac
fix for bug #1295 , don't escape password reset link
2012-07-27 15:35:36 +02:00
cb21406e18
Implement CRUDS in share dropdown, and some clean-up
2012-07-26 21:56:22 -04:00
0a9c33e151
[tx-robot] updated from transifex
2012-07-27 02:04:26 +02:00
ba0ea21074
[tx-robot] updated from transifex
2012-07-26 08:04:12 +02:00
12dfe5868a
Updated style
2012-07-26 01:38:46 +02:00
d24326ecce
Updated style
2012-07-26 01:38:20 +02:00
d425740dc2
Remove unused files
2012-07-26 01:19:46 +02:00
1554d7a2c0
Check for admin user
2012-07-26 01:16:32 +02:00
9605e1926c
Check for admin user
2012-07-26 00:06:51 +02:00
85a410d7a3
Remove unused files
2012-07-26 00:04:12 +02:00
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
f9d3388854
Merge branch 'master' into calendar_import
2012-07-21 17:37:10 +02:00
20a174e71b
remove second "autocomplete" statement
2012-07-18 12:27:15 +02:00
3895e3a5ae
remember username and provide autocomplete feature
2012-07-18 12:26:10 +02:00
0ea29398c7
remember username and provide autocomplete feature
2012-07-18 12:22:30 +02:00
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
88f4845ca3
Sanitization isn't required here
2012-07-11 20:04:18 -04:00
cbf851de69
Show private link in dropdown
2012-07-11 12:21:30 -04:00
ccb5e99395
Generate random token for private links (more entropy than past private links)
2012-07-11 12:18:59 -04:00
5575493900
Merge branch 'master' into calendar_import
2012-07-11 10:47:30 +02:00
b148256233
Get rid of sneaky error_log() that got left behind
2012-07-10 21:30:52 -04:00
c0e1b8e7e7
Sanitize POST and GET in ajax/share
2012-07-10 19:54:03 -04:00
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
0045e64041
Fix time formatting for minutes, prepend 0 if minutes is less than 10
2012-07-06 16:49:15 -04:00
90e4af312a
Fix time formatting for minutes, prepend 0 if minutes is less than 10
2012-07-06 16:38:54 -04:00
657eef354a
Merge branch 'master' into calendar_import
2012-07-04 13:03:30 +02:00
799e34acd4
Add slash to app url if not set fix oc-1169
2012-07-03 21:58:36 +00:00
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
db33765e36
Add share with to list in dropdown after sharing
2012-07-03 16:52:53 -04:00
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
dd56416a39
Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead
2012-07-02 14:23:13 -04:00
dd7d34a40e
Prevent adding a duplicate to a multiselect
2012-07-01 11:36:44 -04:00
949cab7ea1
Add new group to other user's group select forms
2012-07-01 11:36:31 -04:00
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
433d15d309
Merge branch 'master' into calendar_import
2012-06-30 12:50:26 +02:00
8e4832bd12
Prevent adding a duplicate to a multiselect
2012-06-29 16:44:08 -04:00
05cb94801a
Add new group to other user's group select forms
2012-06-29 16:29:58 -04:00
cb19fdd55b
Show users and groups shared with in dropdown
2012-06-27 01:05:37 +02:00
578b8a9da1
$_POST variables should be $_GET for fetch
2012-06-27 01:05:36 +02:00
b5961635ea
Fix ajax share file and replace 'User or Group' select form with a textbox
2012-06-27 01:05:36 +02:00
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
bc68f14c4b
Prepare drop down UI for share API
2012-06-27 01:05:36 +02:00
945565f420
Move ajax and js files to core
2012-06-27 01:05:36 +02:00
4e53db3d9c
Merge branch 'master' into oc_error
2012-06-26 14:17:32 +02:00
595ff468f5
typo in js statement fixed
2012-06-26 10:36:33 +02:00
18d5420744
typo in js statement fixed
2012-06-26 10:35:19 +02:00
f374dae233
Added text ACS warning to admin's user settings page, and corresponding CSS styles
2012-06-25 18:04:10 +01:00
a113ee9e9f
add x-webkit-speech to searchbox
2012-06-24 00:42:16 +02:00
243f910ae4
Merge branch 'master' into oc_error
2012-06-22 21:37:03 +02:00
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
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
34739b7ec5
use new sanitizeHTML() function
2012-06-21 13:57:18 +02:00
ccacb6f918
Merge branch 'master' into oc_error
2012-06-19 11:30:18 +02:00
c3cd3f3571
CSS class headerAction -> header-action
2012-06-18 23:22:52 +02:00
0132b80282
added CSS class .headerAction
2012-06-18 23:18:32 +02:00
6bd0a158f7
Merge branch 'master' into oc_error
2012-06-18 15:59:39 +02:00
2f00384b51
Use TemplateLayout functions for finding js and css files in minimizer
2012-06-18 15:40:48 +02:00
e31c9a7b6f
Merge branch 'master' into oc_error
2012-06-18 14:34:49 +02:00
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
617de811f7
Cache the minimized output also on the server
2012-06-18 11:11:46 +02:00
06c610c2ee
Merge branch 'master' into oc_error
2012-06-17 08:36:33 +02:00
99a68abbd5
Add session_write_close to the minimizer
2012-06-16 20:52:10 +02:00
2c8a61ae9c
Merge branch 'master' into oc_error
2012-06-15 20:48:37 +02:00
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
f0b87bc421
Make requesttoken global.
2012-06-14 18:13:01 +02:00
5b1a14f9ea
Contacts: Implement CSRF prevention.
2012-06-14 18:00:13 +02:00
625cd822c3
Backport CSRF prevention.
2012-06-14 13:52:22 +02:00
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
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
48ee265170
urlencode link fort password reset (bug #970 )
2012-06-13 17:26:30 +02:00
b9d5f510c3
urlencode link fort password reset (bug #970 )
2012-06-13 17:22:28 +02:00
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
82abbed883
Merge branch 'master' into oc_error
2012-06-10 18:38:38 +02:00
8f616ecf76
fix potential xss in multiselect
2012-06-09 15:08:05 +02:00
cfe219fbb9
fix potential xss in multiselect
2012-06-09 15:07:16 +02:00
f43fd1765e
fix merge conflicts
2012-06-08 11:23:58 +02:00
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
cf02f3c107
Merge branch 'master' into multi_app_dir
2012-06-07 19:11:55 +00:00
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
3c3a2b9b27
Remove old internal mail call for password reset, fixes bug oc-934
2012-06-07 09:25:50 -04:00
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
cc494259d3
Unit path and webpath, correct some more
2012-06-06 20:24:15 +00:00
fa0c45b005
Merge branch 'master' into oc_error
2012-06-06 10:12:54 +02:00
f1b10fcc93
update translations
2012-06-06 00:29:44 +02:00
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
eed0450351
Fix remap dir for CSS minimizer
2012-06-05 18:09:32 +02:00
7e017253f5
Load apps before minimizing the core css and js
2012-06-04 23:17:50 +02:00
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
b8275691e7
Merge branch 'master' into oc_error
2012-06-04 10:35:50 +02:00
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
5d425a9f79
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:16:44 +02:00
94c633b6b7
Merge branch 'master' into oc_error
2012-05-26 22:54:49 +02:00
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
79bf933319
Merge branch 'master' into oc_error
2012-05-25 10:30:44 +02:00
ede89ee405
oc-657: icons for M$ office file types
2012-05-21 09:35:31 +02:00
fc536c3491
add htmlentities() call into login form
2012-05-18 16:12:49 +02:00
3d713e711b
Merge branch 'master' into oc_error
2012-05-17 22:17:31 +02:00
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
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
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
ce1e4425c2
Combine and minimize core and default app js files
2012-05-16 18:53:46 +02:00
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
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
198b73ddd1
Sanitize search queries, thanks to Lukas Reschke
2012-05-13 15:57:46 -04:00
ee0294bbb1
update translations
2012-05-13 20:00:34 +02:00
a5f0ac811f
Merge branch 'master' into oc_error
2012-05-13 19:13:31 +02:00
9eb91a111d
update to jquery 1.7.2
2012-05-12 00:37:19 +02:00
20499e336b
Remove duplicate line
2012-05-11 22:13:05 +02:00
00e1d174a9
fixed settings text not being clickable
2012-05-11 12:24:49 +00:00
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
d1e5a56bc6
fixing upload icon color
2012-05-10 21:40:22 +02:00
bf93b9e98a
Make select_all checkbox more central
2012-05-10 18:08:46 +00:00
20f8137ca0
upload button goes MJ
2012-05-10 20:05:30 +02:00
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
588b51d88a
update translations
2012-05-09 12:41:01 +02:00
52d113b9e1
Prevent extra '/' from being added to url if app is not defined
2012-05-07 12:35:02 -04:00
df6b15445d
Fix bug on browsers like rekonq which stopped execution of javascript
2012-05-07 17:35:23 +02:00
936c8ba1cc
improve remote.php and create public.php
2012-05-07 15:39:17 +02:00
2facf509cc
Merge branch 'tasks' for Tasks app
2012-05-05 18:26:13 +02:00
4a7591d0ab
Custom icons for contacts app
2012-05-05 16:31:58 +02:00
2580d8540d
Dialogs: Clean indentation. Add some missing brackets.
2012-05-05 13:49:47 +02:00
a004759230
Tasks: Really correct icon
2012-05-04 20:44:11 +02:00
d9592ddcb0
Tried to make settings/apps more keyboard/screenreader friendly.
2012-05-04 17:56:00 +02:00
1e47156226
Merge branch 'master' into tasks
2012-05-04 17:04:11 +02:00
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
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
a4a3d62a55
Check for callback in OC.dialogs.alert.
2012-05-04 00:13:35 +02:00
5611e6c9d3
fix incorrect dialog computing in ff
2012-05-03 12:32:37 +02:00
8feb7dd9d9
fix filepicker in webkit
2012-05-03 12:09:59 +02:00
71f9b1968e
Tasks: Make it possible to close the details area
2012-05-02 17:28:19 +02:00
c536e930f4
add appswebroot to the guest template
2012-05-02 16:41:23 +02:00
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
051cb7d96b
show the username in the title. good idea.
2012-04-30 13:08:32 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
9c520c70a8
Various file path fixes.
2012-04-30 01:48:01 +02:00
993d655aad
Merge branch 'master' into movable_apps_2
2012-04-27 10:30:50 +02:00
74b5e22a68
some more csrf fixes
2012-04-26 23:17:46 +02:00
6930af4c0f
Merge branch 'master' into movable_apps_2
2012-04-26 21:27:22 +02:00
6bdefef31e
csrf protection
2012-04-26 19:35:33 +02:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
0249a72cab
fix downloading of files in files app
2012-04-26 17:35:12 +02:00
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
02a65f30ec
added history buttons
2012-04-25 14:01:03 +01:00
d6346b5b0b
fix OC.filePath in main js
2012-04-24 21:54:09 +02:00
a85d49833b
fix position of Semicolon
2012-04-24 21:52:44 +02:00
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
42a570788b
Merge branch 'master' into movable_apps
2012-04-23 19:56:07 +02:00
6d92ebca45
use native functions of php to parse the string into the Var
2012-04-23 17:09:28 +02:00
9226cb7a6a
rename var file to getfile to prevent fails in files app
2012-04-23 16:36:24 +02:00
1b29fc3fb2
fixing multiselect overflow, issue 341
2012-04-23 14:29:11 +02:00
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
6b9072de58
fix merge conflicts
2012-04-22 13:20:25 +02:00
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
f08cfcecec
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
2012-04-22 03:59:28 +02:00
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
12ef2f5054
modify OC.filepath for movable apps
2012-04-20 22:35:12 +02:00
2fbc92bd4b
new OC_Mail class to handle all mail sending. The benefit is that is way mor flexible than the standard mail command. can be configured to use a remote smtp relay for example. also port the lostpassword code
2012-04-20 20:49:35 +02:00
3fb91a7411
restore require once command for non app files
2012-04-18 17:49:50 +02:00
eb29c577c2
Merge branch 'master' into movable_apps
2012-04-18 12:20:09 +02:00
cf492a9649
Merge branch 'master' into calendar_sharing
2012-04-18 11:51:59 +02:00
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
cfd0140e2f
fix 2 potential xss problems
2012-04-16 12:59:38 +02:00
3c182bdb35
adding sticker logo jpg
2012-04-16 12:57:17 +02:00
961c239ee4
improving leftcontent display, increasing item height
2012-04-16 12:52:48 +02:00
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
c8cb870a27
Merge branch 'master' into oc_error
2012-04-15 22:27:47 +02:00
dc18e65b46
fix merge conflicts
2012-04-15 22:26:55 +02:00
e5cda3abcd
tooltip for delete shows up to the left
2012-04-15 17:49:54 +02:00
1f91224f9e
fixing opacity and fading, also for IE
2012-04-15 14:37:42 +02:00
8ddea7e95c
Merge branch 'master' into calendar_sharing
2012-04-15 14:28:31 +02:00
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
5868199e85
fixed settings hover, now whole row sensitive and fading not jerky
2012-04-15 13:34:30 +02:00
e292b1fcdb
fix merge conflicts
2012-04-15 12:43:07 +02:00
fbb314ef4b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 18:56:55 +02:00
30498fd6f8
Use offset function to position block elements
2012-04-14 18:31:41 +02:00
a0a5668d1e
increase opacity of search field and logout icon
2012-04-14 17:20:50 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
e5e7d4a73a
fix merge conflicts
2012-04-13 16:44:31 -04:00
afcb0aee40
fix merge conflicts
2012-04-13 16:40:10 -04:00
b8466d362e
Fix rescan "File not Found" error handling in oc-vcategories.js
2012-04-13 21:13:58 +02:00
eea0d2e096
fixing delete tooltip
2012-04-13 18:28:17 +02:00
add9673ad6
merging tanghus category CSS
2012-04-13 17:23:56 +02:00
31df4c00ec
adding tipsy tooltips for file actions
2012-04-13 17:22:23 +02:00
bc81179163
Fix categories delete fallback when there is no app specific ajax categories delete function
2012-04-12 23:10:49 +02:00
56bc2c4591
add a title attribute to the logout button
2012-04-12 20:34:56 +02:00
2f3c0a6d80
wrong defaultValue definition in OC.AppConfig.getValue
...
done
2012-04-12 19:14:25 +02:00
ac2d14101c
Merge branch 'master' into calendar_sharing
2012-04-10 20:10:07 -04:00
9f547a1b39
VCategories: fix function names to coding standard
2012-04-10 21:53:51 +02:00
d1ae6512cc
Contacts: Misc. cleanup tweaks.
2012-04-07 16:03:43 +02:00
96c99125da
mimetype filter for filepicker
2012-04-05 23:18:44 +02:00
fe3d3be399
filepicker loading style fixup
2012-04-05 22:25:58 +02:00
5b4a303672
loading screen for filepicker
2012-04-05 21:29:54 +02:00
8a2c5dda6d
Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102
2012-04-04 21:36:50 +02:00
85f9869f69
Make the token really random
2012-04-04 13:18:02 +00:00
95c2ac5d58
Dont typecast variables as integers
2012-04-03 21:14:55 +00:00
cd05dfb943
adding icons to filepicker
2012-04-03 22:18:03 +02:00
ff5dbc52b8
multiselect handle for filepicker
2012-04-02 21:32:35 +02:00
f21d6d4f9f
dialogs filepicker first draft
2012-04-02 19:39:24 +02:00
d01b78a4b4
prevent an possible xss exploit
2012-04-01 00:55:49 +02:00
4e327295c6
adding callback when ok click on alert dialog
2012-04-01 00:30:52 +02:00
2f68b08491
fix eventsource for ie
2012-03-31 16:40:42 +02:00
ad495a9218
fix potential problem when using multiply eventsource's
2012-03-31 16:10:29 +02:00
6b704a780d
select field added to oc.dialogs.form, gallery ported to use it
2012-03-30 22:50:57 +02:00
d15959d573
Merge branch 'master' into calendar_sharing
2012-03-29 23:19:31 +02:00
e45e48ff3d
Merge branch 'master' into oc_error
2012-03-29 23:18:47 +02:00
d049d9bd0c
initial commit for OC_Exception
2012-03-29 23:16:19 +02:00
e2fd0bbf02
IE 8: fix appeareance of checkboxes on login and files pages
2012-03-29 18:32:25 +02:00
ede0a675bc
Merge branch 'master' into calendar_sharing
2012-03-27 20:53:40 +02:00
0a07e5fdaa
Added some documentation.
2012-03-27 12:30:20 +02:00
96dd008f5e
Merge branch 'master' into calendar_sharing
2012-03-26 09:50:39 +02:00
ec40f69c9e
add error 403 site
2012-03-25 14:16:39 +02:00
19c101a660
fix merge conflicts
2012-03-25 14:02:02 +02:00
cbdcb68c2b
gallery sharing, experimental version
2012-03-24 18:35:42 +01:00
7ed8f39744
as preperation for the sgf viewer app i added a file icon for .sgf files (saved go games), and an according mimetype.
2012-03-23 13:34:07 +01:00
61166c1002
Merge branch 'master' into calendar_sharing
2012-03-21 09:43:29 +01:00
03120959e9
add a proper email address for lostpassword service - bugfix for oc-178
2012-03-19 09:09:18 +01:00
27218f85cb
Merge branch 'master' into calendar_sharing
2012-03-16 12:17:58 +01:00
03eb5197b6
Added category editor for apps using OC_VObjects.
2012-03-12 14:13:03 +01:00
ab760578f8
Allow overflow of rightcontent area
2012-03-07 21:46:42 +01:00
c40668e3a9
Merge branch 'master' into calendar_sharing
2012-03-04 10:10:19 +01:00
c411826fe5
moving gallery op to one file, migrate gallery dialogs to oc dialogs
2012-03-04 00:35:37 +01:00
f2dcab50b5
fix merge conflicts
2012-03-03 15:06:51 +01:00
2754cac21f
dialogs library for apps
2012-02-28 23:02:30 +01:00
630cee0ef2
bookmarklets should not look like buttons
2012-02-27 18:20:40 -05:00
2a351f4456
Fixed off by one bug. List length is 1 larger than the index of the last
...
element.
2012-02-26 22:09:21 +01:00
3d0d47957e
improved humanFileSize for js
2012-02-26 14:12:50 +01:00
a5e892505e
more robust png fallback
2012-02-26 03:10:29 +01:00
797e921b9a
improve log browsing
2012-02-26 03:10:29 +01:00
bfb67286c8
fix merge conflicts
2012-02-25 16:54:27 +01:00
8b93a9a237
add javascript bindings for OC_AppConfig
2012-02-25 16:35:40 +01:00
862f824d64
some multiselect improvements
2012-02-25 16:35:40 +01:00
11cb45bd43
slight change to select style
2012-02-24 23:54:38 +01:00
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
6540bda238
some icons for filetypes have been added.
...
for licensing information please have look at core/img/filetypes/readme-2.txt
2012-02-20 22:33:38 +01:00
f47444e1f7
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
01827e9340
Merge branch 'master' into calendar_sharing
2012-02-13 17:08:52 +01:00
a25bda8e41
Add application name to title
2012-02-12 21:56:01 +01:00
a8b7ae515c
Merge branch 'master' into calendar_sharing
2012-02-10 19:36:00 +01:00
c95e8a1fc5
Added custom combobox widget.
2012-02-10 16:40:40 +01:00
90a830baba
Added files for new contact editor/viewer.
2012-02-08 07:59:39 +01:00
f91702d7b5
Merge branch 'master' into calendar
2012-01-31 17:03:48 +01:00
fdf3df3de5
add option to send get data along with an eventsource request
2012-01-31 16:35:47 +01:00
538618df62
Merge branch 'master' into calendar
2012-01-31 11:58:40 +01:00
217151eb9c
add textfield style declaration
2012-01-31 11:50:45 +01:00
6a1121ab2e
provide server side close option for EventStream
2012-01-30 23:19:58 +01:00
45038af948
provide small wrapper around server side events and provide a fallback for IE
2012-01-30 20:21:16 +01:00
039bbfde2d
automatically show advanced options when no sqlite is available
2012-01-29 18:00:55 +01:00
ad4e305c96
update translations
2012-01-27 00:59:24 +01:00
6fccf12299
update translations
2012-01-24 00:42:08 +01:00
7ea2923fa8
translation updates
2012-01-20 18:53:45 +01:00
965ea96439
update translations
2012-01-16 17:34:53 +01:00
b366b0eb52
quick fix for javascript translations
2012-01-16 00:09:43 +01:00
a883fcca3c
add user and instance awere localstorage to prevent collisions when using localstorage
2012-01-15 19:22:32 +01:00
7cd809b286
update translations
2012-01-15 15:12:58 +01:00
9c04858631
added vcards to the mimetype fix list and renamed the icon for vcards
2012-01-15 11:02:08 +01:00
872d301af3
fix inconsitent behaviour when trying to remove yourself from the admin group
2012-01-15 00:50:01 +01:00
5cd6e0f4d9
remove some of the flickering in opera
2012-01-15 00:14:42 +01:00
56af6ee752
fix some of the styling issues on opera
2012-01-14 23:47:31 +01:00
0ac9e56da9
small fix for server svg mimetype detection
2012-01-14 23:41:48 +01:00
5eb6071b04
make the minimum width of the multiselect configurable
2012-01-14 23:10:14 +01:00
ffd47ef4d7
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-13 16:55:55 +00:00
f67e5d18e7
update translations
2012-01-11 01:06:59 +01:00
3f67918522
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-09 21:17:41 +00:00
6c78cd2765
Moved .separator to core css
2012-01-09 18:39:09 +00:00
6dcabdc61c
Fixed merge conflict in /files/ajax/move.php
2012-01-04 16:31:06 +00:00
a1af757ef6
Fix whitespace username in the installation form
2012-01-02 14:21:46 +01:00
1415cb8d19
add infieldlabel source
2012-01-01 23:48:38 +01:00
cbb2db8622
Fix merge conflicts
2012-01-01 01:18:02 +00:00
5ebf8a87f2
Removed old jquery-ui css and js
2011-12-30 23:08:44 +00:00
39e67707d7
Updated jquery ui js and css. Improved color scheme.
2011-12-30 22:47:39 +00:00
e1b9b65e41
Use correct appid for lostpassword email preference
2011-12-18 23:10:43 +01:00
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
2c68aab198
Merge branch 'master' into newbutton
2011-11-04 03:00:03 +01:00
c7d1737d47
attempt to manage some special chars in file list
...
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
9832a0817d
Merge branch 'master' into fullcalendar
...
Conflicts:
apps/calendar/index.php
2011-10-24 22:40:22 +02:00
abf33d32b9
use existing correct info icons
2011-10-23 21:53:00 +02:00
0c890a501c
upgraded the new new button. Didn't and doesn't work in Firefox though
2011-10-23 21:51:56 +02:00
4140a75a5e
corrected position of in-field labels a bit
2011-10-23 11:46:34 +02:00
c28504deca
textfield is now less obtrusive / opaque
2011-10-23 11:46:34 +02:00
93c18e9ae3
added all logo source SVGs
2011-10-23 11:46:34 +02:00
d46288b0ab
'New' button, needs some css work
2011-10-23 11:40:40 +02:00
92fa6f0a48
Fix size calculation with css styling of tipsy popup
2011-10-21 22:08:55 +02:00
9ce15667d5
Merge branch 'calendar' of gitorious.org:owncloud/owncloud
2011-10-16 15:41:00 +02:00
5d09a5e37e
Add some color in error messages + img for hints
2011-10-16 13:12:11 +02:00
323a98adb7
Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar
2011-10-15 17:16:00 +02:00
8d4039b678
Add loading message to image lightbox and tweak events
2011-10-14 23:51:51 +02:00
169dd7da77
Prevent category in jquery-ui on cal. to overflow
2011-10-14 19:09:07 +02:00
c0b011e714
Initialise hasOtherDB var when not true in installation
2011-10-14 18:04:50 +02:00
a01d10e57d
Merge branch 'master' into calendar
2011-10-13 21:59:16 +02:00
d7fa2a0f77
mimetype icon improvements
2011-10-13 16:33:39 +02:00
deaeab3d92
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-08 15:47:03 +01:00
bbd96fdd39
webkit searchfield bug fixed
2011-10-08 16:02:43 +02:00
71caa4a20c
added code and license links next to version number
2011-10-08 10:10:29 +02:00
538abb99f1
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:10:50 +01:00
1f562a2e83
fixes for the mimetype icons
2011-10-07 18:09:49 +02:00
65a491eabd
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:02:56 +01:00
ab5e26dd32
renamed icons
2011-10-07 16:30:37 +02:00
fa72f1c3cc
some icon corrections
2011-10-07 16:18:47 +02:00
0aaa1fb64e
added Silk icons by Mark James (CC-BY)
2011-10-07 16:05:39 +02:00
980a0893f0
Change colorselector to use border for selected color
2011-10-07 16:03:26 +02:00
e345fbd386
conflicts solved
2011-10-06 22:40:11 +02:00
3cc7212c82
Add icon for calendar color selector
2011-10-06 21:22:55 +02:00
7579fc7bc9
updated margins
2011-10-04 21:39:13 +02:00
2d9c3d75f3
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-04 19:17:23 +01:00
d1518f2901
updated calendar settings
2011-10-04 19:37:26 +02:00
33f24a42b8
redirect url fixed
2011-10-04 19:27:57 +02:00
314e84716b
changed shadow transparency to 50%
2011-10-04 18:58:38 +02:00
de21378291
fixed scrollbar issues
2011-10-04 18:54:07 +02:00
5c9b069fe5
Updated saving feedback to use loading.gif
2011-10-04 17:43:13 +01:00
b60f755f4f
fixed height of infield labels
2011-10-04 18:42:53 +02:00
e8c6252a4c
Move lostpassword to core dir
2011-10-03 20:44:01 +02:00
6d8985ceb2
added infield labels. readded fade in of login button. updated label on install page.
2011-10-03 14:41:55 +02:00
481a37fcf3
Show database only in advanced
2011-10-03 13:32:16 +02:00
d249e30714
Removed jquery ui files and added own cross image to css.
2011-10-03 01:44:49 +02:00
41dfce150d
problem with previous selected groups fixed
2011-10-02 15:38:07 +02:00
c943f48547
fixed link to password recovery. removed duplicated and unused code out of index.php.
2011-10-01 11:08:49 +02:00
21a88613a1
Merge branch 'lostpassword'
...
Conflicts:
core/templates/login.php
index.php
lib/util.php
2011-09-30 23:48:20 +02:00
ddd3599899
added jquery ui icons. otherwise its for casual users impossible to close the new event dialog in the calendar
2011-09-30 20:48:26 +02:00
e2251a4b38
show typed in username when log in has failed
2011-09-30 20:27:31 +02:00
0541728404
added text to localisation
2011-09-30 20:23:59 +02:00
5775421f78
user list has descriptions now
2011-09-30 19:35:25 +02:00
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
516517dc3c
add margin
2011-09-29 15:55:18 +02:00
8d14c489eb
changed short description and styled unobtrusively
2011-09-28 17:14:37 +02:00
3fcc7b5949
Use correct name for function state for addScript/addStyle in js
2011-09-26 21:18:56 +02:00
950d4e1da4
Move lostpassword code to own app
2011-09-26 21:17:26 +02:00
17e631bc5e
Use OC_JSON for json responses
...
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
7f83176306
no mickey mouse hand for quota bar
2011-09-24 22:13:35 +02:00
408c391f83
removed deprecated images and icons
2011-09-24 22:09:41 +02:00
c09b125131
relabeled Finish setup button with 'Finishing ...'
2011-09-24 21:56:40 +02:00
63907a7508
dont submit the setup form to a new tab
2011-09-24 19:07:24 +02:00
e0d013b25e
settings/personal: remove padding from quota bar
...
The text will stay in it's place, but 0% usage will lead to an empty
bar.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:02 +02:00
2267b6e97d
use jquery 1.6.4
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:43 +02:00
b73f72f62c
After clicking Finish button:
...
- change value to "Please wait...."
- disable all the inputs & buttons
- submit new form, because disabled inputs are not submitted to the server
2011-09-23 19:40:06 +02:00
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +02:00
5559a0dede
updated translations
2011-09-23 19:08:02 +02:00
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
f0da2a2258
Add class versions for leftcontent and rightcontent in css
2011-09-17 01:55:05 +02:00
7c9f1007d5
Fix initial visibility of database settings in setup
2011-09-14 23:36:22 +02:00
e5e4277ff3
Adding "#leftcontent li.active" for using :active with jQuery
2011-09-08 23:37:07 +02:00
Jenkins for ownCloud
Michael Gapczynski
Bjoern Schiessle
Lukas Reschke
Robin Appelman
Georg Ehrke
Jörn Friedrich Dreyer
Brice Maron
Michael Gapczynski
Sam Tuke
Florian Hülsmann
Bart Visscher
Thomas Tanghus
Frank Karlitschek
Michiel de Jong
Jan-Christoph Borchardt
Tom Needham
Vitaly Kuznetsov
Simon Birnbach
Bartek Przybylski
unknown
Frank Karlitschek
Frank Karlitschek
Sam Tuke
Jan-Christoph Borchardt
Arthur Schiwon
Nils Jansen
Alessandro Cosentino
Roland van Laar
Marvin Thomas Rabe
Robin Appelman
Georg Ehrke
Georg Ehrke
Thomas Schmidt
Jan-Christoph Borchardt
Florian Pritz
Bart Visscher
Jakob Sack