Marvin Thomas Rabe
|
e345fbd386
|
conflicts solved
|
2011-10-06 22:40:11 +02:00 |
|
Marvin Thomas Rabe
|
bb26fe9300
|
Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55
|
2011-10-06 22:37:06 +02:00 |
|
Marvin Thomas Rabe
|
ae56bb63c6
|
Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52
|
2011-10-06 22:36:34 +02:00 |
|
Marvin Thomas Rabe
|
543e8456b7
|
Merge commit 'refs/merge-requests/53' of git://gitorious.org/owncloud/owncloud into merge-requests/53
|
2011-10-06 22:36:06 +02:00 |
|
Marvin Thomas Rabe
|
878178145d
|
Merge commit 'refs/merge-requests/54' of git://gitorious.org/owncloud/owncloud into merge-requests/54
|
2011-10-06 22:35:36 +02:00 |
Bart Visscher
|
3cc7212c82
|
Add icon for calendar color selector
|
2011-10-06 21:22:55 +02:00 |
|
Bart Visscher
|
b0847a61f5
|
Start using OC_JSON in gallery app
|
2011-10-06 21:22:01 +02:00 |
|
Bart Visscher
|
4786ed321e
|
Replace _ in timezone setting with a space
|
2011-10-06 13:22:36 +02:00 |
|
Bart Visscher
|
c28f1e0276
|
Implement timezone fix from Stephen Rees-Carter
|
2011-10-06 13:22:36 +02:00 |
Georg Ehrke
|
bf017fb4bd
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-10-06 13:21:38 +02:00 |
|
Georg Ehrke
|
55ab68a332
|
support of RRULE in calendar app
|
2011-10-06 13:21:13 +02:00 |
Stephen Rees-Carter
|
c853fc75a1
|
BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.
|
2011-10-06 10:31:05 +11:00 |
|
Stephen Rees-Carter
|
08c38c8158
|
Updating .gitignore to ignore *.geany project files.
|
2011-10-06 10:30:17 +11:00 |
Bartek Przybylski
|
f92fa6989e
|
another query fix
|
2011-10-05 22:28:17 +02:00 |
Michiel@unhosted
|
af6eb52b5e
|
correct wrong variable name in remoteStorage app
|
2011-10-05 20:01:58 +02:00 |
|
Bartek Przybylski
|
d5931b8c48
|
gallery db query fix
|
2011-10-05 19:32:30 +02:00 |
Jan-Christoph Borchardt
|
28dcbe3cb0
|
disabled gallery app by default until it's in a branch
|
2011-10-05 14:54:34 +02:00 |
|
Jan-Christoph Borchardt
|
8e532b5ceb
|
removed extra calendar settings. Also, table layout?
|
2011-10-05 14:32:25 +02:00 |
Borjan Tchakaloff
|
5570222b40
|
Added the missing quotes on the filename.
|
2011-10-05 15:20:32 +04:00 |
|
Borjan Tchakaloff
|
3388381deb
|
Fixed the 'Undefined index "user_id"' bug when requesting a publicly shared folder and being logged-out.
The OC_App::navigation array contains by default only the help menu.
|
2011-10-05 14:31:33 +04:00 |
|
Borjan Tchakaloff
|
0cde2a3146
|
Fixed the file sharing listing bug (filename is empty when it has no extension in a publicly shared folder).
|
2011-10-05 14:27:50 +04:00 |
Robin Appelman
|
a8621265e2
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-10-05 02:11:44 +02:00 |
|
Marvin Thomas Rabe
|
7579fc7bc9
|
updated margins
|
2011-10-04 21:39:13 +02:00 |
|
Bart Visscher
|
2c95c799e6
|
Add new contact name to end of cantact list
|
2011-10-04 21:16:57 +02:00 |
|
Bart Visscher
|
fada3517b0
|
All the basic field for add contact added
|
2011-10-04 21:16:57 +02:00 |
|
Marvin Thomas Rabe
|
4bcb6f5346
|
remeber cookie bug fixed
|
2011-10-04 19:41:00 +02:00 |
|
Marvin Thomas Rabe
|
340f6bbaba
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-10-04 19:37:54 +02:00 |
|
Marvin Thomas Rabe
|
d1518f2901
|
updated calendar settings
|
2011-10-04 19:37:26 +02:00 |
|
Marvin Thomas Rabe
|
33f24a42b8
|
redirect url fixed
|
2011-10-04 19:27:57 +02:00 |
|
Marvin Thomas Rabe
|
314e84716b
|
changed shadow transparency to 50%
|
2011-10-04 18:58:38 +02:00 |
|
Marvin Thomas Rabe
|
de21378291
|
fixed scrollbar issues
|
2011-10-04 18:54:07 +02:00 |
|
Marvin Thomas Rabe
|
b60f755f4f
|
fixed height of infield labels
|
2011-10-04 18:42:53 +02:00 |
|
Georg Ehrke
|
70091ec649
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-10-04 10:17:55 +02:00 |
|
Georg Ehrke
|
33b660857a
|
fix ical import
|
2011-10-04 10:17:11 +02:00 |
|
Jan-Christoph Borchardt
|
79da90bb08
|
renamed unhosted to remoteStorage (needs to be updated with coming protocol version)
|
2011-10-04 10:07:46 +02:00 |
|
Georg Ehrke
|
77e12a15b1
|
fix checkLoggedIn function in import of ical files
|
2011-10-03 22:52:13 +02:00 |
|
Georg Ehrke
|
c40a1fcede
|
added import function as filehandler
|
2011-10-03 22:50:10 +02:00 |
|
Bart Visscher
|
e8c6252a4c
|
Move lostpassword to core dir
|
2011-10-03 20:44:01 +02:00 |
|
Bart Visscher
|
dec8106665
|
Add user friendly calendar color chooser
|
2011-10-03 20:42:47 +02:00 |
|
Bart Visscher
|
6159b79715
|
Take setting default value out of loop
|
2011-10-03 20:42:47 +02:00 |
|
Marvin Thomas Rabe
|
ffc5c4dabe
|
Merge commit 'refs/merge-requests/51' of git://gitorious.org/owncloud/owncloud into merge-requests/51
|
2011-10-03 15:18:48 +02:00 |
|
Marvin Thomas Rabe
|
baf2fa3a9f
|
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
|
2011-10-03 14:47:41 +02:00 |
Weng Xuetian
|
acbd31255e
|
fix add bookmark bug.
|
2011-10-03 20:44:03 +08: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 |
|
Georg Ehrke
|
25544d31f9
|
added mime type for calendar files
|
2011-10-03 12:16:06 +02:00 |
|
Marvin Thomas Rabe
|
a2bcbec791
|
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
|
2011-10-03 02:01:24 +02:00 |
|
Marvin Thomas Rabe
|
d249e30714
|
Removed jquery ui files and added own cross image to css.
|
2011-10-03 01:44:49 +02:00 |
|
Robin Appelman
|
36196b6c2d
|
use browsercache for gallery covers
|
2011-10-02 19:42:14 +02:00 |
|
Robin Appelman
|
7bcc0efd6a
|
show galleries in search results
|
2011-10-02 19:33:55 +02:00 |